Overall scripts edits to meetup espressif master branch.

Author: HamzaHajeir

.gitignore

@@ -10,6 +10,7 @@ components/esp-rainmaker/
 components/espressif__esp-dsp/
 components/esp-insights/
 components/arduino_tinyusb/tinyusb/
+components/tflite-micro/
 esp-idf/
 out/
 build/

build.sh

@@ -12,32 +12,45 @@ fi
 
 export TARGET="all"
 BUILD_TYPE="all"
+BUILD_DEBUG="default"
 SKIP_ENV=0
 COPY_OUT=0
 ARCHIVE_OUT=1
-DEPLOY_OUT=0
+if [ -z $DEPLOY_OUT ]; then
+    DEPLOY_OUT=0
+fi
 
 function print_help() {
-    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf-libs|copy-bootloader|mem-variant>] [config ...]"
+    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-D <debug_level>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf-libs|copy-bootloader|mem-variant>] [config ...]"
     echo "       -s     Skip installing/updating of ESP-IDF and all components"
     echo "       -A     Set which branch of arduino-esp32 to be used for compilation"
     echo "       -I     Set which branch of ESP-IDF to be used for compilation"
     echo "       -i     Set which commit of ESP-IDF to be used for compilation"
     echo "       -e     Archive the build to dist"
+    echo "       -d     Deploy the build to github arduino-esp32"
+    echo "       -D     Debug level to be set to ESP-IDF. One of default,none,error,warning,info,debug or verbose"
+    echo "       -c     Set the arduino-esp32 folder to copy the result to. ex. '$HOME/Arduino/hardware/espressif/esp32'"
     echo "       -t     Set the build target(chip) ex. 'esp32s3' or select multiple targets(chips) by separating them with comma ex. 'esp32,esp32s3,esp32c3'"
     echo "       -b     Set the build type. ex. 'build' to build the project and prepare for uploading to a board"
     echo "       ...    Specify additional configs to be applied. ex. 'qio 80m' to compile for QIO Flash@80MHz. Requires -b"
     exit 1
 }
 
-while getopts ":A:I:i:c:t:b:sde" opt; do
+while getopts ":A:I:i:c:t:b:D:sde" opt; do
     case ${opt} in
         s )
             SKIP_ENV=1
             ;;
+        d )
+            DEPLOY_OUT=1
+            ;;
         e )
             ARCHIVE_OUT=1
             ;;
+        c )
+            export ESP32_ARDUINO="$OPTARG"
+            COPY_OUT=1
+            ;;
         A )
             export AR_BRANCH="$OPTARG"
             ;;
@@ -47,16 +60,19 @@ while getopts ":A:I:i:c:t:b:sde" opt; do
         i )
             export IDF_COMMIT="$OPTARG"
             ;;
+        D )
+            BUILD_DEBUG="$OPTARG"
+            ;;
         t )
             IFS=',' read -ra TARGET <<< "$OPTARG"
             ;;
         b )
             b=$OPTARG
-            if [ "$b" != "build" ] &&
-               [ "$b" != "menuconfig" ] &&
-               [ "$b" != "reconfigure" ] &&
-               [ "$b" != "idf-libs" ] &&
-               [ "$b" != "copy-bootloader" ] &&
+            if [ "$b" != "build" ] && 
+               [ "$b" != "menuconfig" ] && 
+               [ "$b" != "reconfigure" ] && 
+               [ "$b" != "idf-libs" ] && 
+               [ "$b" != "copy-bootloader" ] && 
                [ "$b" != "mem-variant" ]; then
                 print_help
             fi
@@ -100,6 +116,10 @@ else
     source ./tools/config.sh
 fi
 
+if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
+    rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
+fi
+
 if [ "$BUILD_TYPE" != "all" ]; then
     if [ "$TARGET" = "all" ]; then
         echo "ERROR: You need to specify target for non-default builds"
@@ -123,8 +143,8 @@ if [ "$BUILD_TYPE" != "all" ]; then
             # Skip building for targets that are not in the $TARGET array
             continue
         fi
