Initial Esp32c3 Support (espressif#5060)

Author: me-no-dev

.github/scripts/install-arduino-ide.sh

@@ -98,8 +98,8 @@ function build_sketch(){ # build_sketch <fqbn> <path-to-ino> [extra-options]
 win_opts="-prefs=runtime.tools.ctags.path=$ARDUINO_IDE_PATH/tools-builder/ctags/$ctags_version -prefs=runtime.tools.arduino-preprocessor.path=$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/$preprocessor_version"
 fi
 
-echo ""
-echo "Compiling '"$(basename "$sketch")"' ..."
+#echo ""
+#echo "Compiling '"$(basename "$sketch")"' ..."
 mkdir -p "$ARDUINO_BUILD_DIR"
 mkdir -p "$ARDUINO_CACHE_DIR"
 $ARDUINO_IDE_PATH/arduino-builder -compile -logger=human -core-api-version=10810 \
@@ -131,14 +131,14 @@ function count_sketches() # count_sketches <examples-path> <target-mcu>
  local sketchdir=$(dirname $sketch)
  local sketchdirname=$(basename $sketchdir)
  local sketchname=$(basename $sketch)
- if [[ "${sketchdirname}.ino" != "$sketchname" ]]; then
+ if [[ "$sketchdirname.ino" != "$sketchname" ]]; then
  continue
- fi;
- if [[ -f "$sketchdir/.skip.$target" ]]; then
+ elif [[ -f "$sketchdir/.skip.$target" ]]; then
  continue
+ else
+ echo $sketch >> sketches.txt
+	sketchnum=$(($sketchnum + 1))
  fi
- echo $sketch >> sketches.txt
- sketchnum=$(($sketchnum + 1))
  done
  return $sketchnum
 }
@@ -168,13 +168,13 @@ function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <
 echo "ERROR: Chunks count must be positive number"
 return 1
 fi
-if [ "$chunk_idex" -ge "$chunks_num" ]; then
+if [ "$chunk_idex" -ge "$chunks_num" ] && [ "$chunks_num" -ge 2 ]; then
 echo "ERROR: Chunk index must be less than chunks count"
 return 1
 fi
 
 set +e
- count_sketches "$examples"
+ count_sketches "$examples" "$target"
  local sketchcount=$?
 set -e
  local sketches=$(cat sketches.txt)
@@ -186,19 +186,27 @@ function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <
 	chunk_size=$(( $chunk_size + 1 ))
  fi
 
- local start_index=$(( $chunk_idex * $chunk_size ))
- if [ "$sketchcount" -le "$start_index" ]; then
- echo "Skipping job"
- return 0
- fi
-
- local end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size ))
- if [ "$end_index" -gt "$sketchcount" ]; then
+ local start_index=0
+ local end_index=0
+ if [ "$chunk_idex" -ge "$chunks_num" ]; then
+	start_index=$chunk_idex
 	end_index=$sketchcount
- fi
+ else
+ start_index=$(( $chunk_idex * $chunk_size ))
+ if [ "$sketchcount" -le "$start_index" ]; then
+ echo "Skipping job"
+ return 0
+ fi
+
+ end_index=$(( $(( $chunk_idex + 1 )) * $chunk_size ))
+ if [ "$end_index" -gt "$sketchcount" ]; then
+	end_index=$sketchcount
+ fi
+fi
 
  local start_num=$(( $start_index + 1 ))
- echo "Found $sketchcount Sketches";
+ echo "Found $sketchcount Sketches for target '$target'";
+ echo "Chunk Index : $chunk_idex"
  echo "Chunk Count : $chunks_num"
  echo "Chunk Size : $chunk_size"
  echo "Start Sketch: $start_num"
@@ -218,6 +226,8 @@ function build_sketches() # build_sketches <fqbn> <target-mcu> <examples-path> <
  || [ "$sketchnum" -gt "$end_index" ]; then
  continue
  fi
+ echo ""
+ echo "Building Sketch Index $(($sketchnum - 1)) - $sketchdirname"
  build_sketch "$fqbn" "$sketch" "$xtra_opts"
  local result=$?
  if [ $result -ne 0 ]; then

.github/scripts/on-push.sh

@@ -24,7 +24,7 @@ BUILD_PIO=0
 if [ "$#" -lt 2 ] || [ "$CHUNKS_CNT" -le 0 ]; then
 CHUNK_INDEX=0
 CHUNKS_CNT=1
-elif [ "$CHUNK_INDEX" -gt "$CHUNKS_CNT" ]; then
+elif [ "$CHUNK_INDEX" -gt "$CHUNKS_CNT" ] && [ "$CHUNKS_CNT" -ge 2 ]; then
 CHUNK_INDEX=$CHUNKS_CNT
 elif [ "$CHUNK_INDEX" -eq "$CHUNKS_CNT" ]; then
 BUILD_PIO=1
@@ -69,6 +69,19 @@ if [ "$BUILD_PIO" -eq 0 ]; then
 else
 build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
  fi
+
+# ArduinoIDE ESP32C3 Test
+ TARGET="esp32c3"
+FQBN="espressif:esp32:esp32c3:PartitionScheme=huge_app"
+if [ "$OS_IS_WINDOWS" == "1" ]; then
+build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
+elif [ "$OS_IS_MACOS" == "1" ]; then
+build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFi/examples/WiFiClient/WiFiClient.ino" && \
+build_sketch "$FQBN" "$ARDUINO_ESP32_PATH/libraries/WiFiClientSecure/examples/WiFiClientSecure/WiFiClientSecure.ino"
+else
+build_sketches "$FQBN" "$TARGET" "$ARDUINO_ESP32_PATH/libraries" "$CHUNK_INDEX" "$CHUNKS_CNT"
+ fi
 else
 source ./.github/scripts/install-platformio-esp32.sh
 # PlatformIO ESP32 Test

.gitignore

@@ -1,5 +1,6 @@
 tools/xtensa-esp32-elf
 tools/xtensa-esp32s2-elf
+tools/riscv32-esp-elf
 tools/dist
 tools/esptool
 tools/esptool.exe

CMakeLists.txt

@@ -124,7 +124,7 @@ set(BLE_SRCS
 
 
 set(includedirs
- variants/esp32/
+ variants/${IDF_TARGET}/
  cores/esp32/
  libraries/ArduinoOTA/src
  libraries/AsyncUDP/src