diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 631815d9e..ca4389f38 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: IDF_Arduino 4.4.3 +name: IDF_Arduino 4.4.3 solo1 on: workflow_dispatch: # Manually start a workflow diff --git a/build.sh b/build.sh index 8ea0313ae..0b9bf3189 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ if ! [ -x "$(command -v git)" ]; then exit 1 fi -TARGET="all" +TARGET="esp32" BUILD_TYPE="all" SKIP_ENV=0 COPY_OUT=0 diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32 index 77ab60655..fec81ead8 100644 --- a/configs/defconfig.esp32 +++ b/configs/defconfig.esp32 @@ -39,7 +39,6 @@ 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 CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8 @@ -48,6 +47,7 @@ CONFIG_FATFS_CODEPAGE_850=y CONFIG_FATFS_LFN_STACK=y # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set CONFIG_FMB_TIMER_PORT_ENABLED=y +CONFIG_FREERTOS_UNICORE=y CONFIG_FREERTOS_HZ=1000 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y diff --git a/tools/archive-build.sh b/tools/archive-build.sh old mode 100755 new mode 100644 index f3ba888c0..9604c296f --- a/tools/archive-build.sh +++ b/tools/archive-build.sh @@ -4,15 +4,15 @@ IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "") IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD || echo "") 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" -pio_zip_archive_path="dist/framework-arduinoespressif32-$idf_version_string.zip" +archive_path="dist/arduino-esp32-libs-solo1-$idf_version_string.tar.gz" +build_archive_path="dist/arduino-esp32-build-solo1-$idf_version_string.tar.gz" +pio_archive_path="dist/framework-arduinoespressif32-solo1-$idf_version_string.tar.gz" +pio_zip_archive_path="dist/framework-arduinoespressif32-solo1-$idf_version_string.zip" mkdir -p dist && rm -rf "$archive_path" "$build_archive_path" cd out -echo "Creating framework-arduinoespressif32" +echo "Creating framework-arduinoespressif32-solo1" cp -rf ../components/arduino arduino-esp32 rm -rf arduino-esp32/docs rm -rf arduino-esp32/tests @@ -33,6 +33,9 @@ cp -f tools/gen_esp32part.py arduino-esp32/tools/ cp -f tools/platformio-build-*.py arduino-esp32/tools/ cp ../package.json arduino-esp32/package.json cp ../core_version.h arduino-esp32/cores/esp32/core_version.h +# Replace "framework-arduinoespressif32" with "framework-arduino-solo1" +awk -i inplace -v cuv1="framework-arduinoespressif32" -v cuv2="framework-arduino-solo1" '{gsub(cuv1,cuv2); print;}' "arduino-esp32/tools/platformio-build-esp32.py" +awk -i inplace -v cuv1="framework-arduinoespressif32" -v cuv2="framework-arduino-solo1" '{gsub(cuv1,cuv2); print;}' "arduino-esp32/tools/platformio-build.py" mv arduino-esp32/ framework-arduinoespressif32/ # If the framework is as tar.gz is needed uncomment next line # tar --exclude=.* -zcf ../$pio_archive_path framework-arduinoespressif32/ diff --git a/tools/config.sh b/tools/config.sh old mode 100755 new mode 100644