From 8c5ac7605a1332cd4786fe14b2dd592a289076ef Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 22 Feb 2022 14:59:46 +0100 Subject: [PATCH 01/71] Support extern Ethernet (#60) see https://github.com/espressif/arduino-esp32/discussions/6318 --- configs/defconfig.esp32 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 605ef41d2..b5ea534fc 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -23,6 +23,8 @@ CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP32_XTAL_FREQ_AUTO=y +CONFIG_ETH_RMII_CLK_OUTPUT=y +CONFIG_ETH_RMII_CLK_OUT_GPIO=17 CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 From b8c68f68536a72f14acab7c2e34c07d3babdbb54 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 23 Feb 2022 21:23:10 +0100 Subject: [PATCH 02/71] Revert "Support extern Ethernet (#60)" (#61) This reverts commit 8c5ac7605a1332cd4786fe14b2dd592a289076ef. --- configs/defconfig.esp32 | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index b5ea534fc..605ef41d2 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -23,8 +23,6 @@ CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP32_XTAL_FREQ_AUTO=y -CONFIG_ETH_RMII_CLK_OUTPUT=y -CONFIG_ETH_RMII_CLK_OUT_GPIO=17 CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 From 3931f52d1169f30fbf21e3b30b31d17417b4afe6 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 01:29:02 +0200 Subject: [PATCH 03/71] Fix missing BLE 4.2 from ESP32-S3 --- build.sh | 13 +++++++------ configs/defconfig.esp32s3 | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index fccb8eec2..6bc2779ec 100755 --- a/build.sh +++ b/build.sh @@ -17,20 +17,20 @@ COPY_OUT=0 DEPLOY_OUT=0 function print_help() { - echo "Usage: build.sh [-s] [-A arduino_branch] [-I idf_branch] [-i idf_commit] [-a path] [-t ] [-b ] [config ...]" + echo "Usage: build.sh [-s] [-A arduino_branch] [-I idf_branch] [-i idf_commit] [-c path] [-t ] [-b ] [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 " -d Deploy the build to github arduino-esp32" - echo " -a Set the arduino-esp32 folder to copy the result to. ex. '$HOME/Arduino/hardware/espressif/esp32'" + 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'" 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:a:t:b:sd" opt; do +while getopts ":A:I:i:c:t:b:sd" opt; do case ${opt} in s ) SKIP_ENV=1 @@ -38,7 +38,7 @@ while getopts ":A:I:i:a:t:b:sd" opt; do d ) DEPLOY_OUT=1 ;; - a ) + c ) export ESP32_ARDUINO="$OPTARG" COPY_OUT=1 ;; @@ -111,6 +111,7 @@ rm -rf build sdkconfig out echo $(git -C $AR_COMPS/arduino describe --all --long) > version.txt +#targets_count=`jq -c '.targets[] | length' configs/builds.json` for target_json in `jq -c '.targets[]' configs/builds.json`; do target=$(echo "$target_json" | jq -c '.target' | tr -d '"') @@ -136,7 +137,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do 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" + bootloader_configs="$bootloader_configs;configs/defconfig.$defconf"; done echo "* Build BootLoader: $bootloader_configs" rm -rf build sdkconfig @@ -148,7 +149,7 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do for mem_conf in `echo "$target_json" | jq -c '.mem_variants[]'`; do mem_configs="$main_configs" for defconf in `echo "$mem_conf" | jq -c '.[]' | tr -d '"'`; do - mem_configs="$mem_configs;configs/defconfig.$defconf" + mem_configs="$mem_configs;configs/defconfig.$defconf"; done echo "* Build Memory Variant: $mem_configs" rm -rf build sdkconfig diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 899713f7b..8de433aff 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -8,6 +8,7 @@ CONFIG_COMPILER_CXX_EXCEPTIONS=y CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y CONFIG_BT_ENABLED=y +CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y CONFIG_BLE_MESH=y # CONFIG_SPI_MASTER_ISR_IN_IRAM is not set # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set From cd5d3b2e7dceac38ea2c81496ef1e2ebb7412857 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 02:30:58 +0200 Subject: [PATCH 04/71] Allow selecting Arduino branch based on the current lib-builder branch --- tools/update-components.sh | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 4a8edbd88..803bf2655 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -18,19 +18,26 @@ if [ ! -d "$AR_COMPS/arduino" ]; then fi if [ -z $AR_BRANCH ]; then - has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "idf-$IDF_BRANCH"` - if [ "$has_ar_branch" == "1" ]; then - export AR_BRANCH="idf-$IDF_BRANCH" + current_branch=`git branch --show-current` + if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then + export AR_BRANCH="$current_branch" else - has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"` + has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "idf-$IDF_BRANCH"` if [ "$has_ar_branch" == "1" ]; then - export AR_BRANCH="$AR_PR_TARGET_BRANCH" + export AR_BRANCH="idf-$IDF_BRANCH" + else + has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_PR_TARGET_BRANCH"` + if [ "$has_ar_branch" == "1" ]; then + export AR_BRANCH="$AR_PR_TARGET_BRANCH" + fi fi fi fi if [ "$AR_BRANCH" ]; then - git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" + git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \ + git -C "$AR_COMPS/arduino" fetch && \ + git -C "$AR_COMPS/arduino" pull --ff-only fi if [ $? -ne 0 ]; then exit 1; fi From 0180326a0252b27018b0ae32e10c67a4adff53d9 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 02:50:38 +0200 Subject: [PATCH 05/71] For CI builds get branch from env --- tools/update-components.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 803bf2655..fe4beaf7a 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -18,7 +18,11 @@ if [ ! -d "$AR_COMPS/arduino" ]; then fi if [ -z $AR_BRANCH ]; then - current_branch=`git branch --show-current` + if [ -z $GITHUB_REF_NAME ]; then + current_branch="$GITHUB_REF_NAME" + else + current_branch=`git branch --show-current` + fi if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then export AR_BRANCH="$current_branch" else From 68646715247c21635bf2e6cadba9ed7f8baf36ae Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 02:55:21 +0200 Subject: [PATCH 06/71] dump env --- tools/update-components.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-components.sh b/tools/update-components.sh index fe4beaf7a..2b7f56c05 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -12,6 +12,8 @@ TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git" # # CLONE/UPDATE ARDUINO # +env +exit 0 if [ ! -d "$AR_COMPS/arduino" ]; then git clone $AR_REPO_URL "$AR_COMPS/arduino" From ef3302c8ba4f74d2bb7119f664ad6650258406de Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 02:57:54 +0200 Subject: [PATCH 07/71] Update update-components.sh --- tools/update-components.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 2b7f56c05..f8c9e26a1 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -12,16 +12,14 @@ TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git" # # CLONE/UPDATE ARDUINO # -env -exit 0 if [ ! -d "$AR_COMPS/arduino" ]; then git clone $AR_REPO_URL "$AR_COMPS/arduino" fi if [ -z $AR_BRANCH ]; then - if [ -z $GITHUB_REF_NAME ]; then - current_branch="$GITHUB_REF_NAME" + if [ -z $GITHUB_HEAD_REF ]; then + current_branch="$GITHUB_HEAD_REF" else current_branch=`git branch --show-current` fi From b1fe3e0cac6cfdac14b6b42056032cd37ada9c74 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 03:01:45 +0200 Subject: [PATCH 08/71] Update update-components.sh --- tools/update-components.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index f8c9e26a1..76dbec07d 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -19,10 +19,11 @@ fi if [ -z $AR_BRANCH ]; then if [ -z $GITHUB_HEAD_REF ]; then - current_branch="$GITHUB_HEAD_REF" - else current_branch=`git branch --show-current` + else + current_branch="$GITHUB_HEAD_REF" fi + echo "Current Branch: $current_branch" if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then export AR_BRANCH="$current_branch" else From 78b3992572711a6dab31c4353aedc82d4071faaa Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 24 Feb 2022 12:28:16 +0200 Subject: [PATCH 09/71] Add support for CPP exceptions for C3 Fixes: https://github.com/espressif/arduino-esp32/issues/6187 --- configs/defconfig.esp32c3 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index c15bbcb1d..aa3e0124d 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -2,6 +2,9 @@ CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y CONFIG_ARDUINO_RUN_CORE0=y CONFIG_ARDUINO_EVENT_RUN_CORE0=y CONFIG_COMPILER_OPTIMIZATION_SIZE=y +CONFIG_COMPILER_CXX_EXCEPTIONS=y +CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y +CONFIG_COMPILER_WARN_WRITE_STRINGS=y CONFIG_BT_ENABLED=y CONFIG_BT_BLE_BLUFI_ENABLE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y From 79f7b0e728c3a0a3582ce6e2d7124a15c459efe8 Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Thu, 10 Mar 2022 05:22:51 +0200 Subject: [PATCH 10/71] Script improvements, rainmaker and esp-sr --- .gitignore | 3 +- CMakeLists.txt | 4 +- build.sh | 18 ++++++++ configs/builds.json | 19 +++++---- configs/defconfig.common | 1 + configs/defconfig.esp32 | 3 +- configs/defconfig.esp32s2 | 3 +- configs/defconfig.esp32s3 | 5 ++- .../{defconfig.opi_flash => defconfig.opi} | 0 configs/defconfig.opi_ram | 4 +- configs/defconfig.qio_ram | 1 + tools/copy-libs.sh | 8 ++-- tools/copy-mem-variant.sh | 7 +++- tools/update-components.sh | 42 +++++++++++++------ 14 files changed, 87 insertions(+), 31 deletions(-) rename configs/{defconfig.opi_flash => defconfig.opi} (100%) create mode 100644 configs/defconfig.qio_ram diff --git a/.gitignore b/.gitignore index 18043de7e..b74965aea 100644 --- a/.gitignore +++ b/.gitignore @@ -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/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 3928bf105..8edbe7205 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,7 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -if(IDF_TARGET STREQUAL "esp32") - set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components) -endif() +set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) diff --git a/build.sh b/build.sh index 6bc2779ec..a66245a17 100755 --- a/build.sh +++ b/build.sh @@ -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" diff --git a/configs/builds.json b/configs/builds.json index 8d20b2b1e..6d5b3a868 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -34,20 +34,23 @@ "targets":[ { "target": "esp32s3", - "idf_libs":["qio","80m"], + "features":[], + "idf_libs":["qio","80m","qio_ram"], "bootloaders":[ - ["qio","120m"], - ["qio","80m"], - ["dio","80m"], - ["opi_flash","opi_ram","80m"] + ["qio","120m","qio_ram"], + ["qio","80m","qio_ram"], + ["dio","80m","qio_ram"], + ["opi","80m","opi_ram"] ], "mem_variants":[ - ["opi_ram","80m"], - ["opi_flash","opi_ram","80m"] + ["qio","80m","opi_ram"], + ["opi","80m","opi_ram"], + ["opi","80m","qio_ram"] ] }, { "target": "esp32s2", + "features":["qio_ram"], "idf_libs":["qio","80m"], "bootloaders":[ ["qio","80m"], @@ -63,6 +66,7 @@ }, { "target": "esp32c3", + "features":[], "idf_libs":["qio","80m"], "bootloaders":[ ["qio","80m"], @@ -78,6 +82,7 @@ }, { "target": "esp32", + "features":["qio_ram"], "idf_libs":["dio","40m"], "bootloaders":[ ["qio","80m"], diff --git a/configs/defconfig.common b/configs/defconfig.common index 68135c3a8..67ee16fb1 100644 --- a/configs/defconfig.common +++ b/configs/defconfig.common @@ -1,2 +1,3 @@ CONFIG_AUTOSTART_ARDUINO=y CONFIG_ARDUINO_UDP_RUN_CORE0=y +# CONFIG_WS2812_LED_ENABLE is not set \ No newline at end of file diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 605ef41d2..f1fc7e444 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -17,7 +17,6 @@ CONFIG_BT_STACK_NO_LOG=y CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y CONFIG_ESP32_SPIRAM_SUPPORT=y -# CONFIG_SPIRAM_BOOT_INIT is not set CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 @@ -72,3 +71,5 @@ CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_USE_WAKENET is not set +# CONFIG_USE_MULTINET is not set \ No newline at end of file diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 28ca6c4cc..8ebfb8559 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -14,7 +14,6 @@ CONFIG_COMPILER_WARN_WRITE_STRINGS=y # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32S2_SPIRAM_SUPPORT=y -# CONFIG_SPIRAM_BOOT_INIT is not set CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 @@ -74,3 +73,5 @@ CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_USE_WAKENET is not set +# CONFIG_USE_MULTINET is not set \ No newline at end of file diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 8de433aff..8a8042e75 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -14,7 +14,6 @@ CONFIG_BLE_MESH=y # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32S3_SPIRAM_SUPPORT=y -# CONFIG_SPIRAM_BOOT_INIT is not set CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 @@ -76,3 +75,7 @@ CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +CONFIG_SR_WN_MODEL_WN8_QUANT=y +CONFIG_SR_WN_WN8_HIESP=y +CONFIG_SR_MN_ENGLISH=y +CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y \ No newline at end of file diff --git a/configs/defconfig.opi_flash b/configs/defconfig.opi similarity index 100% rename from configs/defconfig.opi_flash rename to configs/defconfig.opi diff --git a/configs/defconfig.opi_ram b/configs/defconfig.opi_ram index 8e157ad01..16e6a278c 100644 --- a/configs/defconfig.opi_ram +++ b/configs/defconfig.opi_ram @@ -1 +1,3 @@ -CONFIG_SPIRAM_MODE_OCT=y \ No newline at end of file +CONFIG_SPIRAM_MODE_OCT=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y +# CONFIG_SPIRAM_MEMTEST is not set \ No newline at end of file diff --git a/configs/defconfig.qio_ram b/configs/defconfig.qio_ram new file mode 100644 index 000000000..902680b3a --- /dev/null +++ b/configs/defconfig.qio_ram @@ -0,0 +1 @@ +# CONFIG_SPIRAM_BOOT_INIT is not set \ No newline at end of file diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 8e19c23e6..0c06f4b2b 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -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 '"') diff --git a/tools/copy-mem-variant.sh b/tools/copy-mem-variant.sh index c7b4765e2..b9366ad75 100755 --- a/tools/copy-mem-variant.sh +++ b/tools/copy-mem-variant.sh @@ -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 '"') diff --git a/tools/update-components.sh b/tools/update-components.sh index 76dbec07d..1c3391980 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -3,7 +3,8 @@ source ./tools/config.sh CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git" -FACE_REPO_URL="https://github.com/espressif/esp-dl.git" +DL_REPO_URL="https://github.com/espressif/esp-dl.git" +SR_REPO_URL="https://github.com/espressif/esp-sr.git" RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git" DSP_REPO_URL="https://github.com/espressif/esp-dsp.git" LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git" @@ -63,14 +64,26 @@ fi if [ $? -ne 0 ]; then exit 1; fi # -# CLONE/UPDATE ESP-FACE +# CLONE/UPDATE ESP-DL # -if [ ! -d "$AR_COMPS/esp-face" ]; then - git clone $FACE_REPO_URL "$AR_COMPS/esp-face" +if [ ! -d "$AR_COMPS/esp-dl" ]; then + git clone $DL_REPO_URL "$AR_COMPS/esp-dl" else - git -C "$AR_COMPS/esp-face" fetch && \ - git -C "$AR_COMPS/esp-face" pull --ff-only + git -C "$AR_COMPS/esp-dl" fetch && \ + git -C "$AR_COMPS/esp-dl" pull --ff-only +fi +if [ $? -ne 0 ]; then exit 1; fi + +# +# CLONE/UPDATE ESP-SR +# + +if [ ! -d "$AR_COMPS/esp-sr" ]; then + git clone $SR_REPO_URL "$AR_COMPS/esp-sr" +else + git -C "$AR_COMPS/esp-sr" fetch && \ + git -C "$AR_COMPS/esp-sr" pull --ff-only fi if [ $? -ne 0 ]; then exit 1; fi @@ -93,8 +106,13 @@ if [ $? -ne 0 ]; then exit 1; fi # if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then - git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker" - git -C "$AR_COMPS/esp-rainmaker" checkout f1b82c71c4536ab816d17df016d8afe106bd60e3 + git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker" && \ + git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive + # git -C "$AR_COMPS/esp-rainmaker" checkout f1b82c71c4536ab816d17df016d8afe106bd60e3 +else + git -C "$AR_COMPS/esp-rainmaker" fetch && \ + git -C "$AR_COMPS/esp-rainmaker" pull --ff-only && \ + git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive fi if [ $? -ne 0 ]; then exit 1; fi @@ -104,10 +122,10 @@ if [ $? -ne 0 ]; then exit 1; fi if [ ! -d "$AR_COMPS/esp-dsp" ]; then git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp" - cml=`cat "$AR_COMPS/esp-dsp/CMakeLists.txt"` - echo "if(IDF_TARGET STREQUAL \"esp32\" OR IDF_TARGET STREQUAL \"esp32s2\" OR IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-dsp/CMakeLists.txt" - echo "$cml" >> "$AR_COMPS/esp-dsp/CMakeLists.txt" - echo "endif()" >> "$AR_COMPS/esp-dsp/CMakeLists.txt" + # cml=`cat "$AR_COMPS/esp-dsp/CMakeLists.txt"` + # echo "if(IDF_TARGET STREQUAL \"esp32\" OR IDF_TARGET STREQUAL \"esp32s2\" OR IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-dsp/CMakeLists.txt" + # echo "$cml" >> "$AR_COMPS/esp-dsp/CMakeLists.txt" + # echo "endif()" >> "$AR_COMPS/esp-dsp/CMakeLists.txt" else git -C "$AR_COMPS/esp-dsp" fetch && \ git -C "$AR_COMPS/esp-dsp" pull --ff-only From 33273762deadeb530cf44cdc22c2450629e48b36 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 20 Mar 2022 15:50:30 +0100 Subject: [PATCH 11/71] Optimized for Tasmota --- .github/workflows/cron.yml | 39 --------------------- .github/workflows/push.yml | 36 ++++++++++++++------ CMakeLists.txt | 2 +- configs/builds.json | 8 ++--- configs/defconfig.esp32 | 45 ++++++++++++++++-------- configs/defconfig.esp32c3 | 62 +++++++++++++++++++++++++++------ configs/defconfig.esp32s2 | 50 ++++++++++++++++----------- configs/defconfig.esp32s3 | 70 ++++++++++++++++++++++++++++---------- configs/defconfig.qio_ram | 3 +- core_version.h | 4 +++ tools/archive-build.sh | 31 +++++++++++++---- tools/config.sh | 7 ++-- tools/install-esp-idf.sh | 12 ++++--- tools/update-components.sh | 44 ++++++++---------------- 14 files changed, 252 insertions(+), 161 deletions(-) delete mode 100644 .github/workflows/cron.yml create mode 100644 core_version.h diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml deleted file mode 100644 index 117ca8361..000000000 --- a/.github/workflows/cron.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Cron Build - -on: - schedule: -# ┌───────────── minute (0 - 59) -# │ ┌───────────── hour (0 - 23) -# │ │ ┌───────────── day of the month (1 - 31) -# │ │ │ ┌───────────── month (1 - 12 or JAN-DEC) -# │ │ │ │ ┌───────────── day of the week (0 - 6 or SUN-SAT) -# │ │ │ │ │ -# │ │ │ │ │ -# │ │ │ │ │ -# * * * * * - - cron: '0 */6 * * *' - -jobs: - run: - name: Build with IDF ${{ matrix.idf_branch }} - runs-on: ubuntu-latest - - strategy: - matrix: - idf_branch: [release/v4.4] #, release/v3.3] - steps: - - uses: actions/checkout@v1 - - name: Install dependencies - run: bash ./tools/prepare-ci.sh - - name: Build - env: - GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }} - GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }} - GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }} - IDF_BRANCH: ${{ matrix.idf_branch }} - run: bash ./tools/cron.sh - - name: Upload archive - uses: actions/upload-artifact@v1 - with: - name: artifacts - path: dist diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 87b558cf0..1f3752d7d 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,24 +1,40 @@ -name: ESP32 Arduino Libs CI +name: ESP32 Arduino builder branch PSRAM on: - push: - branches: - - master - pull_request: + workflow_dispatch: # Manually start a workflow +# push: +# branches: master +# paths-ignore: +# - '.github/**' # Ignore changes towards the .github directory jobs: - build-libs: name: Build Arduino Libs runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Install dependencies run: bash ./tools/prepare-ci.sh - name: Build Arduino Libs run: bash ./build.sh - - name: Upload archive - uses: actions/upload-artifact@v1 + - name: Upload artifact + uses: actions/upload-artifact@v2 with: - name: artifacts + name: esp32-arduino path: dist + - name: Download new builded framework + uses: actions/download-artifact@v2 + with: + name: esp32-arduino + path: ./esp32-arduino + - name: Display files from folder esp32-arduino + run: ls esp32-arduino/* + - name: Release + uses: softprops/action-gh-release@v1 + #if: startsWith(github.ref, 'refs/tags/') + with: + tag_name: ${{ github.run_number }} + prerelease: true + files: esp32-arduino/framework* + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 8edbe7205..8dcb88095 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components) +#set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(arduino-lib-builder) diff --git a/configs/builds.json b/configs/builds.json index 6d5b3a868..2aeaeb9f6 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -51,7 +51,7 @@ { "target": "esp32s2", "features":["qio_ram"], - "idf_libs":["qio","80m"], + "idf_libs":["dout","80m"], "bootloaders":[ ["qio","80m"], ["qout","80m"], @@ -67,7 +67,7 @@ { "target": "esp32c3", "features":[], - "idf_libs":["qio","80m"], + "idf_libs":["dout","80m"], "bootloaders":[ ["qio","80m"], ["qout","80m"], @@ -83,7 +83,7 @@ { "target": "esp32", "features":["qio_ram"], - "idf_libs":["dio","40m"], + "idf_libs":["dout","40m"], "bootloaders":[ ["qio","80m"], ["qout","80m"], @@ -97,4 +97,4 @@ "mem_variants":[] } ] -} \ No newline at end of file +} diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index f1fc7e444..84ae6a525 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -1,8 +1,14 @@ +CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y +CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y +CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y +CONFIG_DISABLE_HAL_LOCKS=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y -CONFIG_ARDUHAL_ESP_LOG=y +# CONFIG_PARTITION_TABLE_MD5 is not set CONFIG_COMPILER_OPTIMIZATION_SIZE=y -CONFIG_COMPILER_CXX_EXCEPTIONS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y CONFIG_BT_ENABLED=y @@ -17,28 +23,29 @@ CONFIG_BT_STACK_NO_LOG=y CONFIG_BT_ALLOCATION_FROM_SPIRAM_FIRST=y CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y CONFIG_ESP32_SPIRAM_SUPPORT=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_MEMTEST is not set +CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 -CONFIG_ESP32_ULP_COPROC_ENABLED=y CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y -CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 CONFIG_HTTPD_WS_SUPPORT=y CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 -CONFIG_ESP_INT_WDT_TIMEOUT_MS=300 +CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000 CONFIG_ESP_TASK_WDT_PANIC=y +CONFIG_ESP_TASK_WDT_TIMEOUT_S=10 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 -# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_STACK=y +CONFIG_FATFS_LFN_NONE=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 @@ -46,11 +53,15 @@ CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 CONFIG_FREERTOS_FPU_IN_ISR=y +CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_HEAP_POISONING_LIGHT=y -CONFIG_LOG_DEFAULT_LEVEL_ERROR=y +CONFIG_LOG_DEFAULT_LEVEL_NONE=y # CONFIG_LOG_COLORS is not set +CONFIG_LWIP_LOCAL_HOSTNAME="tasmota" CONFIG_LWIP_MAX_SOCKETS=16 -CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y +CONFIG_LWIP_SO_RCVBUF=y +CONFIG_LWIP_IP_FORWARD=y +CONFIG_LWIP_IPV4_NAPT=y # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 @@ -59,17 +70,23 @@ CONFIG_LWIP_TCP_MSS=1436 CONFIG_LWIP_TCP_RTO_TIME=3000 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y -CONFIG_LWIP_SNTP_MAX_SERVERS=3 -CONFIG_LWIP_DHCP_GET_NTP_SRV=y # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set -# CONFIG_MBEDTLS_HARDWARE_SHA is not set CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_SSL_PROTO_DTLS=y +CONFIG_NEWLIB_NANO_FORMAT=y +# CONFIG_OPENSSL_ERROR_STACK is not set CONFIG_OPENSSL_ASSERT_DO_NOTHING=y CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 +CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y +CONFIG_SPI_FLASH_ROM_IMPL=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_UNITY_ENABLE_FLOAT is not set +# CONFIG_UNITY_ENABLE_DOUBLE is not set +# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set # CONFIG_USE_WAKENET is not set -# CONFIG_USE_MULTINET is not set \ No newline at end of file +# 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 diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index aa3e0124d..63fcaa5a2 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -1,31 +1,71 @@ +CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y +CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y -CONFIG_ARDUINO_RUN_CORE0=y -CONFIG_ARDUINO_EVENT_RUN_CORE0=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y +CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y +CONFIG_DISABLE_HAL_LOCKS=y +CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y +# CONFIG_PARTITION_TABLE_MD5 is not set CONFIG_COMPILER_OPTIMIZATION_SIZE=y -CONFIG_COMPILER_CXX_EXCEPTIONS=y -CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y -CONFIG_COMPILER_WARN_WRITE_STRINGS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y +CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y CONFIG_BT_ENABLED=y +CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y CONFIG_BT_BLE_BLUFI_ENABLE=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y +CONFIG_ESP32C3_REV_MIN_0=y CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=576 -CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 CONFIG_HTTPD_WS_SUPPORT=y CONFIG_ESP_HTTPS_SERVER_ENABLE=y CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 +CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000 +CONFIG_ESP_TASK_WDT_TIMEOUT_S=10 # CONFIG_ESP32_WIFI_IRAM_OPT is not set # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP_WIFI_FTM_ENABLE=y -CONFIG_FATFS_LFN_HEAP=y +CONFIG_FATFS_CODEPAGE_850=y +CONFIG_FATFS_LFN_NONE=y CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 -CONFIG_LOG_DEFAULT_LEVEL_ERROR=y +CONFIG_HAL_ASSERTION_DISABLE=y +CONFIG_LOG_DEFAULT_LEVEL_NONE=y # CONFIG_LOG_COLORS is not set +CONFIG_LWIP_LOCAL_HOSTNAME="tasmota" CONFIG_LWIP_MAX_SOCKETS=16 +CONFIG_LWIP_SO_RCVBUF=y +CONFIG_LWIP_IP_FORWARD=y +CONFIG_LWIP_IPV4_NAPT=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 -CONFIG_LWIP_SNTP_MAX_SERVERS=3 -CONFIG_LWIP_DHCP_GET_NTP_SRV=y CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_CAMELLIA_C=y +CONFIG_NEWLIB_NANO_FORMAT=y +CONFIG_SPI_FLASH_ROM_IMPL=y +CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y +# CONFIG_UNITY_ENABLE_FLOAT is not set +# CONFIG_UNITY_ENABLE_DOUBLE is not set +# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER 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 diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 8ebfb8559..55dcec23c 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -1,27 +1,29 @@ +CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y +CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y +CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y +CONFIG_DISABLE_HAL_LOCKS=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y -CONFIG_ARDUINO_RUN_CORE0=y -CONFIG_ARDUINO_EVENT_RUN_CORE0=y -CONFIG_ARDUHAL_ESP_LOG=y +# CONFIG_PARTITION_TABLE_MD5 is not set CONFIG_TINYUSB_MSC_BUFSIZE=4096 CONFIG_TINYUSB_DESC_DFU_RT_STRING="Espressif DFU Device" CONFIG_COMPILER_OPTIMIZATION_SIZE=y -CONFIG_COMPILER_CXX_EXCEPTIONS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y -# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set -# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32S2_SPIRAM_SUPPORT=y +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_MEMTEST is not set +CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 CONFIG_ESP32S2_KEEP_USB_ALIVE=y -CONFIG_ETH_SPI_ETHERNET_DM9051=y -CONFIG_ETH_SPI_ETHERNET_W5500=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y -CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 CONFIG_HTTPD_WS_SUPPORT=y CONFIG_ESP_HTTPS_SERVER_ENABLE=y CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 @@ -29,7 +31,7 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000 CONFIG_ESP_TASK_WDT_PANIC=y -# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set +CONFIG_ESP_TASK_WDT_TIMEOUT_S=10 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8 @@ -37,21 +39,24 @@ CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 CONFIG_ESP32_WIFI_CSI_ENABLED=y # CONFIG_ESP32_WIFI_IRAM_OPT is not set # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set -# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set CONFIG_ESP_WIFI_FTM_ENABLE=y CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_STACK=y +CONFIG_FATFS_LFN_NONE=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_HEAP_POISONING_LIGHT=y -CONFIG_LOG_DEFAULT_LEVEL_ERROR=y +CONFIG_LOG_DEFAULT_LEVEL_NONE=y # CONFIG_LOG_COLORS is not set +CONFIG_LWIP_LOCAL_HOSTNAME="tasmota" CONFIG_LWIP_MAX_SOCKETS=16 -CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y +CONFIG_LWIP_SO_RCVBUF=y +CONFIG_LWIP_IP_FORWARD=y +CONFIG_LWIP_IPV4_NAPT=y # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 @@ -60,18 +65,23 @@ CONFIG_LWIP_TCP_MSS=1436 CONFIG_LWIP_TCP_RTO_TIME=3000 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y -CONFIG_LWIP_SNTP_MAX_SERVERS=3 -CONFIG_LWIP_DHCP_GET_NTP_SRV=y # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set -# CONFIG_MBEDTLS_HARDWARE_MPI is not set -# CONFIG_MBEDTLS_HARDWARE_SHA is not set +CONFIG_MBEDTLS_SSL_PROTO_DTLS=y CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_SSL_PROTO_DTLS=y +CONFIG_NEWLIB_NANO_FORMAT=y CONFIG_OPENSSL_ASSERT_DO_NOTHING=y CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 +CONFIG_SPI_FLASH_ROM_IMPL=y +CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_UNITY_ENABLE_FLOAT is not set +# CONFIG_UNITY_ENABLE_DOUBLE is not set +# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set # CONFIG_USE_WAKENET is not set -# CONFIG_USE_MULTINET is not set \ No newline at end of file +# 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 diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 8a8042e75..687922e90 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -1,27 +1,53 @@ +CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y +CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y +CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y +CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y +CONFIG_DISABLE_HAL_LOCKS=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y -CONFIG_ARDUHAL_ESP_LOG=y +# CONFIG_PARTITION_TABLE_MD5 is not set CONFIG_TINYUSB_MSC_BUFSIZE=4096 CONFIG_COMPILER_OPTIMIZATION_SIZE=y -CONFIG_COMPILER_CXX_EXCEPTIONS=y +CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y CONFIG_COMPILER_STACK_CHECK_MODE_NORM=y CONFIG_COMPILER_WARN_WRITE_STRINGS=y CONFIG_BT_ENABLED=y CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y -CONFIG_BLE_MESH=y -# CONFIG_SPI_MASTER_ISR_IN_IRAM is not set -# CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set +CONFIG_BT_LOG_HCI_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BTM_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_L2CAP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_RFCOMM_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_SDP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_GAP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BNEP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_PAN_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_A2D_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_AVDT_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_AVCT_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_AVRC_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_MCA_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_HID_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_APPL_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_GATT_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_SMP_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BTIF_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BTC_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_OSI_TRACE_LEVEL_NONE=y +CONFIG_BT_LOG_BLUFI_TRACE_LEVEL_NONE=y +CONFIG_BLE_MESH_TRACE_LEVEL_NONE=y +CONFIG_BLE_MESH_NET_BUF_TRACE_LEVEL_NONE=y CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y CONFIG_ESP32S3_SPIRAM_SUPPORT=y +# CONFIG_SPIRAM_MEMTEST is not set +CONFIG_SPIRAM_SPEED_80M=y +CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=576 -CONFIG_ETH_SPI_ETHERNET_DM9051=y -CONFIG_ETH_SPI_ETHERNET_W5500=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y -CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024 CONFIG_HTTPD_WS_SUPPORT=y CONFIG_ESP_HTTPS_SERVER_ENABLE=y CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y @@ -31,6 +57,7 @@ CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2048 CONFIG_ESP_MAIN_TASK_STACK_SIZE=4096 CONFIG_ESP_INT_WDT_TIMEOUT_MS=1000 CONFIG_ESP_TASK_WDT_PANIC=y +CONFIG_ESP_TASK_WDT_TIMEOUT_S=10 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8 @@ -39,21 +66,24 @@ CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 CONFIG_ESP32_WIFI_CSI_ENABLED=y # CONFIG_ESP32_WIFI_IRAM_OPT is not set # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set -# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set CONFIG_ESP_WIFI_FTM_ENABLE=y CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_STACK=y +CONFIG_FATFS_LFN_NONE=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024 +CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_HEAP_POISONING_LIGHT=y -CONFIG_LOG_DEFAULT_LEVEL_ERROR=y +CONFIG_LOG_DEFAULT_LEVEL_NONE=y # CONFIG_LOG_COLORS is not set +CONFIG_LWIP_LOCAL_HOSTNAME="tasmota" CONFIG_LWIP_MAX_SOCKETS=16 -CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y +CONFIG_LWIP_SO_RCVBUF=y +CONFIG_LWIP_IP_FORWARD=y +CONFIG_LWIP_IPV4_NAPT=y # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 @@ -62,20 +92,24 @@ CONFIG_LWIP_TCP_MSS=1436 CONFIG_LWIP_TCP_RTO_TIME=3000 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y -CONFIG_LWIP_SNTP_MAX_SERVERS=3 -CONFIG_LWIP_DHCP_GET_NTP_SRV=y # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set -# CONFIG_MBEDTLS_HARDWARE_MPI is not set -# CONFIG_MBEDTLS_HARDWARE_SHA is not set CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y -CONFIG_MBEDTLS_SSL_PROTO_DTLS=y +CONFIG_NEWLIB_NANO_FORMAT=y CONFIG_OPENSSL_ASSERT_DO_NOTHING=y CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 +CONFIG_SPI_FLASH_ROM_IMPL=y +CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 +# CONFIG_UNITY_ENABLE_FLOAT is not set +# CONFIG_UNITY_ENABLE_DOUBLE is not set +# CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER is not set CONFIG_SR_WN_MODEL_WN8_QUANT=y CONFIG_SR_WN_WN8_HIESP=y CONFIG_SR_MN_ENGLISH=y -CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y \ No newline at end of file +CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y +# CONFIG_VFS_SUPPORT_SELECT is not set +# CONFIG_VFS_SUPPRESS_SELECT_DEBUG_OUTPUT is not set +# CONFIG_VFS_SUPPORT_TERMIOS is not set diff --git a/configs/defconfig.qio_ram b/configs/defconfig.qio_ram index 902680b3a..d4676e8ee 100644 --- a/configs/defconfig.qio_ram +++ b/configs/defconfig.qio_ram @@ -1 +1,2 @@ -# CONFIG_SPIRAM_BOOT_INIT is not set \ No newline at end of file +CONFIG_SPIRAM_IGNORE_NOTFOUND=y +# CONFIG_SPIRAM_MEMTEST is not set diff --git a/core_version.h b/core_version.h new file mode 100644 index 000000000..644a569da --- /dev/null +++ b/core_version.h @@ -0,0 +1,4 @@ +#define ARDUINO_ESP32_GIT_VER 0x6ed33835 +#define ARDUINO_ESP32_GIT_DESC 2.0.3 +#define ARDUINO_ESP32_RELEASE_2_0_3 +#define ARDUINO_ESP32_RELEASE "2_0_3" diff --git a/tools/archive-build.sh b/tools/archive-build.sh index d6682ff97..d14a4d80b 100755 --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -6,11 +6,30 @@ IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD) idf_version_string=${IDF_BRANCH//\//_}"-$IDF_COMMIT" archive_path="dist/arduino-esp32-libs-$idf_version_string.tar.gz" build_archive_path="dist/arduino-esp32-build-$idf_version_string.tar.gz" +pio_archive_path="dist/framework-arduinoespressif32-$idf_version_string.tar.gz" mkdir -p dist && rm -rf "$archive_path" "$build_archive_path" -if [ -d "out" ]; then - cd out && tar zcf "../$archive_path" * && cd .. -fi -if [ -d "build" ]; then - cd build && tar zcf "../$build_archive_path" * && cd .. -fi + +cd out +echo "Show files from folder out" +ls +echo "Show Arduino directory" +ls ../components/arduino +echo "Creating framework-arduinoespressif32" +cp -rf ../components/arduino arduino-esp32 +rm -rf arduino-esp32/docs +rm -rf arduino-esp32/tests +rm -rf arduino-esp32/package +rm -rf arduino-esp32/tools/sdk +rm -rf arduino-esp32/tools/esptool.py +rm -rf arduino-esp32/tools/gen_esp32part.py +rm -rf arduino-esp32/tools/platformio-build-*.py +rm -rf arduino-esp32/platform.txt +cp -f platform.txt arduino-esp32/ +cp -Rf tools/sdk arduino-esp32/tools/ +cp -f tools/esptool.py arduino-esp32/tools/ +cp -f tools/gen_esp32part.py arduino-esp32/tools/ +cp -f tools/platformio-build-*.py arduino-esp32/tools/ +cp ../core_version.h arduino-esp32/cores/esp32/core_version.h +mv arduino-esp32/ framework-arduinoespressif32/ +tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/ diff --git a/tools/config.sh b/tools/config.sh index 2c4e626ad..7e73de854 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -3,7 +3,7 @@ IDF_COMPS="$IDF_PATH/components" if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="release/v4.4" + IDF_BRANCH="v4.4_dev" fi if [ -z $AR_PR_TARGET_BRANCH ]; then @@ -24,11 +24,14 @@ fi IDF_TOOLCHAIN="xtensa-$IDF_TARGET-elf" # Owner of the target ESP32 Arduino repository -AR_USER="espressif" +AR_USER="tasmota" # The full name of the repository AR_REPO="$AR_USER/arduino-esp32" +# Arduino branch to use +AR_BRANCH="esp32-s3-support" + AR_REPO_URL="https://github.com/$AR_REPO.git" if [ -n $GITHUB_TOKEN ]; then AR_REPO_URL="https://$GITHUB_TOKEN@github.com/$AR_REPO.git" diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index a0e58899f..bc332f454 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -11,20 +11,22 @@ fi # CLONE ESP-IDF # -IDF_REPO_URL="https://github.com/espressif/esp-idf.git" +IDF_REPO_URL="https://github.com/tasmota/esp-idf.git" if [ -z "$IDF_PATH" ]; then echo "ESP-IDF is not installed! Installing local copy" idf_was_installed="1" if ! [ -d esp-idf ]; then + echo "git clone $IDF_REPO_URL -b $IDF_BRANCH" git clone $IDF_REPO_URL -b $IDF_BRANCH fi export IDF_PATH="$AR_ROOT/esp-idf" fi -if [ "$IDF_COMMIT" ]; then - git -C "$IDF_PATH" checkout "$IDF_COMMIT" - commit_predefined="1" -fi +# Next lines redirects ALWAYS to espressif git since this sha1 only exists there!!! +#if [ "$IDF_COMMIT" ]; then +# git -C "$IDF_PATH" checkout "$IDF_COMMIT" +# commit_predefined="1" +#fi export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD) export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD) diff --git a/tools/update-components.sh b/tools/update-components.sh index 1c3391980..e7286ace3 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -5,7 +5,6 @@ source ./tools/config.sh CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git" DL_REPO_URL="https://github.com/espressif/esp-dl.git" SR_REPO_URL="https://github.com/espressif/esp-sr.git" -RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git" DSP_REPO_URL="https://github.com/espressif/esp-dsp.git" LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git" TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git" @@ -67,25 +66,25 @@ if [ $? -ne 0 ]; then exit 1; fi # CLONE/UPDATE ESP-DL # -if [ ! -d "$AR_COMPS/esp-dl" ]; then - git clone $DL_REPO_URL "$AR_COMPS/esp-dl" -else - git -C "$AR_COMPS/esp-dl" fetch && \ - git -C "$AR_COMPS/esp-dl" pull --ff-only -fi -if [ $? -ne 0 ]; then exit 1; fi +#if [ ! -d "$AR_COMPS/esp-dl" ]; then +# git clone $DL_REPO_URL "$AR_COMPS/esp-dl" +#else +# git -C "$AR_COMPS/esp-dl" fetch && \ +# git -C "$AR_COMPS/esp-dl" pull --ff-only +#fi +#if [ $? -ne 0 ]; then exit 1; fi # # CLONE/UPDATE ESP-SR # -if [ ! -d "$AR_COMPS/esp-sr" ]; then - git clone $SR_REPO_URL "$AR_COMPS/esp-sr" -else - git -C "$AR_COMPS/esp-sr" fetch && \ - git -C "$AR_COMPS/esp-sr" pull --ff-only -fi -if [ $? -ne 0 ]; then exit 1; fi +#if [ ! -d "$AR_COMPS/esp-sr" ]; then +# git clone $SR_REPO_URL "$AR_COMPS/esp-sr" +#else +# git -C "$AR_COMPS/esp-sr" fetch && \ +# git -C "$AR_COMPS/esp-sr" pull --ff-only +#fi +#if [ $? -ne 0 ]; then exit 1; fi # # CLONE/UPDATE ESP-LITTLEFS @@ -101,21 +100,6 @@ else fi if [ $? -ne 0 ]; then exit 1; fi -# -# CLONE/UPDATE ESP-RAINMAKER -# - -if [ ! -d "$AR_COMPS/esp-rainmaker" ]; then - git clone $RMAKER_REPO_URL "$AR_COMPS/esp-rainmaker" && \ - git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive - # git -C "$AR_COMPS/esp-rainmaker" checkout f1b82c71c4536ab816d17df016d8afe106bd60e3 -else - git -C "$AR_COMPS/esp-rainmaker" fetch && \ - git -C "$AR_COMPS/esp-rainmaker" pull --ff-only && \ - git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive -fi -if [ $? -ne 0 ]; then exit 1; fi - # # CLONE/UPDATE ESP-DSP # From 847cf99d319c23c0b3e917083bbe9e9870c5f9dc Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 20 Mar 2022 15:56:51 +0100 Subject: [PATCH 12/71] Update build.sh --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index a66245a17..0e634f666 100755 --- a/build.sh +++ b/build.sh @@ -84,7 +84,7 @@ if [ $SKIP_ENV -eq 0 ]; then ./tools/update-components.sh if [ $? -ne 0 ]; then exit 1; fi - # install esp-idf and gcc toolchain + # install esp-idf source ./tools/install-esp-idf.sh if [ $? -ne 0 ]; then exit 1; fi else From bafa5cc792c9b0ad71505a2f0a481bf7bb9f65da Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 20 Mar 2022 15:59:09 +0100 Subject: [PATCH 13/71] Update config.sh --- tools/config.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index 7e73de854..cd807a91c 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -1,6 +1,9 @@ #!/bin/bash -IDF_COMPS="$IDF_PATH/components" + +if [ -z $IDF_PATH ]; then + export IDF_PATH="$PWD/esp-idf" +fi if [ -z $IDF_BRANCH ]; then IDF_BRANCH="v4.4_dev" @@ -21,6 +24,7 @@ if [ -z $IDF_TARGET ]; then fi fi +IDF_COMPS="$IDF_PATH/components" IDF_TOOLCHAIN="xtensa-$IDF_TARGET-elf" # Owner of the target ESP32 Arduino repository From df7a5618524cdc850f669bc002aad3b9a110a00c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 20 Mar 2022 16:02:52 +0100 Subject: [PATCH 14/71] Update install-esp-idf.sh --- tools/install-esp-idf.sh | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index bc332f454..8cb98fb20 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -12,14 +12,11 @@ fi # IDF_REPO_URL="https://github.com/tasmota/esp-idf.git" -if [ -z "$IDF_PATH" ]; then +if [ ! -d "$IDF_PATH" ]; then echo "ESP-IDF is not installed! Installing local copy" + echo "git clone $IDF_REPO_URL -b $IDF_BRANCH" + git clone $IDF_REPO_URL -b $IDF_BRANCH idf_was_installed="1" - if ! [ -d esp-idf ]; then - echo "git clone $IDF_REPO_URL -b $IDF_BRANCH" - git clone $IDF_REPO_URL -b $IDF_BRANCH - fi - export IDF_PATH="$AR_ROOT/esp-idf" fi # Next lines redirects ALWAYS to espressif git since this sha1 only exists there!!! @@ -28,6 +25,20 @@ fi # commit_predefined="1" #fi +# +# UPDATE ESP-IDF TOOLS AND MODULES +# + +if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then + git -C $IDF_PATH submodule update --init --recursive + $IDF_PATH/install.sh +fi + +# +# SETUP ESP-IDF ENV +# + +source $IDF_PATH/export.sh export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD) export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD) @@ -90,17 +101,3 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito export AR_HAS_BRANCH export AR_HAS_PR fi - -# -# UPDATE IDF MODULES -# - -if [ -x $idf_was_installed ]; then - echo "ESP-IDF is already installed at: $IDF_PATH" -else - git -C $IDF_PATH submodule update --init --recursive - cd $IDF_PATH && python -m pip install -r requirements.txt -fi -cd "$AR_ROOT" -$IDF_PATH/install.sh -source $IDF_PATH/export.sh From 57692daed7c0a3a57957f317ac91600b3a1fec74 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 28 Mar 2022 13:03:21 +0200 Subject: [PATCH 15/71] AR_BRANCH="master" --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index cd807a91c..c2e8e49f6 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -34,7 +34,7 @@ AR_USER="tasmota" AR_REPO="$AR_USER/arduino-esp32" # Arduino branch to use -AR_BRANCH="esp32-s3-support" +AR_BRANCH="master" AR_REPO_URL="https://github.com/$AR_REPO.git" if [ -n $GITHUB_TOKEN ]; then From e424b54e34801e1f57eed195277ffc697721c1f3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 28 Mar 2022 13:03:42 +0200 Subject: [PATCH 16/71] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 1f3752d7d..d9d6dc9c8 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: ESP32 Arduino builder branch PSRAM +name: ESP32 Arduino builder on: workflow_dispatch: # Manually start a workflow From 13ab4156c1cc2682184b3bdbab9e8c3083a01073 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 28 Mar 2022 14:09:33 +0200 Subject: [PATCH 17/71] Update defconfig.esp32s3 --- configs/defconfig.esp32s3 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 687922e90..f40751d21 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -5,7 +5,6 @@ CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y CONFIG_DISABLE_HAL_LOCKS=y -CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_PARTITION_TABLE_MD5 is not set CONFIG_TINYUSB_MSC_BUFSIZE=4096 From c8b869be85d3a2425639d72c16ec1315d8836c3f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 28 Mar 2022 14:10:36 +0200 Subject: [PATCH 18/71] Update defconfig.esp32s2 --- configs/defconfig.esp32s2 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 55dcec23c..57c6b4765 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -5,7 +5,6 @@ CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_NONE=y CONFIG_DISABLE_HAL_LOCKS=y -CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_PARTITION_TABLE_MD5 is not set CONFIG_TINYUSB_MSC_BUFSIZE=4096 From a2e711cbea4644ae6b6d4c27286e6b105f65423b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 28 Mar 2022 19:59:33 +0200 Subject: [PATCH 19/71] space in path fix --- tools/copy-libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 0c06f4b2b..8ca5ea362 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -307,7 +307,7 @@ set -- $PIO_LD_FUNCS for item; do echo " \"-u\", \"$item\"," >> "$AR_PLATFORMIO_PY" done -echo " '-Wl,-Map=\"%s\"' % join(\"\$BUILD_DIR\", basename(env.subst(\"\${PROJECT_DIR}.map\")))" >> "$AR_PLATFORMIO_PY" +echo " '-Wl,-Map=\"%s\"' % join(\"\$(BUILD_DIR)\", (\"\${PROGNAME}.map\"))" >> "$AR_PLATFORMIO_PY" echo " ]," >> "$AR_PLATFORMIO_PY" echo "" >> "$AR_PLATFORMIO_PY" From 71ebefaa84fadb627cf0569c7cee9138457983a4 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 28 Mar 2022 20:08:26 +0200 Subject: [PATCH 20/71] fix space in path --- tools/copy-libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 8ca5ea362..44741c820 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -307,7 +307,7 @@ set -- $PIO_LD_FUNCS for item; do echo " \"-u\", \"$item\"," >> "$AR_PLATFORMIO_PY" done -echo " '-Wl,-Map=\"%s\"' % join(\"\$(BUILD_DIR)\", (\"\${PROGNAME}.map\"))" >> "$AR_PLATFORMIO_PY" +echo " '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")" >> "$AR_PLATFORMIO_PY" echo " ]," >> "$AR_PLATFORMIO_PY" echo "" >> "$AR_PLATFORMIO_PY" From 154d709daae3ed9bfdddbad8ac858cfa4fe37fb3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 29 Mar 2022 16:02:08 +0200 Subject: [PATCH 21/71] Update install-esp-idf.sh --- tools/install-esp-idf.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index 8cb98fb20..3bca85652 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -64,6 +64,7 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito if [ "$AR_HAS_COMMIT" == "1" ]; then echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists" + mkdir -p dist && echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists" > dist/log.txt exit 0 fi From 119c3efd8fe955dca974fb82ab64c8730583d54b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 29 Mar 2022 17:37:12 +0200 Subject: [PATCH 22/71] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b14b38f3c..dc33da57b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder) +# Tasmota ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder) This repository contains the scripts that produce the libraries included with esp32-arduino. From 875cc057dbc450027277700ab5f5f89f85fec879 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Mar 2022 18:52:05 +0200 Subject: [PATCH 23/71] esp littlesfs broken going back to commit 4ee58815 --- tools/update-components.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/update-components.sh b/tools/update-components.sh index e7286ace3..388b0334a 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -93,10 +93,12 @@ if [ $? -ne 0 ]; then exit 1; fi if [ ! -d "$AR_COMPS/esp_littlefs" ]; then git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive + git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 else git -C "$AR_COMPS/esp_littlefs" fetch && \ git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive + git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 fi if [ $? -ne 0 ]; then exit 1; fi From ae1ce2f592c9bfc3ed76f18d9b1a74b8b9337958 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Mar 2022 21:27:31 +0200 Subject: [PATCH 24/71] lfn --- configs/defconfig.esp32 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 84ae6a525..9eaada7dc 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -45,7 +45,7 @@ CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8 CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16 CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_NONE=y +CONFIG_FATFS_LFN_STACK=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 From db1c15acd38b6af9974356ac7a0c343a671e11f8 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Mar 2022 21:28:49 +0200 Subject: [PATCH 25/71] lfn --- configs/defconfig.esp32c3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 63fcaa5a2..9d4f23b2e 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -45,7 +45,7 @@ CONFIG_ESP_TASK_WDT_TIMEOUT_S=10 # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP_WIFI_FTM_ENABLE=y CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_NONE=y +CONFIG_FATFS_LFN_STACK=y CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 From 32bb429fc806f01e7ecdaa1d03ac154ef148e95f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Mar 2022 21:29:32 +0200 Subject: [PATCH 26/71] lfn --- configs/defconfig.esp32s2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 57c6b4765..f00dd53cc 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -40,7 +40,7 @@ CONFIG_ESP32_WIFI_CSI_ENABLED=y # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP_WIFI_FTM_ENABLE=y CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_NONE=y +CONFIG_FATFS_LFN_STACK=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 From 9ce1ed31e6bd183a89efd58a52d15d6ca433a8d1 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Mar 2022 21:30:31 +0200 Subject: [PATCH 27/71] lfn --- configs/defconfig.esp32s3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index f40751d21..53c5d2d6c 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -67,7 +67,7 @@ CONFIG_ESP32_WIFI_CSI_ENABLED=y # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP_WIFI_FTM_ENABLE=y CONFIG_FATFS_CODEPAGE_850=y -CONFIG_FATFS_LFN_NONE=y +CONFIG_FATFS_LFN_STACK=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FREERTOS_HZ=1000 From 69793e0c6dda7456393f1ab17d5f8877f71f0b85 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 30 Mar 2022 21:31:47 +0200 Subject: [PATCH 28/71] use actual littlefs --- tools/update-components.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 388b0334a..fec84c637 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -93,12 +93,12 @@ if [ $? -ne 0 ]; then exit 1; fi if [ ! -d "$AR_COMPS/esp_littlefs" ]; then git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive - git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 + #git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 else git -C "$AR_COMPS/esp_littlefs" fetch && \ git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive - git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 + #git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 fi if [ $? -ne 0 ]; then exit 1; fi From 50affd591455ce74fab102bc908921f7f39dea56 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 31 Mar 2022 12:23:45 +0200 Subject: [PATCH 29/71] esp_littlefs commit 4ee58815093 --- tools/update-components.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index fec84c637..388b0334a 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -93,12 +93,12 @@ if [ $? -ne 0 ]; then exit 1; fi if [ ! -d "$AR_COMPS/esp_littlefs" ]; then git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive - #git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 + git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 else git -C "$AR_COMPS/esp_littlefs" fetch && \ git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive - #git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 + git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 fi if [ $? -ne 0 ]; then exit 1; fi From 7b73ef69c6a104ade0a1d9acdf1567a99de45bce Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 31 Mar 2022 13:40:45 +0200 Subject: [PATCH 30/71] Update config.sh --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index c2e8e49f6..79daa7a59 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -34,7 +34,7 @@ AR_USER="tasmota" AR_REPO="$AR_USER/arduino-esp32" # Arduino branch to use -AR_BRANCH="master" +AR_BRANCH="revert" AR_REPO_URL="https://github.com/$AR_REPO.git" if [ -n $GITHUB_TOKEN ]; then From 59f07249fd4636395aea08652241c4dbf34d9080 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 31 Mar 2022 14:35:15 +0200 Subject: [PATCH 31/71] use latest littlefs --- tools/update-components.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/update-components.sh b/tools/update-components.sh index 388b0334a..fec84c637 100755 --- a/tools/update-components.sh +++ b/tools/update-components.sh @@ -93,12 +93,12 @@ if [ $? -ne 0 ]; then exit 1; fi if [ ! -d "$AR_COMPS/esp_littlefs" ]; then git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive - git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 + #git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 else git -C "$AR_COMPS/esp_littlefs" fetch && \ git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \ git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive - git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 + #git -C "$AR_COMPS/esp_littlefs" checkout 4ee5881509360d6c58b16bbc698218ee5e21b4d2 fi if [ $? -ne 0 ]; then exit 1; fi From 071c4e1336ead06ce7c4ffac83c7859cda8a3447 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 31 Mar 2022 16:15:17 +0200 Subject: [PATCH 32/71] AR_BRANCH="work" --- tools/config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/config.sh b/tools/config.sh index 79daa7a59..c9da545dd 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -34,7 +34,7 @@ AR_USER="tasmota" AR_REPO="$AR_USER/arduino-esp32" # Arduino branch to use -AR_BRANCH="revert" +AR_BRANCH="work" AR_REPO_URL="https://github.com/$AR_REPO.git" if [ -n $GITHUB_TOKEN ]; then @@ -118,4 +118,3 @@ function git_create_pr(){ # git_create_pr local done_pr=`echo "$git_create_pr_res" | jq -r '.title'` if [ ! "$done_pr" == "" ] && [ ! "$done_pr" == "null" ]; then echo 1; else echo 0; fi } - From e6259969980ed0f074d12e414a03f4f9104c0074 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 8 Apr 2022 22:35:09 +0200 Subject: [PATCH 33/71] IDF branch v4.4_work --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index c9da545dd..785782dba 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="v4.4_dev" + IDF_BRANCH="v4.4_work" fi if [ -z $AR_PR_TARGET_BRANCH ]; then From e50faaf7b600c51693fa7af292709bbccd294a65 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 8 Apr 2022 22:36:13 +0200 Subject: [PATCH 34/71] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d9d6dc9c8..e9724302a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: ESP32 Arduino builder +name: ESP32 builder v4.4_work on: workflow_dispatch: # Manually start a workflow From 6e0355a3143f826568d602ec4909cf95b45d4fa6 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 21 Apr 2022 17:41:00 +0200 Subject: [PATCH 35/71] Update defconfig.esp32 --- configs/defconfig.esp32 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 9eaada7dc..91a20fbf6 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -27,7 +27,6 @@ CONFIG_SPIRAM_BOOT_INIT=y # CONFIG_SPIRAM_MEMTEST is not set CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 -CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y From c87f9cd7746998d53b593f7b5a9a31b98ff5d328 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 21 Apr 2022 17:43:15 +0200 Subject: [PATCH 36/71] Update fb_gfx.h --- components/fb_gfx/include/fb_gfx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/fb_gfx/include/fb_gfx.h b/components/fb_gfx/include/fb_gfx.h index 079ff7bfe..158c80f6b 100644 --- a/components/fb_gfx/include/fb_gfx.h +++ b/components/fb_gfx/include/fb_gfx.h @@ -19,7 +19,7 @@ extern "C" { #endif typedef enum { - FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565 + FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY } fb_format_t; typedef struct { From 71fe54fd349fb6d13715fe02e5b946affd41f09c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 21 Apr 2022 17:43:54 +0200 Subject: [PATCH 37/71] Update fb_gfx.c --- components/fb_gfx/fb_gfx.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/components/fb_gfx/fb_gfx.c b/components/fb_gfx/fb_gfx.c index 7f0c66026..ab373c16f 100644 --- a/components/fb_gfx/fb_gfx.c +++ b/components/fb_gfx/fb_gfx.c @@ -38,17 +38,24 @@ typedef struct { // Data stored for FONT AS A WHOLE: void fb_gfx_fillRect(fb_data_t *fb, int32_t x, int32_t y, int32_t w, int32_t h, uint32_t color) { - int32_t line_step = (fb->width - w) * 3; - uint8_t *data = fb->data + ((x + (y * fb->width)) * 3); + int32_t line_step = (fb->width - w) * fb->bytes_per_pixel; + uint8_t *data = fb->data + ((x + (y * fb->width)) * fb->bytes_per_pixel); uint8_t c0 = color >> 16; uint8_t c1 = color >> 8; uint8_t c2 = color; for (int i=0; i<h; i++){ for (int j=0; j<w; j++){ - data[0] = c0; - data[1] = c1; - data[2] = c2; - data+=3; + if(fb->bytes_per_pixel == 2){ + data[0] = c1; + data[1] = c2; + } else if(fb->bytes_per_pixel == 1){ + data[0] = c2; + } else { + data[0] = c0; + data[1] = c1; + data[2] = c2; + } + data+=fb->bytes_per_pixel; } data += line_step; } From f14e5589028b177069e78f168596a4ef1475ba67 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:44:58 +0200 Subject: [PATCH 38/71] IDF_BRANCH="v4.4.1" --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index 785782dba..a3a0193a1 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="v4.4_work" + IDF_BRANCH="v4.4.1" fi if [ -z $AR_PR_TARGET_BRANCH ]; then From 6d75d181ccba7b963f97474fb69ed6b65b466b01 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 28 Apr 2022 12:45:24 +0200 Subject: [PATCH 39/71] Update push.yml --- .github/workflows/push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e9724302a..9fd7d6226 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: ESP32 builder v4.4_work +name: ESP32 builder v4.4.1 on: workflow_dispatch: # Manually start a workflow From b126dd424c1387d7d8bac696c3b29f624812edbd Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 10 May 2022 17:59:52 +0200 Subject: [PATCH 40/71] remove CONFIG_SPI_FLASH_ROM_IMPL since it breaks dangerous writes --- configs/defconfig.esp32c3 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 9d4f23b2e..8e2bd2d12 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -61,7 +61,6 @@ CONFIG_LWIP_DHCP_OPTIONS_LEN=128 CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_NEWLIB_NANO_FORMAT=y -CONFIG_SPI_FLASH_ROM_IMPL=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y # CONFIG_UNITY_ENABLE_FLOAT is not set # CONFIG_UNITY_ENABLE_DOUBLE is not set From 74e99086d041f39b9575e6e27b274ce7c57e7c53 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 10 May 2022 18:00:50 +0200 Subject: [PATCH 41/71] remove CONFIG_SPI_FLASH_ROM_IMPL --- configs/defconfig.esp32s2 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index f00dd53cc..4a2973315 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -71,7 +71,6 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_NEWLIB_NANO_FORMAT=y CONFIG_OPENSSL_ASSERT_DO_NOTHING=y CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 -CONFIG_SPI_FLASH_ROM_IMPL=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 From 5a43a8aee6121bd5099809f523699f5c7b183433 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 10 May 2022 18:01:22 +0200 Subject: [PATCH 42/71] remove CONFIG_SPI_FLASH_ROM_IMPL --- configs/defconfig.esp32s3 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 53c5d2d6c..4254c69ee 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -97,7 +97,6 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_NEWLIB_NANO_FORMAT=y CONFIG_OPENSSL_ASSERT_DO_NOTHING=y CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 -CONFIG_SPI_FLASH_ROM_IMPL=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 From 0485cd5585704bbba340ffbe715f9dee66f664fb Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 10 May 2022 18:02:06 +0200 Subject: [PATCH 43/71] remove CONFIG_SPI_FLASH_ROM_IMPL --- configs/defconfig.esp32 | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 91a20fbf6..3a9c675d1 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -77,7 +77,6 @@ CONFIG_NEWLIB_NANO_FORMAT=y CONFIG_OPENSSL_ASSERT_DO_NOTHING=y CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=2048 CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y -CONFIG_SPI_FLASH_ROM_IMPL=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=10 CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=2 CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=4096 From 5e7cf0c17343b8db07aa2bc7f837bf8ffe63a513 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 11 May 2022 21:36:38 +0200 Subject: [PATCH 44/71] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc33da57b..b54ee3149 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Tasmota ESP32 Arduino Lib Builder [![Build Status](https://travis-ci.org/espressif/esp32-arduino-lib-builder.svg?branch=master)](https://travis-ci.org/espressif/esp32-arduino-lib-builder) +# Tasmota ESP32 Arduino Lib Builder [![ESP32 builder](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml) This repository contains the scripts that produce the libraries included with esp32-arduino. From 25eec089dbaccae32605f8ac46830e7f9d3f0d55 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 11 May 2022 21:39:31 +0200 Subject: [PATCH 45/71] Update README.md --- README.md | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b54ee3149..55bb426c3 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,12 @@ # Tasmota ESP32 Arduino Lib Builder [![ESP32 builder](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml/badge.svg)](https://github.com/Jason2866/esp32-arduino-lib-builder/actions/workflows/push.yml) -This repository contains the scripts that produce the libraries included with esp32-arduino. +This repository contains the scripts that produce the libraries included with Tasmota esp32-arduino. -Tested on Ubuntu (32 and 64 bit), Raspberry Pi and MacOS. - -### Build on Ubuntu and Raspberry Pi +### Build on Ubuntu ```bash sudo apt-get install git wget curl libssl-dev libncurses-dev flex bison gperf python python-pip python-setuptools python-serial python-click python-cryptography python-future python-pyparsing python-pyelftools cmake ninja-build ccache sudo pip install --upgrade pip -git clone https://github.com/espressif/esp32-arduino-lib-builder +git clone https://github.com/Jason2866/esp32-arduino-lib-builder cd esp32-arduino-lib-builder ./build.sh ``` From 129b54236c5ee715eea9ca1501d683d1a202014b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 12 May 2022 16:46:36 +0200 Subject: [PATCH 46/71] IDF_BRANCH="v4.4_dev" --- tools/config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/config.sh b/tools/config.sh index a3a0193a1..c9da545dd 100755 --- a/tools/config.sh +++ b/tools/config.sh @@ -6,7 +6,7 @@ if [ -z $IDF_PATH ]; then fi if [ -z $IDF_BRANCH ]; then - IDF_BRANCH="v4.4.1" + IDF_BRANCH="v4.4_dev" fi if [ -z $AR_PR_TARGET_BRANCH ]; then From 61d65b0410b0dd2ca7d3c63aa04dae86fde1421c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 12 May 2022 16:47:34 +0200 Subject: [PATCH 47/71] 2.0.4dev --- core_version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core_version.h b/core_version.h index 644a569da..16c3d72cc 100644 --- a/core_version.h +++ b/core_version.h @@ -1,4 +1,4 @@ #define ARDUINO_ESP32_GIT_VER 0x6ed33835 -#define ARDUINO_ESP32_GIT_DESC 2.0.3 -#define ARDUINO_ESP32_RELEASE_2_0_3 -#define ARDUINO_ESP32_RELEASE "2_0_3" +#define ARDUINO_ESP32_GIT_DESC 2.0.4dev +#define ARDUINO_ESP32_RELEASE_2_0_4dev +#define ARDUINO_ESP32_RELEASE "2_0_4dev" From 7f34ca1374e0e100bebe17420b9573233316ef67 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 18 May 2022 10:40:19 +0200 Subject: [PATCH 48/71] Update README.md --- README.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/README.md b/README.md index 55bb426c3..a6b027356 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,18 @@ git clone https://github.com/Jason2866/esp32-arduino-lib-builder cd esp32-arduino-lib-builder ./build.sh ``` + +### Stable Release +are based on Arduino Core 2.0.3 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3 +``` +[platformio] +platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-v.2.0.3.zip +framework = arduino +``` +and for the ESP32solo1 with +``` +[platformio] +platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-solo1-v.2.0.3.zip +framework = arduino +``` +The frameworks are here [https://github.com/tasmota/arduino-esp32/releases](https://github.com/tasmota/arduino-esp32/releases) From 7e8b419f8394e50fc63897bc43ddc61fb49e528c Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 18 May 2022 10:42:49 +0200 Subject: [PATCH 49/71] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a6b027356..dab498dfe 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ are based on Arduino Core 2.0.3 and can be used with Platformio for the ESP32, E ``` [platformio] platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-v.2.0.3.zip -framework = arduino +framework = arduino, idf ``` and for the ESP32solo1 with ``` [platformio] platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-solo1-v.2.0.3.zip -framework = arduino +framework = arduino, idf ``` The frameworks are here [https://github.com/tasmota/arduino-esp32/releases](https://github.com/tasmota/arduino-esp32/releases) From 8172d484b687f118a21b329a7dd169010cd881b1 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 18 May 2022 10:43:43 +0200 Subject: [PATCH 50/71] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dab498dfe..36ca976c0 100644 --- a/README.md +++ b/README.md @@ -16,12 +16,12 @@ are based on Arduino Core 2.0.3 and can be used with Platformio for the ESP32, E ``` [platformio] platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-v.2.0.3.zip -framework = arduino, idf +framework = arduino, espidf ``` and for the ESP32solo1 with ``` [platformio] platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-solo1-v.2.0.3.zip -framework = arduino, idf +framework = arduino, espidf ``` The frameworks are here [https://github.com/tasmota/arduino-esp32/releases](https://github.com/tasmota/arduino-esp32/releases) From bcd389be722f2a6bda2109ad132992d6127ca4d5 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 18 May 2022 11:17:23 +0200 Subject: [PATCH 51/71] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 36ca976c0..4143b4935 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ git clone https://github.com/Jason2866/esp32-arduino-lib-builder cd esp32-arduino-lib-builder ./build.sh ``` +### Development builds +Look in release and download a version. The day of build is using the commits of this day of IDF / Arduino. ### Stable Release are based on Arduino Core 2.0.3 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3 From 4e0e4364dceda7c845d912568f6a59f7265d750f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 22 May 2022 11:02:44 +0200 Subject: [PATCH 52/71] Update Kconfig.projbuild --- components/arduino_tinyusb/Kconfig.projbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/arduino_tinyusb/Kconfig.projbuild b/components/arduino_tinyusb/Kconfig.projbuild index 620b0b30b..a6abd4d8a 100755 --- a/components/arduino_tinyusb/Kconfig.projbuild +++ b/components/arduino_tinyusb/Kconfig.projbuild @@ -60,7 +60,7 @@ menu "Arduino TinyUSB" config TINYUSB_MSC_BUFSIZE int "MSC Buffer size" range 512 4096 - default 512 + default 4096 depends on TINYUSB_MSC_ENABLED help MSC Buffer size From 508b2a4107363336af5b09a89d02e6fb565dd543 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 26 May 2022 08:42:11 +0200 Subject: [PATCH 53/71] Do not append digest to the bootloader bin --- tools/copy-bootloader.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/copy-bootloader.sh b/tools/copy-bootloader.sh index d3df625f7..53b10b39e 100755 --- a/tools/copy-bootloader.sh +++ b/tools/copy-bootloader.sh @@ -10,4 +10,11 @@ source ./tools/config.sh echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin" mkdir -p "$AR_SDK/bin" -cp "build/bootloader/bootloader.bin" "$AR_SDK/bin/bootloader_$BOOTCONF.bin" + +# Workaround for getting the bootloaders to be flashable with esptool v4.x +# It might still be needed for IDF5, but using the included esptool instead +#cp "build/bootloader/bootloader.bin" "$AR_SDK/bin/bootloader_$BOOTCONF.bin" +if [ ! -e "tools/esptool" ]; then + git clone https://github.com/espressif/esptool tools/esptool +fi +./tools/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin" From 326e1441f5e48937ef9af9ffb0b58803abfdde4f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 26 May 2022 08:47:20 +0200 Subject: [PATCH 54/71] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b74965aea..fd727b3f5 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ sdkconfig.old version.txt components/arduino_tinyusb/tinyusb/ dependencies.lock +tools/esptool/ From 58aca292133405be83b9947ef1a270c53a8c3ce3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 31 May 2022 13:12:24 +0200 Subject: [PATCH 55/71] Update copy-libs.sh --- tools/copy-libs.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 44741c820..ab450a320 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -334,6 +334,9 @@ for item; do if [[ "$fname" == "arduino" ]]; then continue fi + if [[ "$fname" == "config" ]]; then + continue + fi out_sub="${item#*$ipath}" out_cpath="$AR_SDK/include/$fname$out_sub" @@ -469,15 +472,15 @@ for item; do done done -# Add IDF versions to sdkconfig -echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "$AR_SDK/include/config/sdkconfig.h" -echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "$AR_SDK/include/config/sdkconfig.h" - # Handle Mem Variants mkdir -p "$AR_SDK/$MEMCONF/include" -mv "$AR_SDK/include/config/sdkconfig.h" "$AR_SDK/$MEMCONF/include/sdkconfig.h" +mv "$PWD/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 '"') out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"') mv "$AR_SDK/$out" "$AR_SDK/$MEMCONF/$file" done; + +# Add IDF versions to sdkconfig +echo "#define CONFIG_ARDUINO_IDF_COMMIT \"$IDF_COMMIT\"" >> "$AR_SDK/$MEMCONF/include/sdkconfig.h" +echo "#define CONFIG_ARDUINO_IDF_BRANCH \"$IDF_BRANCH\"" >> "$AR_SDK/$MEMCONF/include/sdkconfig.h" From 15ac4d567b566d9b52d360ca9b6eddcb0274f5ff Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 13 Jun 2022 07:53:57 +0200 Subject: [PATCH 56/71] --non-interactive --- tools/install-esp-idf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index 3bca85652..b0f65f0fd 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -31,7 +31,7 @@ fi if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then git -C $IDF_PATH submodule update --init --recursive - $IDF_PATH/install.sh + $IDF_PATH/install.sh --non-interactive fi # From 8ef48f89c53f290f158ae54279c5b1f697f52bdd Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Mon, 13 Jun 2022 07:59:38 +0200 Subject: [PATCH 57/71] Update install-esp-idf.sh --- tools/install-esp-idf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh index b0f65f0fd..3bca85652 100755 --- a/tools/install-esp-idf.sh +++ b/tools/install-esp-idf.sh @@ -31,7 +31,7 @@ fi if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then git -C $IDF_PATH submodule update --init --recursive - $IDF_PATH/install.sh --non-interactive + $IDF_PATH/install.sh fi # From 0e023fd26bf30e672b023ccbf34437ce8deeae75 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:32:25 +0200 Subject: [PATCH 58/71] CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 --- configs/defconfig.esp32 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 3a9c675d1..9f22fddbe 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -64,6 +64,7 @@ CONFIG_LWIP_IPV4_NAPT=y # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 +CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 CONFIG_LWIP_TCP_SYNMAXRTX=6 CONFIG_LWIP_TCP_MSS=1436 CONFIG_LWIP_TCP_RTO_TIME=3000 From f4b9bc1ef16f2738f06aaecf7779ec22923fb44f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:33:09 +0200 Subject: [PATCH 59/71] CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 --- configs/defconfig.esp32c3 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 8e2bd2d12..04fbc0e99 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -58,6 +58,7 @@ CONFIG_LWIP_SO_RCVBUF=y CONFIG_LWIP_IP_FORWARD=y CONFIG_LWIP_IPV4_NAPT=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 +CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 CONFIG_MBEDTLS_PSK_MODES=y CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y CONFIG_NEWLIB_NANO_FORMAT=y From 980a58caa717773ea8a918fedc145353c461ca00 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:33:40 +0200 Subject: [PATCH 60/71] CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 --- configs/defconfig.esp32s2 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index 4a2973315..da15fc578 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -59,6 +59,7 @@ CONFIG_LWIP_IPV4_NAPT=y # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 +CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 CONFIG_LWIP_TCP_SYNMAXRTX=6 CONFIG_LWIP_TCP_MSS=1436 CONFIG_LWIP_TCP_RTO_TIME=3000 From 704e26a976bfe425605c857c3e54a8e4ef40de36 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:34:17 +0200 Subject: [PATCH 61/71] CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 --- configs/defconfig.esp32s3 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index 4254c69ee..cf5a32cb0 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -86,6 +86,7 @@ CONFIG_LWIP_IPV4_NAPT=y # CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set CONFIG_LWIP_DHCP_RESTORE_LAST_IP=y CONFIG_LWIP_DHCP_OPTIONS_LEN=128 +CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000 CONFIG_LWIP_TCP_SYNMAXRTX=6 CONFIG_LWIP_TCP_MSS=1436 CONFIG_LWIP_TCP_RTO_TIME=3000 From e6a57c249987a8b3ff137b985bdbff7d1da7e933 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:36:22 +0200 Subject: [PATCH 62/71] Improve support for hand-written asm source files in PIO --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dcb88095..bb85dbd98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ idf_build_get_property(elf EXECUTABLE GENERATOR_EXPRESSION) add_custom_command( OUTPUT "idf_libs" - COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_ESPTOOLPY_OCT_FLASH}" "${CONFIG_SPIRAM_MODE_OCT}" + COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_ESPTOOLPY_OCT_FLASH}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}" DEPENDS ${elf} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM From 2f71835c3c34491030e504c32264b970afc087a3 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:37:48 +0200 Subject: [PATCH 63/71] Improve support for hand-written asm source files in PIO --- tools/copy-libs.sh | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index ab450a320..9b2f16807 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -2,6 +2,7 @@ # config IDF_TARGET=$1 +IS_XTENSA=$4 OCT_FLASH= OCT_PSRAM= if [ "$2" = "y" ]; then @@ -191,6 +192,7 @@ for item; do short_name="${item:2}" if [[ $exclude_libs != *";$short_name;"* && $LD_LIBS_SEARCH != *"lib$short_name.a"* ]]; then LD_LIBS_SEARCH+="lib$short_name.a " + #echo "lib add: $item" fi elif [ "$item" = "-o" ]; then add_next=0 @@ -225,8 +227,35 @@ for item; do if [[ "$lname" != "main" && "$lname" != "arduino" ]]; then lsize=$($SSTAT "$item") if (( lsize > 8 )); then - LD_LIBS+="-l$lname " - LD_LIB_FILES+="$item " + # do we already have this file? + if [[ $LD_LIB_FILES != *"$item"* ]]; then + # do we already have lib with the same name? + if [[ $LD_LIBS != *"-l$lname"* ]]; then + # echo "collecting lib '$lname' and file: $item" + LD_LIB_FILES+="$item " + LD_LIBS+="-l$lname " + else + # echo "!!! need to rename: '$lname'" + for i in {2..9}; do + n_item="${item:0:${#item}-2}_$i.a" + n_name=$lname"_$i" + if [ -f "$n_item" ]; then + # echo "renamed add: -l$n_name" + LD_LIBS+="-l$n_name " + break + elif [[ $LD_LIB_FILES != *"$n_item"* && $LD_LIBS != *"-l$n_name"* ]]; then + echo "Renaming '$lname' to '$n_name': $item" + cp -f "$item" "$n_item" + LD_LIB_FILES+="$n_item " + LD_LIBS+="-l$n_name " + break + fi + done + fi + else + # echo "just add: -l$lname" + LD_LIBS+="-l$lname " + fi else echo "*** Skipping $(basename $item): size too small $lsize" fi @@ -253,6 +282,15 @@ cat pio_start.txt > "$AR_PLATFORMIO_PY" rm pio_end.txt 1pio_start.txt pio_start.txt echo " ASFLAGS=[" >> "$AR_PLATFORMIO_PY" +if [ "$IS_XTENSA" = "y" ]; then + echo " \"-mlongcalls\"" >> "$AR_PLATFORMIO_PY" +else + echo " \"-march=rv32imc\"" >> "$AR_PLATFORMIO_PY" +fi +echo " ]," >> "$AR_PLATFORMIO_PY" +echo "" >> "$AR_PLATFORMIO_PY" + +echo " ASPPFLAGS=[" >> "$AR_PLATFORMIO_PY" set -- $PIO_AS_FLAGS for item; do echo " \"$item\"," >> "$AR_PLATFORMIO_PY" From e3d9c9a2b92e3db6d47ed4d2d93fc334c06ee794 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:40:44 +0200 Subject: [PATCH 64/71] CONFIG_LWIP_IPV6_AUTOCONFIG=y --- configs/defconfig.esp32 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 9f22fddbe..110c2957e 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -28,6 +28,7 @@ CONFIG_SPIRAM_BOOT_INIT=y CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 +CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_ESP32_XTAL_FREQ_AUTO=y CONFIG_ETH_SPI_ETHERNET_DM9051=y CONFIG_ETH_SPI_ETHERNET_W5500=y From 99f76d60f5e52dc0606910056601c64903a2a40b Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:42:08 +0200 Subject: [PATCH 65/71] CONFIG_LWIP_IPV6_AUTOCONFIG=y --- configs/defconfig.esp32c3 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3 index 04fbc0e99..c1ce112bf 100644 --- a/configs/defconfig.esp32c3 +++ b/configs/defconfig.esp32c3 @@ -52,6 +52,7 @@ CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 CONFIG_HAL_ASSERTION_DISABLE=y CONFIG_LOG_DEFAULT_LEVEL_NONE=y # CONFIG_LOG_COLORS is not set +CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_LWIP_LOCAL_HOSTNAME="tasmota" CONFIG_LWIP_MAX_SOCKETS=16 CONFIG_LWIP_SO_RCVBUF=y From 6aa1bc2ad9c185dda33d07f58d4fc63bb404177a Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:43:05 +0200 Subject: [PATCH 66/71] CONFIG_LWIP_IPV6_AUTOCONFIG=y --- configs/defconfig.esp32s2 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2 index da15fc578..905a1a5f5 100644 --- a/configs/defconfig.esp32s2 +++ b/configs/defconfig.esp32s2 @@ -21,6 +21,7 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 +CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_ESP32S2_KEEP_USB_ALIVE=y CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_HTTPD_WS_SUPPORT=y From 9f85d2dde0f6b4ade96871d32f9d5a34cc379828 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Tue, 14 Jun 2022 13:44:53 +0200 Subject: [PATCH 67/71] CONFIG_LWIP_IPV6_AUTOCONFIG=y --- configs/defconfig.esp32s3 | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3 index cf5a32cb0..6b9184861 100644 --- a/configs/defconfig.esp32s3 +++ b/configs/defconfig.esp32s3 @@ -45,6 +45,7 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0 +CONFIG_LWIP_IPV6_AUTOCONFIG=y CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=576 CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=y CONFIG_HTTPD_WS_SUPPORT=y From 19e35bd69f2d2eb82639883ef9b25be6f5dcfa31 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 25 Jun 2022 18:37:02 +0200 Subject: [PATCH 68/71] Update CMakeLists.txt --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb85dbd98..ca1497264 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ idf_build_get_property(elf EXECUTABLE GENERATOR_EXPRESSION) add_custom_command( OUTPUT "idf_libs" - COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_ESPTOOLPY_OCT_FLASH}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}" + COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}" DEPENDS ${elf} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM @@ -29,7 +29,7 @@ add_custom_target(copy-bootloader DEPENDS "copy_bootloader") add_custom_command( OUTPUT "mem_variant" - COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-mem-variant.sh ${IDF_TARGET} "${CONFIG_ESPTOOLPY_OCT_FLASH}" "${CONFIG_SPIRAM_MODE_OCT}" + COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-mem-variant.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" DEPENDS ${elf} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} VERBATIM From 34d4c787231a77eec4a40465b9b782727ea85219 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 25 Jun 2022 18:42:54 +0200 Subject: [PATCH 69/71] Update builds.json --- configs/builds.json | 58 ++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/configs/builds.json b/configs/builds.json index 2aeaeb9f6..b83892c32 100644 --- a/configs/builds.json +++ b/configs/builds.json @@ -1,34 +1,40 @@ { "mem_variants_files":[ - { - "file":"libbootloader_support.a", - "src":"build/esp-idf/bootloader_support/libbootloader_support.a", - "out":"lib/libbootloader_support.a" - }, - { - "file":"libesp_hw_support.a", - "src":"build/esp-idf/esp_hw_support/libesp_hw_support.a", - "out":"lib/libesp_hw_support.a" - }, { "file":"libspi_flash.a", "src":"build/esp-idf/spi_flash/libspi_flash.a", - "out":"lib/libspi_flash.a" + "out":"lib/libspi_flash.a", + "targets":["esp32","esp32c3","esp32s2","esp32s3"] + }, + { + "file":"libesp_system.a", + "src":"build/esp-idf/esp_system/libesp_system.a", + "out":"lib/libesp_system.a", + "targets":["esp32s3"] }, { "file":"libfreertos.a", "src":"build/esp-idf/freertos/libfreertos.a", - "out":"lib/libfreertos.a" + "out":"lib/libfreertos.a", + "targets":["esp32s3"] }, { - "file":"libesp_system.a", - "src":"build/esp-idf/esp_system/libesp_system.a", - "out":"lib/libesp_system.a" + "file":"libbootloader_support.a", + "src":"build/esp-idf/bootloader_support/libbootloader_support.a", + "out":"lib/libbootloader_support.a", + "targets":["esp32s3"] + }, + { + "file":"libesp_hw_support.a", + "src":"build/esp-idf/esp_hw_support/libesp_hw_support.a", + "out":"lib/libesp_hw_support.a", + "targets":["esp32s3"] }, { "file":"sections.ld", "src":"build/esp-idf/esp_system/ld/sections.ld", - "out":"ld/sections.ld" + "out":"ld/sections.ld", + "targets":["esp32s3"] } ], "targets":[ @@ -44,6 +50,8 @@ ], "mem_variants":[ ["qio","80m","opi_ram"], + ["dio","80m","qio_ram"], + ["dio","80m","opi_ram"], ["opi","80m","opi_ram"], ["opi","80m","qio_ram"] ] @@ -62,7 +70,11 @@ ["dio","40m"], ["dout","40m"] ], - "mem_variants":[] + "mem_variants":[ + ["qout","80m"], + ["dio","80m"], + ["qio","80m"] + ] }, { "target": "esp32c3", @@ -78,7 +90,11 @@ ["dio","40m"], ["dout","40m"] ], - "mem_variants":[] + "mem_variants":[ + ["qout","80m"], + ["dio","80m"], + ["qio","80m"] + ] }, { "target": "esp32", @@ -94,7 +110,11 @@ ["dio","40m"], ["dout","40m"] ], - "mem_variants":[] + "mem_variants":[ + ["qout","80m"], + ["dio","80m"], + ["qio","80m"] + ] } ] } From 8dc5e7e06f3031d30a5f628dc0346c46979a3e88 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 25 Jun 2022 18:44:23 +0200 Subject: [PATCH 70/71] Update copy-libs.sh --- tools/copy-libs.sh | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh index 9b2f16807..681fa6807 100755 --- a/tools/copy-libs.sh +++ b/tools/copy-libs.sh @@ -3,13 +3,9 @@ IDF_TARGET=$1 IS_XTENSA=$4 -OCT_FLASH= +OCT_FLASH="$2" OCT_PSRAM= -if [ "$2" = "y" ]; then - OCT_FLASH="opi" -else - OCT_FLASH="qspi" -fi + if [ "$3" = "y" ]; then OCT_PSRAM="opi" else @@ -514,9 +510,18 @@ done mkdir -p "$AR_SDK/$MEMCONF/include" mv "$PWD/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 '"') - out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"') - mv "$AR_SDK/$out" "$AR_SDK/$MEMCONF/$file" + skip_file=1 + for file_target in $(echo "$mem_variant" | jq -c '.targets[]' | tr -d '"'); do + if [ "$file_target" == "$IDF_TARGET" ]; then + skip_file=0 + break + fi + done + if [ $skip_file -eq 0 ]; then + file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"') + out=$(echo "$mem_variant" | jq -c '.out' | tr -d '"') + mv "$AR_SDK/$out" "$AR_SDK/$MEMCONF/$file" + fi done; # Add IDF versions to sdkconfig From cae2256ae67671823cdbb390944f24854160473f Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sat, 25 Jun 2022 18:45:26 +0200 Subject: [PATCH 71/71] Update copy-mem-variant.sh --- tools/copy-mem-variant.sh | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/copy-mem-variant.sh b/tools/copy-mem-variant.sh index b9366ad75..9b8f3b58e 100755 --- a/tools/copy-mem-variant.sh +++ b/tools/copy-mem-variant.sh @@ -1,14 +1,8 @@ #!/bin/bash IDF_TARGET=$1 -OCT_FLASH= +OCT_FLASH="$2" OCT_PSRAM= -if [ "$2" = "y" ]; then - OCT_FLASH="opi" -else - OCT_FLASH="qspi" -fi - if [ "$3" = "y" ]; then OCT_PSRAM="opi" else @@ -30,7 +24,16 @@ rm -rf "$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 '"') - cp "$src" "$AR_SDK/$MEMCONF/$file" + skip_file=1 + for file_target in $(echo "$mem_variant" | jq -c '.targets[]' | tr -d '"'); do + if [ "$file_target" == "$IDF_TARGET" ]; then + skip_file=0 + break + fi + done + if [ $skip_file -eq 0 ]; then + file=$(echo "$mem_variant" | jq -c '.file' | tr -d '"') + src=$(echo "$mem_variant" | jq -c '.src' | tr -d '"') + cp "$src" "$AR_SDK/$MEMCONF/$file" + fi done;