update solo1

* Support extern Ethernet (Jason2866#60)

see espressif/arduino-esp32#6318

* Revert "Support extern Ethernet (Jason2866#60)" (Jason2866#61)

This reverts commit 8c5ac76.

* Fix missing BLE 4.2 from ESP32-S3

* Allow selecting Arduino branch based on the current lib-builder branch

* For CI builds get branch from env

* dump env

* Update update-components.sh

* Update update-components.sh

* Add support for CPP exceptions for C3

Fixes: espressif/arduino-esp32#6187

* Script improvements, rainmaker and esp-sr

* Optimized for Tasmota

* Update build.sh

* Update config.sh

* Update install-esp-idf.sh

* AR_BRANCH="master"

* Update push.yml

* Update defconfig.esp32s3

* Update defconfig.esp32s2

Co-authored-by: me-no-dev <[email protected]>

Author: Jason2866

.github/workflows/push.yml

@@ -13,10 +13,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.8.10'
-        architecture: 'x64' 
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs

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

configs/builds.json

@@ -35,7 +35,7 @@
 		{
 			"target": "esp32s3",
 			"features":[],
-			"idf_libs":["dio","80m","qio_ram"],
+			"idf_libs":["qio","80m","qio_ram"
 			"bootloaders":[
 				["qio","120m","qio_ram"],
 				["qio","80m","qio_ram"],

configs/defconfig.esp32c3

@@ -1,6 +1,12 @@
+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_PARTITION_TABLE_MD5 is not set
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
 CONFIG_COMPILER_SAVE_RESTORE_LIBCALLS=y
@@ -38,7 +44,8 @@ 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
@@ -53,9 +60,12 @@ CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 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

configs/defconfig.esp32s2

@@ -1,18 +1,24 @@
+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_DISABLE_HAL_LOCKS=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_TINYUSB_MSC_BUFSIZE=4096
 CONFIG_TINYUSB_DESC_DFU_RT_STRING="Espressif DFU Device"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=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
@@ -36,7 +42,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_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
@@ -67,10 +73,14 @@ 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
 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
 # CONFIG_VFS_SUPPORT_SELECT is not set

configs/defconfig.esp32s3

@@ -1,17 +1,19 @@
+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_DISABLE_HAL_LOCKS=y
 CONFIG_BOOTLOADER_SKIP_VALIDATE_IN_DEEP_SLEEP=y
+CONFIG_BOOTLOADER_SKIP_VALIDATE_ON_POWER_ON=y
+CONFIG_DISABLE_HAL_LOCKS=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+# CONFIG_PARTITION_TABLE_MD5 is not set
 CONFIG_TINYUSB_MSC_BUFSIZE=4096
 CONFIG_COMPILER_OPTIMIZATION_SIZE=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_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
@@ -37,6 +39,7 @@ 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
@@ -64,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_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
@@ -92,13 +95,16 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=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_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

configs/defconfig.qio_ram

@@ -1 +1,2 @@
-# CONFIG_SPIRAM_BOOT_INIT is not set
+CONFIG_SPIRAM_IGNORE_NOTFOUND=y
+# CONFIG_SPIRAM_MEMTEST is not set

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
@@ -30,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

tools/install-esp-idf.sh

@@ -12,8 +12,10 @@ 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"
@@ -28,6 +30,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 +106,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