-
-        configs="configs/defconfig.common;configs/defconfig.$target"
+                
+        configs="configs/defconfig.common;configs/defconfig.$target;configs/defconfig.debug_$BUILD_DEBUG"
         for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
             configs="$configs;configs/defconfig.$defconf"
         done
@@ -179,7 +199,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             continue
         fi
     fi
-
+    
     # Skip chips that should not be a part of the final libs
     # WARNING!!! this logic needs to be updated when cron builds are split into jobs
     if [ "$TARGET" = "all" ] && [ $target_skip -eq 1 ]; then
@@ -190,7 +210,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     echo "* Target: $target"
 
     # Build Main Configs List
-    main_configs="configs/defconfig.common;configs/defconfig.$target"
+    main_configs="configs/defconfig.common;configs/defconfig.$target;configs/defconfig.debug_$BUILD_DEBUG"
     for defconf in `echo "$target_json" | jq -c '.features[]' | tr -d '"'`; do
         main_configs="$main_configs;configs/defconfig.$defconf"
     done
@@ -201,18 +221,37 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
         idf_libs_configs="$idf_libs_configs;configs/defconfig.$defconf"
     done
 
+    if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
+        rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
+    fi
     echo "* Build IDF-Libs: $idf_libs_configs"
     rm -rf build sdkconfig
     idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
     if [ $? -ne 0 ]; then exit 1; fi
 
+    if [ "$target" == "esp32s3" ]; then
+        idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" srmodels_bin
+        if [ $? -ne 0 ]; then exit 1; fi
+        AR_SDK="$AR_TOOLS/esp32-arduino-libs/$target"
+        # sr model.bin
+        if [ -f "build/srmodels/srmodels.bin" ]; then
+            echo "$AR_SDK/esp_sr"
+            mkdir -p "$AR_SDK/esp_sr"
+            cp -f "build/srmodels/srmodels.bin" "$AR_SDK/esp_sr/"
+            cp -f "partitions.csv" "$AR_SDK/esp_sr/"
+        fi
+    fi
     # Build Bootloaders
     for boot_conf in `echo "$target_json" | jq -c '.bootloaders[]'`; do
         bootloader_configs="$main_configs"
         for defconf in `echo "$boot_conf" | jq -c '.[]' | tr -d '"'`; do
             bootloader_configs="$bootloader_configs;configs/defconfig.$defconf";
         done
 
+        if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
+            rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
+        fi
+
         echo "* Build BootLoader: $bootloader_configs"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy-bootloader
@@ -226,6 +265,9 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             mem_configs="$mem_configs;configs/defconfig.$defconf";
         done
 
+        if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
+            rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
+        fi
         echo "* Build Memory Variant: $mem_configs"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant
@@ -264,23 +306,33 @@ for component in `ls "$AR_MANAGED_COMPS"`; do
     fi
 done
 
+# update package_esp32_index.template.json
+if [ "$BUILD_TYPE" = "all" ]; then
+    python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
+    python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -o "$TOOLS_JSON_OUT/"
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
 export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
 
-# Generate PlatformIO library manifest file
+# Generate PlatformIO manifest file
 if [ "$BUILD_TYPE" = "all" ]; then
-    python3 ./tools/gen_pio_lib_manifest.py -o "$TOOLS_JSON_OUT/" -s "v$IDF_VERSION" -c "$IDF_COMMIT"
+    pushd $IDF_PATH
+    ibr=$(git describe --all --exact-match 2>/dev/null)
+    ic=$(git -C "$IDF_PATH" rev-parse --short HEAD)
+    popd
+    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s "$ibr" -c "$ic"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
+# copy everything to arduino-esp32 installation
+if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
+    ./tools/copy-to-arduino.sh
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
 AR_VERSION=$(jq -c '.version' "$AR_COMPS/arduino/package.json" | tr -d '"')
 AR_VERSION_UNDERSCORE=`echo "$AR_VERSION" | tr . _`
 
