update to latest (#19)

Author: Jason2866

.github/workflows/cron.yml

@@ -1,7 +1,8 @@
 .DS_Store
 .vscode
 components/arduino/
-components/esp-face/
+components/esp-dl/
+components/esp-sr/
 components/esp32-camera/
 components/esp_littlefs/
 components/esp-rainmaker/

.gitignore

@@ -97,9 +97,22 @@ if [ "$BUILD_TYPE" != "all" ]; then
         print_help
     fi
     configs="configs/defconfig.common;configs/defconfig.$TARGET"
+    
+    # Target Features Configs
+    for target_json in `jq -c '.targets[]' configs/builds.json`; do
+        target=$(echo "$target_json" | jq -c '.target' | tr -d '"')
+        if [ "$TARGET" == "$target" ]; then
+            for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
+                configs="$configs;configs/defconfig.$defconf"
+            done
+        fi
+    done
+
+    # Configs From Arguments
     for conf in $CONFIGS; do
         configs="$configs;configs/defconfig.$conf"
     done
+
     echo "idf.py -DIDF_TARGET=\"$TARGET\" -DSDKCONFIG_DEFAULTS=\"$configs\" $BUILD_TYPE"
     rm -rf build sdkconfig
     idf.py -DIDF_TARGET="$TARGET" -DSDKCONFIG_DEFAULTS="$configs" $BUILD_TYPE
@@ -121,7 +134,12 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     fi
 
     echo "* Target: $target"
+
+    # Build Main Configs List
     main_configs="configs/defconfig.common;configs/defconfig.$target"
+    for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
+        main_configs="$main_configs;configs/defconfig.$defconf"
+    done
 
     # Build IDF Libs
     idf_libs_configs="$main_configs"

build.sh

@@ -1,2 +1,3 @@
 CONFIG_AUTOSTART_ARDUINO=y
 CONFIG_ARDUINO_UDP_RUN_CORE0=y
+# CONFIG_WS2812_LED_ENABLE is not set

configs/defconfig.common

@@ -75,6 +75,8 @@ CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10
 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2
 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096
 CONFIG_ULP_COPROC_ENABLED=y
+# CONFIG_USE_WAKENET is not set
+# CONFIG_USE_MULTINET is not set
 # CONFIG_VFS_SUPPORT_SELECT is not set
 # CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set
 # CONFIG_VFS_SUPPORT_TERMIOS is not set

configs/defconfig.esp32

@@ -1 +1,3 @@
-CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+# CONFIG_SPIRAM_MEMTEST is not set

configs/defconfig.opi_flash renamed to configs/defconfig.opi

@@ -0,0 +1 @@
+# CONFIG_SPIRAM_BOOT_INIT is not set

configs/defconfig.opi_ram

@@ -196,7 +196,7 @@ for item; do
 				add_next=0
 				is_script=0
 				is_dir=0
-			elif [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
+			elif [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:17}" != "-Wl,--start-group" && "${item:0:15}" != "-Wl,--end-group" ]]; then
 				LD_FLAGS+="$item "
 				PIO_LD_FLAGS+="$item "
 			fi
@@ -359,6 +359,7 @@ for item; do
 		done
 	fi
 done
+echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", env.BoardConfig().get(\"build.arduino.memory_type\", \"$MEMCONF\"), \"include\")," >> "$AR_PLATFORMIO_PY"
 echo "        join(FRAMEWORK_DIR, \"cores\", env.BoardConfig().get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
@@ -383,7 +384,7 @@ done
 echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
 echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"lib\")," >> "$AR_PLATFORMIO_PY"
 echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"ld\")," >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"$MEMCONF\")" >> "$AR_PLATFORMIO_PY"
+echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", env.BoardConfig().get(\"build.arduino.memory_type\", \"$MEMCONF\"))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -473,7 +474,8 @@ echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "$AR_SDK/include/con
 echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "$AR_SDK/include/config/sdkconfig.h"
 
 # Handle Mem Variants
-mkdir -p "$AR_SDK/$MEMCONF"
+mkdir -p "$AR_SDK/$MEMCONF/include"
+mv "$AR_SDK/include/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
 for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
 	file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"')
 	out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"')

configs/defconfig.qio_ram

@@ -21,9 +21,14 @@ source ./tools/config.sh
 
 echo "IDF_TARGET: $IDF_TARGET, MEMCONF: $MEMCONF"
 
+# Add IDF versions to sdkconfig
+echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "build/config/sdkconfig.h"
+echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "build/config/sdkconfig.h"
+
 # Handle Mem Variants
 rm -rf "$AR_SDK/$MEMCONF"
-mkdir -p "$AR_SDK/$MEMCONF"
+mkdir -p "$AR_SDK/$MEMCONF/include"
+mv "build/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h"
 for mem_variant in `jq -c '.mem_variants_files[]' configs/builds.json`; do
 	file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"')
 	src=$(echo "$mem_variant" | jq -c '.src' | tr -d '"')