From da47c607adfb74fc8f47dac8167a5c2c18b696a6 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 17 Sep 2022 12:49:50 +0200
Subject: [PATCH 01/75] Tasmota Core 2.0.5

---
 core_version.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core_version.h b/core_version.h
index e58018557..2266543d3 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.5pre
-#define ARDUINO_ESP32_RELEASE_2_0_5_pre
-#define ARDUINO_ESP32_RELEASE "2_0_5_pre"
+#define ARDUINO_ESP32_GIT_VER 0x38c3f487
+#define ARDUINO_ESP32_GIT_DESC 2.0.5
+#define ARDUINO_ESP32_RELEASE_2_0_5
+#define ARDUINO_ESP32_RELEASE "2_0_5"

From 98dc11bf206fa79e603506dc9919d8f8ffd7b04c Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 17 Sep 2022 16:19:08 +0200
Subject: [PATCH 02/75] core 2.0.5

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9c56e3a24..820e481e2 100644
--- a/README.md
+++ b/README.md
@@ -17,13 +17,13 @@ Look in release and download a version. The day of build is using the commits of
 are based on Arduino Core 2.0.4 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3
 ```                  
 [platformio]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-2.0.4.1.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-2.0.5.zip
 framework = arduino, espidf
 ```
 and for the ESP32solo1 with
 ```
 [platformio]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4.1/platform-espressif32-solo1-2.0.4.1.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-solo1-2.0.5.zip
 framework = arduino, espidf
 ```
 The frameworks are here [https://github.com/tasmota/arduino-esp32/releases](https://github.com/tasmota/arduino-esp32/releases)

From f1d4c4034635f55ba710bc963aecc154074d0c38 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 17 Sep 2022 16:23:41 +0200
Subject: [PATCH 03/75] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 820e481e2..0727f8679 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ cd esp32-arduino-lib-builder
 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.4 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3
+are based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3
 ```                  
 [platformio]
 platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-2.0.5.zip

From b4c9673da320bf672ed8d8d04658be5dceaecc69 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 21 Sep 2022 15:11:28 +0200
Subject: [PATCH 04/75] AR_BRANCH="pr7284"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index b4fd9bee5..474b09b1d 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="work"
+AR_BRANCH="pr7284"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 8d505eac030d50111b8a3f022ec5edc1ab1726f5 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 24 Sep 2022 16:46:05 +0200
Subject: [PATCH 05/75] Update README.md

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0727f8679..f0dcc9ffa 100644
--- a/README.md
+++ b/README.md
@@ -13,17 +13,17 @@ cd esp32-arduino-lib-builder
 ### 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
+### Stable Release including ESP32solo1
 are based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3
 ```                  
 [platformio]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-2.0.5.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip
 framework = arduino, espidf
 ```
-and for the ESP32solo1 with
+to use the ESP32 Solo1 Arduino framework add in your env
 ```
-[platformio]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5/platform-espressif32-solo1-2.0.5.zip
-framework = arduino, espidf
+[env:esp32solo1]
+board = every esp32 board can be used
+build_flags = -DFRAMEWORK_ARDUINO_SOLO1
 ```
 The frameworks are here [https://github.com/tasmota/arduino-esp32/releases](https://github.com/tasmota/arduino-esp32/releases)

From 88000167138aa9dad0646fff7f1144ee81638859 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 24 Sep 2022 16:48:16 +0200
Subject: [PATCH 06/75] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0dcc9ffa..4543792b2 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ cd esp32-arduino-lib-builder
 Look in release and download a version. The day of build is using the commits of this day of IDF / Arduino.
 
 ### Stable Release including ESP32solo1
-are based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32, ESP32C3, ESP32S2 and ESP32S3
+based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32/ESP32solo1, ESP32C3, ESP32S2 and ESP32S3
 ```                  
 [platformio]
 platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip

From 6f3bed4083ef4ea8a484bac20d9a5528724aca63 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 28 Sep 2022 13:46:31 +0200
Subject: [PATCH 07/75] IDF_BRANCH="IDF_Arduino_Esptoolv43"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 474b09b1d..99d2cd638 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="IDF_Arduino"
+	IDF_BRANCH="IDF_Arduino_Esptoolv43"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then

From a95a4f004bcc7ceeed9502dc1996978d25a1b5c0 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:38:22 +0200
Subject: [PATCH 08/75] 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 99d2cd638..474b09b1d 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="IDF_Arduino_Esptoolv43"
+	IDF_BRANCH="IDF_Arduino"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then

From 55be128ab0930decca5df0c9aa6e164490f18ca1 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 30 Sep 2022 14:00:25 +0200
Subject: [PATCH 09/75] Skip collecting optimization flag

---
 tools/copy-libs.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 4d044a7dd..8b2f7d275 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -92,6 +92,8 @@ for item in "${@:2:${#@}-5}"; do
 		if [[ "${item:2:7}" != "ARDUINO" ]] && [[ "$item" != "-DESP32" ]]; then #skip ARDUINO defines
 			DEFINES+="$item "
 		fi
+	elif [ "$prefix" = "-O" ]; then
+		PIO_CC_FLAGS+="$item "
 	elif [[ "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" ]]; then
 		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
 			C_FLAGS+="$item "
@@ -106,7 +108,7 @@ str=`printf '%b' "$str"` #unescape the string
 set -- $str
 for item in "${@:2:${#@}-5}"; do
 	prefix="${item:0:2}"
-	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" ]]; then
+	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
 		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
 			AS_FLAGS+="$item "
 			if [[ $C_FLAGS == *"$item"* ]]; then
@@ -125,7 +127,7 @@ str=`printf '%b' "$str"` #unescape the string
 set -- $str
 for item in "${@:2:${#@}-5}"; do
 	prefix="${item:0:2}"
-	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" ]]; then
+	if [[ "$prefix" != "-I" && "$prefix" != "-D" && "$item" != "-Wall" && "$item" != "-Werror=all"  && "$item" != "-Wextra" && "$prefix" != "-O" ]]; then
 		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" ]]; then
 			CPP_FLAGS+="$item "
 			if [[ $PIO_CC_FLAGS != *"$item"* ]]; then

From a8a1903b9232514e63927969200d4fe2b0537c5e Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 14 Oct 2022 15:56:26 +0200
Subject: [PATCH 10/75] IDF_BRANCH="IDF_Ard_wifi"

to test new wifi libs
---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 474b09b1d..b49632951 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="IDF_Arduino"
+	IDF_BRANCH="IDF_Ard_wifi"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then

From 1d22dbe3d2343768befa0cef916aca3443805220 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 15 Oct 2022 12:03:28 +0200
Subject: [PATCH 11/75] CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=4096

---
 configs/defconfig.esp32s3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index bef54a741..a7da615c5 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -41,7 +41,7 @@ CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32S3_SPIRAM_SUPPORT=y
 CONFIG_ESP32S3_ULP_COPROC_ENABLED=y
 CONFIG_ESP32S3_ULP_COPROC_RISCV=y
-CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=1024
+CONFIG_ESP32S3_ULP_COPROC_RESERVE_MEM=4096
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0

From 1b21a3f4a1bd993a38bddc44d78e42178d8aaef8 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 15 Oct 2022 12:05:23 +0200
Subject: [PATCH 12/75] ULP_COPROC_RISCV  RESERVE_MEM=4096

---
 configs/defconfig.esp32s2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index de21b3d17..285a60ab7 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -16,7 +16,8 @@ CONFIG_COMPILER_WARN_WRITE_STRINGS=y
 CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32S2_SPIRAM_SUPPORT=y
 CONFIG_ESP32S2_ULP_COPROC_ENABLED=y
-CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=1024
+CONFIG_ESP32S2_ULP_COPROC_RISCV=y
+CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=4096
 CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=4096
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
 CONFIG_SPIRAM_MALLOC_RESERVE_INTERNAL=0

From ac4f0bf85f3c619de220f6d7038ccd67ef81a908 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 18 Oct 2022 15:07:37 +0200
Subject: [PATCH 13/75] add `cam_hal.h` to `include` folder

---
 tools/install-esp-idf.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index cd23443ff..67127a50f 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -34,6 +34,12 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
 	$IDF_PATH/install.sh
 fi
 
+#
+# Arduino needs cam_hal.h from esp32-camera in include folder
+#
+
+cp "$IDF_PATH/components/esp32-camera/driver/private_include/cam_hal.h" "$IDF_PATH/components/esp32-camera/driver/include/"
+
 #
 # SETUP ESP-IDF ENV
 #

From 028327503328de7bfc22f7d6e8203363727580e7 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 18 Oct 2022 16:47:22 +0200
Subject: [PATCH 14/75] CONFIG_LWIP_UDP_RECVMBOX_SIZE=64

---
 configs/defconfig.esp32   | 1 +
 configs/defconfig.esp32c3 | 1 +
 configs/defconfig.esp32s2 | 1 +
 configs/defconfig.esp32s3 | 1 +
 4 files changed, 4 insertions(+)

diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index 1ab565a90..ecb900609 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -71,6 +71,7 @@ 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_UDP_RECVMBOX_SIZE=64
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index cbecef8f0..93882cef5 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -64,6 +64,7 @@ CONFIG_LWIP_IP_FORWARD=y
 CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
+CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 285a60ab7..89e32957a 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -66,6 +66,7 @@ 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_UDP_RECVMBOX_SIZE=64
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_PSK_MODES=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index a7da615c5..d5267ce16 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -93,6 +93,7 @@ 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_UDP_RECVMBOX_SIZE=64
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y

From 14ef89274970ce06ae1e0eb0166cc031a9e9d7c1 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 25 Oct 2022 11:57:02 +0200
Subject: [PATCH 15/75] Use own releaser

to silence warning
---
 .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 e32ad33ba..7f271ac27 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Build Arduino Libs
       run: bash ./build.sh
     - name: Release
-      uses: softprops/action-gh-release@v1
+      uses: jason2866/action-gh-release@v1
       #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}

From 9aa7d92ec579a12311f689c94d50a385574492ac Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:16:48 +0200
Subject: [PATCH 16/75] Use own Releaser with commit

---
 .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 7f271ac27..33818e86e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Build Arduino Libs
       run: bash ./build.sh
     - name: Release
-      uses: jason2866/action-gh-release@v1
+      uses: jason2866/action-gh-release@eba46b8db09be9b89612ac7d488ab9f08e821b79
       #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}

From b20c034cab4fad639e0f0e2c9ce16fb4d194a901 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:20:19 +0200
Subject: [PATCH 17/75] 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 33818e86e..a0ebcdc23 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Build Arduino Libs
       run: bash ./build.sh
     - name: Release
-      uses: jason2866/action-gh-release@eba46b8db09be9b89612ac7d488ab9f08e821b79
+      uses: jason2866/action-gh-release@v1.1
       #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}

From ca5ea9236638d25f73c406ade37daa45b8dd6f54 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 28 Oct 2022 10:05:22 +0200
Subject: [PATCH 18/75] 2.0.5.2

---
 core_version.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core_version.h b/core_version.h
index 2266543d3..dce32ef2e 100644
--- a/core_version.h
+++ b/core_version.h
@@ -1,4 +1,4 @@
 #define ARDUINO_ESP32_GIT_VER 0x38c3f487
-#define ARDUINO_ESP32_GIT_DESC 2.0.5
-#define ARDUINO_ESP32_RELEASE_2_0_5
-#define ARDUINO_ESP32_RELEASE "2_0_5"
+#define ARDUINO_ESP32_GIT_DESC 2.0.5.2
+#define ARDUINO_ESP32_RELEASE_2_0_5_2
+#define ARDUINO_ESP32_RELEASE "2_0_5_2"

From 2ff6ab41f75a36209836a1a198084d7cd050b8cf Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 28 Oct 2022 11:49:21 +0200
Subject: [PATCH 19/75] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4543792b2..fcedc9732 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ Look in release and download a version. The day of build is using the commits of
 based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32/ESP32solo1, ESP32C3, ESP32S2 and ESP32S3
 ```                  
 [platformio]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.2/platform-espressif32-2.0.5.2.zip
 framework = arduino, espidf
 ```
 to use the ESP32 Solo1 Arduino framework add in your env

From 14935063654c801a7d2c5ff9be8a7587101d4c89 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 29 Oct 2022 23:32:49 +0200
Subject: [PATCH 20/75] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fcedc9732..b4a4a9361 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ cd esp32-arduino-lib-builder
 ### 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 including ESP32solo1
+### Stable Platformio Platform release including ESP32solo1
 based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32/ESP32solo1, ESP32C3, ESP32S2 and ESP32S3
 ```                  
 [platformio]

From 1ba6c1bb2e3d1b580b9aff590b0125183ad8a1e0 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 10 Nov 2022 09:55:28 +0100
Subject: [PATCH 21/75] IDF_BRANCH="Tasmota/v4.4"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index b49632951..4814fa726 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="IDF_Ard_wifi"
+	IDF_BRANCH="Tasmota/v4.4"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then

From 5c969a9ebf0d50da36d4b5eb93d4f536a6e5cedb Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 10 Nov 2022 10:17:13 +0100
Subject: [PATCH 22/75] 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 4814fa726..2910560c7 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="pr7284"
+AR_BRANCH="master"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From ebd7d10d946d712bbde9e74e61c2311db31dd948 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 10 Nov 2022 12:37:39 +0100
Subject: [PATCH 23/75] core 2.0.5.3

---
 core_version.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core_version.h b/core_version.h
index dce32ef2e..19c6bb113 100644
--- a/core_version.h
+++ b/core_version.h
@@ -1,4 +1,4 @@
 #define ARDUINO_ESP32_GIT_VER 0x38c3f487
-#define ARDUINO_ESP32_GIT_DESC 2.0.5.2
-#define ARDUINO_ESP32_RELEASE_2_0_5_2
-#define ARDUINO_ESP32_RELEASE "2_0_5_2"
+#define ARDUINO_ESP32_GIT_DESC 2.0.5.3
+#define ARDUINO_ESP32_RELEASE_2_0_5_3
+#define ARDUINO_ESP32_RELEASE "2_0_5_3"

From f57b7fa70fdb5d257d26cbdfc5de46eaeab17b80 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 16 Nov 2022 15:47:29 +0100
Subject: [PATCH 24/75] action-gh-release@v1.2

---
 .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 a0ebcdc23..ff6778ff5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Build Arduino Libs
       run: bash ./build.sh
     - name: Release
-      uses: jason2866/action-gh-release@v1.1
+      uses: jason2866/action-gh-release@v1.2
       #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}

From 71df9ae44b961bb6b806a5fc35fbc16e2b0e4107 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 17 Nov 2022 12:50:20 +0100
Subject: [PATCH 25/75] AR_BRANCH="dnssrvasync"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 2910560c7..8488a6480 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="dnssrvasync"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From e7bb0049ef268885796d4c22651b9ad2e999080b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 19 Nov 2022 18:37:05 +0100
Subject: [PATCH 26/75] IDF_BRANCH="release/v4.4" -> latest commits

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 8488a6480..e6fdc965a 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="Tasmota/v4.4"
+	IDF_BRANCH="release/v4.4"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then

From 2a108aa9a9994fd77b8d25e6a15256c504b6a8ee Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 20 Nov 2022 11:18:31 +0100
Subject: [PATCH 27/75] 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 e6fdc965a..d3bdb00c4 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="dnssrvasync"
+AR_BRANCH="work"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 7198ea4066ff0f82cdbd6704a8ee2959bca031ef Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 20 Nov 2022 12:01:38 +0100
Subject: [PATCH 28/75] AR_BRANCH="dnssrvasync"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index d3bdb00c4..e6fdc965a 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="work"
+AR_BRANCH="dnssrvasync"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 6ecb12bf1b199230c73ad0e128cfc7dcb8c679a8 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sun, 20 Nov 2022 15:10:23 +0100
Subject: [PATCH 29/75] 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 e6fdc965a..e44d4f2bb 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="dnssrvasync"
+AR_BRANCH="master"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 045e6445a5ca4572c3e0e24b7df10477e46129ec Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 24 Nov 2022 18:49:45 +0100
Subject: [PATCH 30/75] ubuntu 22.04

---
 .github/workflows/push.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ff6778ff5..823dad0f5 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -2,15 +2,11 @@ name: ESP32 builder IDF_Arduino 4.4.3
 
 on:
   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
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - name: Install dependencies
@@ -19,7 +15,6 @@ jobs:
       run: bash ./build.sh
     - name: Release
       uses: jason2866/action-gh-release@v1.2
-      #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}
         prerelease: true

From 575ce56e4b7cb143c22efe2e3d3ef1bf448fb5ec Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 29 Nov 2022 10:57:22 +0100
Subject: [PATCH 31/75] enable IPv6

---
 .github/workflows/push.yml | 2 +-
 configs/defconfig.esp32    | 1 +
 configs/defconfig.esp32c3  | 2 +-
 configs/defconfig.esp32s2  | 1 +
 configs/defconfig.esp32s3  | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 823dad0f5..738225518 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: ESP32 builder IDF_Arduino 4.4.3
+name: IDF_Arduino 4.4.3
 
 on:
   workflow_dispatch:  # Manually start a workflow
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index ecb900609..77ab60655 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -72,6 +72,7 @@ CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 93882cef5..cb23bee4c 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -56,7 +56,6 @@ 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
@@ -65,6 +64,7 @@ CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 89e32957a..c589b743c 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -67,6 +67,7 @@ CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_PSK_MODES=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index d5267ce16..1e559dbce 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -94,6 +94,7 @@ CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y

From 765fa82f0cc7edb59a0f70814a89c9b8d5651d0e Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 9 Dec 2022 21:10:04 +0100
Subject: [PATCH 32/75] add INFO.txt to release

---
 .github/workflows/push.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 738225518..499a0c75d 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -17,6 +17,7 @@ jobs:
       uses: jason2866/action-gh-release@v1.2
       with:
         tag_name: ${{ github.run_number }}
+        body_path: ${{ github.workspace }}-INFO.txt
         prerelease: true
         files: dist/framework*
       env:

From 058d3c5912e32423f2fcc6c5b66159225e925f15 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 9 Dec 2022 21:19:56 +0100
Subject: [PATCH 33/75] Update config.sh

---
 tools/config.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/config.sh b/tools/config.sh
index e44d4f2bb..00f586eac 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,6 +36,8 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
+echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> INFO.txt
+
 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"

From fd8c2a3b46f4b55c87646626bbe469256955678a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 9 Dec 2022 22:06:06 +0100
Subject: [PATCH 34/75] esp32-arduino-lib-builder-INFO.txt

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 00f586eac..37a44d926 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,7 +36,7 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
-echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> INFO.txt
+echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> esp32-arduino-lib-builder-INFO.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From cda34fad78139444441fc0210e077241cbebe3ae Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 9 Dec 2022 23:12:27 +0100
Subject: [PATCH 35/75] Update push.yml

---
 .github/workflows/push.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 499a0c75d..835b5e0e0 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -13,6 +13,8 @@ jobs:
       run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs
       run: bash ./build.sh
+    - name: Show release txt
+      run: cat esp32-arduino-lib-builder-INFO.txt
     - name: Release
       uses: jason2866/action-gh-release@v1.2
       with:

From 520999328f95bf9b9aee9e18ad5c0ddf4105ca76 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 9 Dec 2022 23:20:26 +0100
Subject: [PATCH 36/75] cat esp32-arduino-lib-builder-INFO.txt

---
 tools/config.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/config.sh b/tools/config.sh
index 37a44d926..53c9f81d4 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -37,6 +37,7 @@ AR_REPO="$AR_USER/arduino-esp32"
 AR_BRANCH="master"
 
 echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> esp32-arduino-lib-builder-INFO.txt
+cat esp32-arduino-lib-builder-INFO.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 15036dacff58b684280b99ed81db23a1ad0e9039 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 11:39:21 +0100
Subject: [PATCH 37/75] Update push.yml

---
 .github/workflows/push.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 835b5e0e0..c062dc7de 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -13,14 +13,15 @@ jobs:
       run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs
       run: bash ./build.sh
-    - name: Show release txt
-      run: cat esp32-arduino-lib-builder-INFO.txt
+    - name: Show release-info.txt
+      run: bash cat release-info.txt
     - name: Release
       uses: jason2866/action-gh-release@v1.2
       with:
         tag_name: ${{ github.run_number }}
-        body_path: ${{ github.workspace }}-INFO.txt
         prerelease: true
-        files: dist/framework*
+        files: |
+          dist/framework*
+          release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From cd01bddbc73d529d25ad30de411c4e1a6c8edb1a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 11:41:48 +0100
Subject: [PATCH 38/75] release-info.txt

---
 tools/config.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/config.sh b/tools/config.sh
index 53c9f81d4..748e2b2ad 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,8 +36,8 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
-echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> esp32-arduino-lib-builder-INFO.txt
-cat esp32-arduino-lib-builder-INFO.txt
+echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> release-info.txt
+cat release-info.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 5c0bc570de0662119c2c28b7c96f2c5e9d773945 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 11:50:03 +0100
Subject: [PATCH 39/75] Update push.yml

---
 .github/workflows/push.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index c062dc7de..da44eae0a 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -13,6 +13,8 @@ jobs:
       run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs
       run: bash ./build.sh
+    - name: Display files
+      run: ls -R ./*
     - name: Show release-info.txt
       run: bash cat release-info.txt
     - name: Release

From a30554dd7928c4cff3c0cc40517da4523b8b4168 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:00:21 +0100
Subject: [PATCH 40/75] 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 748e2b2ad..986dee9b1 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,7 +36,7 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
-echo "Framework built from IDF branch $IDF_BRANCH and Arduino branch $AR_BRANCH" >> release-info.txt
+echo "Framework built from IDF branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
 cat release-info.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"

From 355db57eca2eecea0c4023a2daf0d53f34bbd418 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:06:12 +0100
Subject: [PATCH 41/75] 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 986dee9b1..c1da9c3af 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,7 +36,7 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
-echo "Framework built from IDF branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
+echo "Framework built from IDF $IDF_REPO_URL branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
 cat release-info.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"

From 65b1631903fac30c0a2c47284f950cb62c10c6d4 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 12:31:32 +0100
Subject: [PATCH 42/75] Update push.yml

---
 .github/workflows/push.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index da44eae0a..25a15f715 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -15,8 +15,6 @@ jobs:
       run: bash ./build.sh
     - name: Display files
       run: ls -R ./*
-    - name: Show release-info.txt
-      run: bash cat release-info.txt
     - name: Release
       uses: jason2866/action-gh-release@v1.2
       with:

From 84828ad6747e1d006407ac2b1a6432297817add2 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 13:32:17 +0100
Subject: [PATCH 43/75] rm -rf release-info.txt

Only one entry in the file
---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index c1da9c3af..eb2b6fa3f 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,8 +36,8 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
+rm -rf release-info.txt
 echo "Framework built from IDF $IDF_REPO_URL branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
-cat release-info.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 98ca826b5b951f57cfe79eb78cc04dc1093a4158 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 13:37:08 +0100
Subject: [PATCH 44/75] Update push.yml

---
 .github/workflows/push.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 25a15f715..631815d9e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -19,6 +19,7 @@ jobs:
       uses: jason2866/action-gh-release@v1.2
       with:
         tag_name: ${{ github.run_number }}
+        body_path: release-info.txt
         prerelease: true
         files: |
           dist/framework*

From c022e71a774cef51b87f705387ae8aca51b847a8 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 14:54:37 +0100
Subject: [PATCH 45/75] 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 eb2b6fa3f..385283708 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -37,7 +37,7 @@ AR_REPO="$AR_USER/arduino-esp32"
 AR_BRANCH="master"
 
 rm -rf release-info.txt
-echo "Framework built from IDF $IDF_REPO_URL branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
+echo "Framework built from Tasmota IDF branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 8a80bf5e7c17bc0ee6bb3c3071a22997778f57cd Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 15:34:51 +0100
Subject: [PATCH 46/75] add commits to release info

---
 tools/config.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/config.sh b/tools/config.sh
index 385283708..cc39aa971 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -36,9 +36,6 @@ AR_REPO="$AR_USER/arduino-esp32"
 # Arduino branch to use
 AR_BRANCH="master"
 
-rm -rf release-info.txt
-echo "Framework built from Tasmota IDF branch $IDF_BRANCH and $AR_REPO branch $AR_BRANCH" >> release-info.txt
-
 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"
@@ -53,6 +50,12 @@ AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 
+IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
+AR_COMMIT=$(git -C "$AR_COMPS/arduino" rev-parse --short HEAD || echo "")
+
+rm -rf release-info.txt
+echo "Framework built from Tasmota IDF branch $IDF_BRANCH commit $IDF_COMMIT and $AR_REPO branch $AR_BRANCH commit $AR_COMMIT" >> release-info.txt
+
 function get_os(){
   	OSBITS=`arch`
   	if [[ "$OSTYPE" == "linux"* ]]; then

From bee08a1304d98b6db3a89a2f24e1977ddff7476a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 16:34:49 +0100
Subject: [PATCH 47/75] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b4a4a9361..e63f24845 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ 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.
+Look in release and download a version. There is the Info of the used commits of IDF / Arduino.
 
 ### Stable Platformio Platform release including ESP32solo1
 based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32/ESP32solo1, ESP32C3, ESP32S2 and ESP32S3

From b303d2cb9c7956b482e17be5d873ce291d51df09 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 16:50:58 +0100
Subject: [PATCH 48/75] added release info

---
 .github/workflows/push.yml | 16 ++++++++--------
 README.md                  |  2 +-
 configs/defconfig.esp32    |  1 +
 configs/defconfig.esp32c3  |  2 +-
 configs/defconfig.esp32s2  |  1 +
 configs/defconfig.esp32s3  |  1 +
 tools/config.sh            |  8 +++++++-
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index ff6778ff5..631815d9e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,28 +1,28 @@
-name: ESP32 builder IDF_Arduino 4.4.3
+name: IDF_Arduino 4.4.3
 
 on:
   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
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
     - name: Install dependencies
       run: bash ./tools/prepare-ci.sh
     - name: Build Arduino Libs
       run: bash ./build.sh
+    - name: Display files
+      run: ls -R ./*
     - name: Release
       uses: jason2866/action-gh-release@v1.2
-      #if: startsWith(github.ref, 'refs/tags/')
       with:
         tag_name: ${{ github.run_number }}
+        body_path: release-info.txt
         prerelease: true
-        files: dist/framework*
+        files: |
+          dist/framework*
+          release-info.txt
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/README.md b/README.md
index b4a4a9361..e63f24845 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ 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.
+Look in release and download a version. There is the Info of the used commits of IDF / Arduino.
 
 ### Stable Platformio Platform release including ESP32solo1
 based on Arduino Core 2.0.5 and can be used with Platformio for the ESP32/ESP32solo1, ESP32C3, ESP32S2 and ESP32S3
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index ecb900609..77ab60655 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -72,6 +72,7 @@ CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 93882cef5..cb23bee4c 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -56,7 +56,6 @@ 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
@@ -65,6 +64,7 @@ CONFIG_LWIP_IPV4_NAPT=y
 CONFIG_LWIP_DHCP_OPTIONS_LEN=128
 CONFIG_LWIP_SNTP_UPDATE_DELAY=10800000
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_NEWLIB_NANO_FORMAT=y
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 89e32957a..c589b743c 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -67,6 +67,7 @@ CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_MBEDTLS_PSK_MODES=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index d5267ce16..1e559dbce 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -94,6 +94,7 @@ CONFIG_LWIP_TCP_RTO_TIME=3000
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0=y
 CONFIG_LWIP_UDP_RECVMBOX_SIZE=64
+CONFIG_LWIP_IPV6_AUTOCONFIG=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
diff --git a/tools/config.sh b/tools/config.sh
index 2910560c7..cc39aa971 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="Tasmota/v4.4"
+	IDF_BRANCH="release/v4.4"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -50,6 +50,12 @@ AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 
+IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
+AR_COMMIT=$(git -C "$AR_COMPS/arduino" rev-parse --short HEAD || echo "")
+
+rm -rf release-info.txt
+echo "Framework built from Tasmota IDF branch $IDF_BRANCH commit $IDF_COMMIT and $AR_REPO branch $AR_BRANCH commit $AR_COMMIT" >> release-info.txt
+
 function get_os(){
   	OSBITS=`arch`
   	if [[ "$OSTYPE" == "linux"* ]]; then

From 19879e97b3c61aea03d90da4938cd31189b5dd40 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 16:59:30 +0100
Subject: [PATCH 49/75] Update config.sh

---
 tools/config.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/config.sh b/tools/config.sh
index cc39aa971..b2a862d07 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -86,6 +86,14 @@ export SED="sed"
 export SSTAT="stat -c %s"
 
 if [[ "$AR_OS" == "macos" ]]; then
+        if ! [ -x "$(command -v gsed)" ]; then
+		echo "ERROR: gsed is not installed! Please install gsed first. ex. brew install gsed"
+		exit 1
+	fi
+	if ! [ -x "$(command -v gawk)" ]; then
+		echo "ERROR: gawk is not installed! Please install gawk first. ex. brew install gawk"
+		exit 1
+	fi
 	export SED="gsed"
 	export SSTAT="stat -f %z"
 fi

From 33997c1005144d723886d593440b5fdf38a7f0eb Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:10:34 +0100
Subject: [PATCH 50/75] Update build.sh

---
 build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index 568a04b11..8ea0313ae 100755
--- a/build.sh
+++ b/build.sh
@@ -119,11 +119,11 @@ rm -rf build sdkconfig out
 
 # Add components version info
 mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
-component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
+component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
 echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
 for component in `ls "$AR_COMPS"`; do
     if [ -d "$AR_COMPS/$component/.git" ] || [ -d "$AR_COMPS/$component/.github" ]; then
-        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
+        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD || git -C "$AR_COMPS/$component" tag --points-at HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
         echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
     fi
 done

From 4a3b7699d891cd7f1c291633c6a0b3e128e8c0f7 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:13:08 +0100
Subject: [PATCH 51/75] Update archive-build.sh

---
 tools/archive-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index beb032b35..7bf6d76e1 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
-IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --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"

From c68bfb83a421a230e9a3a42da52dd53db160cadf Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:22:54 +0100
Subject: [PATCH 52/75] 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 67127a50f..a6fd16a4c 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -46,4 +46,4 @@ cp "$IDF_PATH/components/esp32-camera/driver/private_include/cam_hal.h" "$IDF_PA
 
 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)
+export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)

From b7dbb6629d682b1d56201b6d6d4fe11a230da554 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:25:38 +0100
Subject: [PATCH 53/75] Update copy-to-arduino.sh

---
 tools/copy-to-arduino.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
index ba5b17273..6880b75d6 100755
--- a/tools/copy-to-arduino.sh
+++ b/tools/copy-to-arduino.sh
@@ -16,10 +16,9 @@ fi
 
 echo "Installing new libraries to $ESP32_ARDUINO"
 
-rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/esptool.py $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
+rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
 
 cp -f $AR_OUT/platform.txt $ESP32_ARDUINO/
 cp -Rf $AR_TOOLS/sdk $ESP32_ARDUINO/tools/
-cp -f $AR_TOOLS/esptool.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/gen_esp32part.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/platformio-build-*.py $ESP32_ARDUINO/tools/

From 49a233ad80009c5692057ec5ada2bbfcd97e8203 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:28:47 +0100
Subject: [PATCH 54/75] Update copy-bootloader.sh

---
 tools/copy-bootloader.sh | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/tools/copy-bootloader.sh b/tools/copy-bootloader.sh
index c8faf2dfc..1442c70fa 100755
--- a/tools/copy-bootloader.sh
+++ b/tools/copy-bootloader.sh
@@ -7,18 +7,8 @@ BOOTCONF=$FLASH_MODE"_$FLASH_FREQ"
 
 source ./tools/config.sh
 
-echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin"
+echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.elf"
 
 mkdir -p "$AR_SDK/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"
-
-# We use esptool v.4.21 in Tasmota IDF fork so no need to clone here
-
-#if [ ! -e "tools/esptool" ]; then
-#	git clone https://github.com/espressif/esptool tools/esptool
-#fi
-./esp-idf/components/esptool_py/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin"
 cp "build/bootloader/bootloader.elf" "$AR_SDK/bin/bootloader_$BOOTCONF.elf"

From a6938887d96c560ad80ec36eb9cee3a2f966ca24 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:31:44 +0100
Subject: [PATCH 55/75] Update config.sh

---
 tools/config.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index b2a862d07..093d9476c 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -46,7 +46,6 @@ AR_COMPS="$AR_ROOT/components"
 AR_OUT="$AR_ROOT/out"
 AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
-AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 

From ef5a9e58293cb1005d1bfc2f3b4a582a553a5dcb Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:33:37 +0100
Subject: [PATCH 56/75] rm esptool.py

---
 tools/copy-libs.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 8b2f7d275..a6505d084 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -481,9 +481,6 @@ rm -rf platform_start.txt platform_mid.txt 1platform_mid.txt
 # sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
 
-# esptool.py
-cp "$IDF_COMPS/esptool_py/esptool/esptool.py" "$AR_ESPTOOL_PY"
-
 # gen_esp32part.py
 cp "$IDF_COMPS/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
 

From 897f8ccf5c2ca68fe86a48177c56ac6363712c6e Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 17:41:28 +0100
Subject: [PATCH 57/75] Update Kconfig.projbuild

---
 main/Kconfig.projbuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
index d30fccce9..76e2defdb 100644
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@@ -13,3 +13,7 @@ config LIB_BUILDER_FLASHFREQ
     default "40m" if ESPTOOLPY_FLASHFREQ_40M
     default "26m" if ESPTOOLPY_FLASHFREQ_26M
     default "20m" if ESPTOOLPY_FLASHFREQ_20M
+
+config LIB_BUILDER_COMPILE
+    bool
+    default y

From 3fe911e9f1d24894f0722a16ef99d2b49a00076b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:11:27 +0100
Subject: [PATCH 58/75] rm esptool.py

---
 tools/archive-build.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 7bf6d76e1..a36a56f25 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -25,7 +25,6 @@ rm -rf arduino-esp32/platform.txt
 rm -rf arduino-esp32/package.json
 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 ../package.json arduino-esp32/package.json

From 1e9f62721cbcc6a8e166a53cac9e36563a22f113 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Sat, 10 Dec 2022 18:59:59 +0100
Subject: [PATCH 59/75] temp fix for changed bootloader handling

---
 tools/copy-bootloader.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/copy-bootloader.sh b/tools/copy-bootloader.sh
index 1442c70fa..1b2ab929a 100755
--- a/tools/copy-bootloader.sh
+++ b/tools/copy-bootloader.sh
@@ -8,7 +8,9 @@ BOOTCONF=$FLASH_MODE"_$FLASH_FREQ"
 source ./tools/config.sh
 
 echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.elf"
+echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin"
 
 mkdir -p "$AR_SDK/bin"
 
 cp "build/bootloader/bootloader.elf" "$AR_SDK/bin/bootloader_$BOOTCONF.elf"
+./esp-idf/components/esptool_py/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin"

From bd9fb1ee622b34afbaff2eb64ba42e215373ed2c Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 12 Dec 2022 12:19:33 +0100
Subject: [PATCH 60/75] rm temp fix (pio build updated)

---
 tools/copy-bootloader.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/copy-bootloader.sh b/tools/copy-bootloader.sh
index 1b2ab929a..1442c70fa 100755
--- a/tools/copy-bootloader.sh
+++ b/tools/copy-bootloader.sh
@@ -8,9 +8,7 @@ BOOTCONF=$FLASH_MODE"_$FLASH_FREQ"
 source ./tools/config.sh
 
 echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.elf"
-echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin"
 
 mkdir -p "$AR_SDK/bin"
 
 cp "build/bootloader/bootloader.elf" "$AR_SDK/bin/bootloader_$BOOTCONF.elf"
-./esp-idf/components/esptool_py/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin"

From 38d4f7cad04311518e9e1b274d90314f80ba995d Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 12 Dec 2022 14:42:07 +0100
Subject: [PATCH 61/75] `*.elf` for bootloader

---
 build.sh                 |  4 ++--
 main/Kconfig.projbuild   |  4 ++++
 tools/archive-build.sh   |  3 +--
 tools/config.sh          |  9 ++++++++-
 tools/copy-bootloader.sh | 12 +-----------
 tools/copy-libs.sh       |  3 ---
 tools/copy-to-arduino.sh |  3 +--
 tools/install-esp-idf.sh |  2 +-
 8 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index 568a04b11..8ea0313ae 100755
--- a/build.sh
+++ b/build.sh
@@ -119,11 +119,11 @@ rm -rf build sdkconfig out
 
 # Add components version info
 mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
-component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
+component_version="esp-idf: "$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)" "$(git -C "$IDF_PATH" rev-parse --short HEAD)
 echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
 for component in `ls "$AR_COMPS"`; do
     if [ -d "$AR_COMPS/$component/.git" ] || [ -d "$AR_COMPS/$component/.github" ]; then
-        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
+        component_version="$component: "$(git -C "$AR_COMPS/$component" symbolic-ref --short HEAD || git -C "$AR_COMPS/$component" tag --points-at HEAD)" "$(git -C "$AR_COMPS/$component" rev-parse --short HEAD)
         echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
     fi
 done
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
index d30fccce9..76e2defdb 100644
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@@ -13,3 +13,7 @@ config LIB_BUILDER_FLASHFREQ
     default "40m" if ESPTOOLPY_FLASHFREQ_40M
     default "26m" if ESPTOOLPY_FLASHFREQ_26M
     default "20m" if ESPTOOLPY_FLASHFREQ_20M
+
+config LIB_BUILDER_COMPILE
+    bool
+    default y
diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index beb032b35..a36a56f25 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD || echo "")
-IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --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"
@@ -25,7 +25,6 @@ rm -rf arduino-esp32/platform.txt
 rm -rf arduino-esp32/package.json
 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 ../package.json arduino-esp32/package.json
diff --git a/tools/config.sh b/tools/config.sh
index cc39aa971..093d9476c 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -46,7 +46,6 @@ AR_COMPS="$AR_ROOT/components"
 AR_OUT="$AR_ROOT/out"
 AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
-AR_ESPTOOL_PY="$AR_TOOLS/esptool.py"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 
@@ -86,6 +85,14 @@ export SED="sed"
 export SSTAT="stat -c %s"
 
 if [[ "$AR_OS" == "macos" ]]; then
+        if ! [ -x "$(command -v gsed)" ]; then
+		echo "ERROR: gsed is not installed! Please install gsed first. ex. brew install gsed"
+		exit 1
+	fi
+	if ! [ -x "$(command -v gawk)" ]; then
+		echo "ERROR: gawk is not installed! Please install gawk first. ex. brew install gawk"
+		exit 1
+	fi
 	export SED="gsed"
 	export SSTAT="stat -f %z"
 fi
diff --git a/tools/copy-bootloader.sh b/tools/copy-bootloader.sh
index c8faf2dfc..1442c70fa 100755
--- a/tools/copy-bootloader.sh
+++ b/tools/copy-bootloader.sh
@@ -7,18 +7,8 @@ BOOTCONF=$FLASH_MODE"_$FLASH_FREQ"
 
 source ./tools/config.sh
 
-echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.bin"
+echo "Copying bootloader: $AR_SDK/bin/bootloader_$BOOTCONF.elf"
 
 mkdir -p "$AR_SDK/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"
-
-# We use esptool v.4.21 in Tasmota IDF fork so no need to clone here
-
-#if [ ! -e "tools/esptool" ]; then
-#	git clone https://github.com/espressif/esptool tools/esptool
-#fi
-./esp-idf/components/esptool_py/esptool/esptool.py --chip "$IDF_TARGET" elf2image --dont-append-digest "build/bootloader/bootloader.elf" -o "$AR_SDK/bin/bootloader_$BOOTCONF.bin"
 cp "build/bootloader/bootloader.elf" "$AR_SDK/bin/bootloader_$BOOTCONF.elf"
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 8b2f7d275..a6505d084 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -481,9 +481,6 @@ rm -rf platform_start.txt platform_mid.txt 1platform_mid.txt
 # sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
 
-# esptool.py
-cp "$IDF_COMPS/esptool_py/esptool/esptool.py" "$AR_ESPTOOL_PY"
-
 # gen_esp32part.py
 cp "$IDF_COMPS/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
 
diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
index ba5b17273..6880b75d6 100755
--- a/tools/copy-to-arduino.sh
+++ b/tools/copy-to-arduino.sh
@@ -16,10 +16,9 @@ fi
 
 echo "Installing new libraries to $ESP32_ARDUINO"
 
-rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/esptool.py $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
+rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py $ESP32_ARDUINO/platform.txt
 
 cp -f $AR_OUT/platform.txt $ESP32_ARDUINO/
 cp -Rf $AR_TOOLS/sdk $ESP32_ARDUINO/tools/
-cp -f $AR_TOOLS/esptool.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/gen_esp32part.py $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/platformio-build-*.py $ESP32_ARDUINO/tools/
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index 67127a50f..a6fd16a4c 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -46,4 +46,4 @@ cp "$IDF_PATH/components/esp32-camera/driver/private_include/cam_hal.h" "$IDF_PA
 
 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)
+export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)

From 3f2ee430271ffbcccc6ccd1556f407b086aea16a Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Tue, 13 Dec 2022 18:29:22 +0100
Subject: [PATCH 62/75] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e63f24845..b6fd32ed5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 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)
+# 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)[![GitHub Releases](https://img.shields.io/github/downloads/Jason2866/esp32-arduino-lib-builder/total?label=downloads)](https://github.com/Jason2866/esp32-arduino-lib-builder/releases/latest)
 
 This repository contains the scripts that produce the libraries included with Tasmota esp32-arduino.
 

From 7b7e022edacce9032e4cf166a1b4dfb8ea6ffe52 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 16 Dec 2022 15:20:58 +0100
Subject: [PATCH 63/75] 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 631815d9e..9d98548a4 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -1,4 +1,4 @@
-name: IDF_Arduino 4.4.3
+name: Arduino branch work
 
 on:
   workflow_dispatch:  # Manually start a workflow

From fabaffc22e06817ae54a9dea73fd3707f4508534 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 16 Dec 2022 15:21:28 +0100
Subject: [PATCH 64/75] AR_BRANCH="work"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 093d9476c..34bf2d9ac 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="work"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From 12de958a44588da5712ed6ef1b71beba0123ebe0 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 16 Dec 2022 17:00:42 +0100
Subject: [PATCH 65/75] core 2.5.4

---
 core_version.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core_version.h b/core_version.h
index 19c6bb113..9c89fdcf3 100644
--- a/core_version.h
+++ b/core_version.h
@@ -1,4 +1,4 @@
-#define ARDUINO_ESP32_GIT_VER 0x38c3f487
-#define ARDUINO_ESP32_GIT_DESC 2.0.5.3
-#define ARDUINO_ESP32_RELEASE_2_0_5_3
-#define ARDUINO_ESP32_RELEASE "2_0_5_3"
+#define ARDUINO_ESP32_GIT_VER 0x0f5790e5
+#define ARDUINO_ESP32_GIT_DESC 2.0.5.4
+#define ARDUINO_ESP32_RELEASE_2_0_5_4
+#define ARDUINO_ESP32_RELEASE "2_0_5_4"

From 5b2fa47dfee988c500b73a78f0a1a5c018abca79 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 22 Dec 2022 15:18:13 +0100
Subject: [PATCH 66/75] AR_BRANCH="work_ipv6"

---
 tools/config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index 34bf2d9ac..86c2b196a 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="work"
+AR_BRANCH="work_ipv6"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
 if [ -n $GITHUB_TOKEN ]; then

From f02a6fa59db0dfaaada31c390f101fa8fe5988cf Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 22 Dec 2022 18:32:52 +0100
Subject: [PATCH 67/75] rm gen_insights_package.py

---
 tools/archive-build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index a36a56f25..8274b1087 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -20,6 +20,7 @@ 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/gen_insights_package.py
 rm -rf arduino-esp32/tools/platformio-build-*.py
 rm -rf arduino-esp32/platform.txt
 rm -rf arduino-esp32/package.json

From a9c954566a8a8823ca5b3178e4653a022b95f882 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 22 Dec 2022 18:41:11 +0100
Subject: [PATCH 68/75] core 2.0.6

---
 core_version.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core_version.h b/core_version.h
index 9c89fdcf3..c593bf82d 100644
--- a/core_version.h
+++ b/core_version.h
@@ -1,4 +1,4 @@
-#define ARDUINO_ESP32_GIT_VER 0x0f5790e5
-#define ARDUINO_ESP32_GIT_DESC 2.0.5.4
-#define ARDUINO_ESP32_RELEASE_2_0_5_4
-#define ARDUINO_ESP32_RELEASE "2_0_5_4"
+#define ARDUINO_ESP32_GIT_VER 0xcbaeab4e
+#define ARDUINO_ESP32_GIT_DESC 2.0.6
+#define ARDUINO_ESP32_RELEASE_2_0_6
+#define ARDUINO_ESP32_RELEASE "2_0_6"

From 835f5a9318182fb20b745a0cd9e1ce4eafc2943d Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 22 Dec 2022 19:38:48 +0100
Subject: [PATCH 69/75] rm not needed libraries

---
 tools/archive-build.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 8274b1087..f3ba888c0 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -16,11 +16,14 @@ echo "Creating framework-arduinoespressif32"
 cp -rf ../components/arduino arduino-esp32
 rm -rf arduino-esp32/docs
 rm -rf arduino-esp32/tests
+rm -rf arduino-esp32/libraries/RainMaker
+rm -rf arduino-esp32/libraries/Insights
 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/gen_insights_package.py
+rm -rf arduino-esp32/tools/gen_insights_package.exe
 rm -rf arduino-esp32/tools/platformio-build-*.py
 rm -rf arduino-esp32/platform.txt
 rm -rf arduino-esp32/package.json

From dc5d994ecefece2f70f438f7862a5adfa8d0c5b4 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 22 Dec 2022 19:42:02 +0100
Subject: [PATCH 70/75] core 2.0.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8f72c8441..4a482e7e1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinoespressif32",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "description": "Tasmota Arduino Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs",
   "keywords": [
     "tasmota",

From 9e89e8fb264b1bd73b308a90eb645872441b90c5 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 22 Dec 2022 23:46:28 +0100
Subject: [PATCH 71/75] Update update-components.sh

---
 tools/update-components.sh | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/tools/update-components.sh b/tools/update-components.sh
index 70daaf71e..572faa3b9 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -2,13 +2,11 @@
 
 source ./tools/config.sh
 
-DL_REPO_URL="https://github.com/espressif/esp-dl.git"
-SR_REPO_URL="https://github.com/espressif/esp-sr.git"
-
 #
 # CLONE/UPDATE ARDUINO
 #
 
+echo "Updating ESP32 Arduino..."
 if [ ! -d "$AR_COMPS/arduino" ]; then
 	git clone $AR_REPO_URL "$AR_COMPS/arduino"
 fi
@@ -46,27 +44,3 @@ if [ "$AR_BRANCH" ]; then
 	git -C "$AR_COMPS/arduino" pull --ff-only
 fi
 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
-
-#
-# 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

From 951099ffb1011cbbf158b60fe9ca084cca0508ea Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 23 Dec 2022 00:27:08 +0100
Subject: [PATCH 72/75] Solo1 (#46)

---
 .github/workflows/push.yml |  2 +-
 build.sh                   |  2 +-
 configs/defconfig.esp32    |  2 +-
 tools/archive-build.sh     | 13 ++++++++-----
 tools/config.sh            |  0
 5 files changed, 11 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 tools/archive-build.sh
 mode change 100755 => 100644 tools/config.sh

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

From 30a897eb9f8caeeaad65ba64160bf7df187c29fb Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 23 Dec 2022 10:14:35 +0100
Subject: [PATCH 73/75] Changing file permissions

---
 tools/archive-build.sh | 0
 tools/config.sh        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tools/archive-build.sh
 mode change 100644 => 100755 tools/config.sh

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
old mode 100644
new mode 100755
diff --git a/tools/config.sh b/tools/config.sh
old mode 100644
new mode 100755

From 75fba6c89c2376ef90d2cb8983e7fb7847592d6d Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 23 Dec 2022 10:16:32 +0100
Subject: [PATCH 74/75] fix

---
 tools/archive-build.sh | 0
 tools/config.sh        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 tools/archive-build.sh
 mode change 100755 => 100644 tools/config.sh

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
old mode 100755
new mode 100644
diff --git a/tools/config.sh b/tools/config.sh
old mode 100755
new mode 100644

From 1516591f8231fbc553a78fdd6b179e0ad86755c6 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Fri, 23 Dec 2022 10:17:31 +0100
Subject: [PATCH 75/75] Changing file permissions

---
 tools/archive-build.sh | 0
 tools/config.sh        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 tools/archive-build.sh
 mode change 100644 => 100755 tools/config.sh

diff --git a/tools/archive-build.sh b/tools/archive-build.sh
old mode 100644
new mode 100755
diff --git a/tools/config.sh b/tools/config.sh
old mode 100644
new mode 100755