-# Generate PlatformIO framework manifest file
-rm -rf "$AR_ROOT/package.json"
-if [ "$BUILD_TYPE" = "all" ]; then
-    python3 ./tools/gen_pio_frmwk_manifest.py -o "$AR_ROOT/" -s "v$AR_VERSION" -c "$IDF_COMMIT"
-    if [ $? -ne 0 ]; then exit 1; fi
-fi
+
 
 # Generate core_version.h
 rm -rf "$AR_ROOT/core_version.h"
@@ -289,6 +341,11 @@ echo "#define ARDUINO_ESP32_GIT_VER 0x$AR_Commit_short
 #define ARDUINO_ESP32_RELEASE_$AR_VERSION_UNDERSCORE
 #define ARDUINO_ESP32_RELEASE \"$AR_VERSION_UNDERSCORE\"" >> "$AR_ROOT/core_version.h"
 
+# push changes to esp32-arduino-libs and create pull request into arduino-esp32
+if [ $DEPLOY_OUT -eq 1 ]; then
+    ./tools/push-to-arduino.sh
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
 # archive the build
 if [ $ARCHIVE_OUT -eq 1 ]; then
     ./tools/archive-build.sh "$TARGET"

configs/defconfig.common

@@ -19,7 +19,6 @@ CONFIG_BOOTLOADER_APP_ROLLBACK_ENABLE=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
 CONFIG_BT_BLE_BLUFI_ENABLE=y
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
-CONFIG_BT_BTC_TASK_STACK_SIZE=8192
 CONFIG_BT_BTU_TASK_STACK_SIZE=8192
 CONFIG_BLE_MESH=y
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y

configs/defconfig.debug_debug

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y

configs/defconfig.debug_default

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y

configs/defconfig.debug_error

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=y
+CONFIG_LOG_DEFAULT_LEVEL_ERROR=y

configs/defconfig.debug_info

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y

configs/defconfig.debug_none

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_LOG_DEFAULT_LEVEL_NONE=y

configs/defconfig.debug_verbose

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=y

configs/defconfig.debug_warning

@@ -0,0 +1,2 @@
+CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_LOG_DEFAULT_LEVEL_WARN=y

configs/defconfig.dout

@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHMODE_DOUT=y

configs/defconfig.esp_sr

@@ -0,0 +1,37 @@
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SR_WN_WN9_HIESP=y
+CONFIG_SR_MN_CN_NONE=y
+CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
+CONFIG_EN_SPEECH_COMMAND_ID0=""
+CONFIG_EN_SPEECH_COMMAND_ID1=""
+CONFIG_EN_SPEECH_COMMAND_ID2=""
+CONFIG_EN_SPEECH_COMMAND_ID3=""
+CONFIG_EN_SPEECH_COMMAND_ID4=""
+CONFIG_EN_SPEECH_COMMAND_ID5=""
+CONFIG_EN_SPEECH_COMMAND_ID6=""
+CONFIG_EN_SPEECH_COMMAND_ID7=""
+CONFIG_EN_SPEECH_COMMAND_ID8=""
+CONFIG_EN_SPEECH_COMMAND_ID9=""
+CONFIG_EN_SPEECH_COMMAND_ID10=""
+CONFIG_EN_SPEECH_COMMAND_ID11=""
+CONFIG_EN_SPEECH_COMMAND_ID12=""
+CONFIG_EN_SPEECH_COMMAND_ID13=""
+CONFIG_EN_SPEECH_COMMAND_ID14=""
+CONFIG_EN_SPEECH_COMMAND_ID15=""
+CONFIG_EN_SPEECH_COMMAND_ID16=""
+CONFIG_EN_SPEECH_COMMAND_ID17=""
+CONFIG_EN_SPEECH_COMMAND_ID18=""
+CONFIG_EN_SPEECH_COMMAND_ID19=""
+CONFIG_EN_SPEECH_COMMAND_ID20=""
+CONFIG_EN_SPEECH_COMMAND_ID21=""
+CONFIG_EN_SPEECH_COMMAND_ID22=""
+CONFIG_EN_SPEECH_COMMAND_ID23=""
+CONFIG_EN_SPEECH_COMMAND_ID24=""
+CONFIG_EN_SPEECH_COMMAND_ID25=""
+CONFIG_EN_SPEECH_COMMAND_ID26=""
+CONFIG_EN_SPEECH_COMMAND_ID27=""
+CONFIG_EN_SPEECH_COMMAND_ID28=""
+CONFIG_EN_SPEECH_COMMAND_ID29=""
+CONFIG_EN_SPEECH_COMMAND_ID30=""
+CONFIG_EN_SPEECH_COMMAND_ID31=""

configs/defconfig.qout

@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHMODE_QOUT=y

main/Kconfig.projbuild

@@ -10,15 +10,16 @@ config LIB_BUILDER_FLASHFREQ
     string
     default "120m" if ESPTOOLPY_FLASHFREQ_120M
     default "80m" if ESPTOOLPY_FLASHFREQ_80M
-    default "60m" if ESPTOOLPY_FLASHFREQ_60M
     default "64m" if ESPTOOLPY_FLASHFREQ_64M
+    default "60m" if ESPTOOLPY_FLASHFREQ_60M
+
     default "40m" if ESPTOOLPY_FLASHFREQ_40M
     default "32m" if ESPTOOLPY_FLASHFREQ_32M
     default "30m" if ESPTOOLPY_FLASHFREQ_30M
     default "26m" if ESPTOOLPY_FLASHFREQ_26M
     default "20m" if ESPTOOLPY_FLASHFREQ_20M
     default "16m" if ESPTOOLPY_FLASHFREQ_16M
-    default "15m" if ESPTOOLPY_FLASHFREQ_15M
+
 
 config LIB_BUILDER_COMPILE
     bool

main/idf_component.yml

@@ -1,7 +1,65 @@
 dependencies:
   # Required IDF version
   idf: ">=5.1"
-  espressif/esp-dsp:
-    version: "^1.4.12"
+  espressif/esp32-camera:
+    version: "master"
+    git: https://github.com/espressif/esp32-camera.git
+    require: public
     rules:
-      - if: "target in [esp32s3, esp32]"
+      - if: "target in [esp32, esp32s2, esp32s3]"
+  espressif/esp-tflite-micro:
+    version: ">=1.2.0"
+    require: public
+    rules:
+      - if: "target not in [esp32c2]"
+  espressif/esp-dl:
+    version: "master"
+    git: https://github.com/espressif/esp-dl.git
+    require: public
+    rules:
+      - if: "target in [esp32s3, esp32s2, esp32]"
+  espressif/esp-sr:
+    version: ">=1.4.2"
+    rules:
+      - if: "target in [esp32s3]"
+
+  # esp-sr: "^1.3.1"
+  # esp32-camera: "^2.0.4"
+  # esp-dl:
+  #   git: https://github.com/espressif/esp-dl.git
+  # espressif/esp_rainmaker:
+  #   path: components/esp_rainmaker
+  #   git: https://github.com/espressif/esp-rainmaker.git
+
+  # # Defining a dependency from the registry:
+  # # https://components.espressif.com/component/example/cmp
+  # example/cmp: "^3.3.3" # Automatically update minor releases
+  #
+  # # Other ways to define dependencies
+  #
+  # # For components maintained by Espressif only name can be used.
+  # # Same as `espressif/cmp`
+  # component: "~1.0.0" # Automatically update bugfix releases
+  #
+  # # Or in a longer form with extra parameters
+  # component2:
+  #   version: ">=2.0.0"
+  #
+  #   # For transient dependencies `public` flag can be set.
+  #   # `public` flag doesn't have an effect for the `main` component.
+  #   # All dependencies of `main` are public by default.
+  #   public: true
+  #
+  #   # For components hosted on non-default registry:
+  #   service_url: "https://componentregistry.company.com"
+  #
+  # # For components in git repository:
+  # test_component:
+  #   path: test_component
+  #   git: ssh://git@gitlab.com/user/components.git
+  #
+  # # For test projects during component development
+  # # components can be used from a local directory
+  # # with relative or absolute path
+  # some_local_component:
+  #   path: ../../projects/component