From d69b888822ac62c979af945129502ed95d5601fc Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Mon, 6 Feb 2023 09:29:32 -0300
Subject: [PATCH 01/11] Adds softAp(String) to make it compatible with ESP8266
 (#7801)

---
 libraries/WiFi/src/WiFiAP.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/WiFi/src/WiFiAP.h b/libraries/WiFi/src/WiFiAP.h
index a9d8f551e51..7ac03034b4c 100644
--- a/libraries/WiFi/src/WiFiAP.h
+++ b/libraries/WiFi/src/WiFiAP.h
@@ -38,6 +38,10 @@ class WiFiAPClass
 public:
 
     bool softAP(const char* ssid, const char* passphrase = NULL, int channel = 1, int ssid_hidden = 0, int max_connection = 4, bool ftm_responder = false);
+    bool softAP(const String& ssid, const String& passphrase = emptyString, int channel = 1, int ssid_hidden = 0, int max_connection = 4, bool ftm_responder = false) {
+       return softAP(ssid.c_str(), passphrase.c_str(), channel, ssid_hidden, max_connection, ftm_responder);
+    }
+
     bool softAPConfig(IPAddress local_ip, IPAddress gateway, IPAddress subnet, IPAddress dhcp_lease_start = (uint32_t) 0);
     bool softAPdisconnect(bool wifioff = false);
 

From a13520c9668e9a274b9c08d89d08bdd01e1767d0 Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Mon, 6 Feb 2023 09:29:58 -0300
Subject: [PATCH 02/11] Fix commentary (#7800)

Minor fix based on observation done in https://github.com/espressif/arduino-esp32/issues/7795#issuecomment-1416868611
---
 libraries/Ethernet/src/ETH.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Ethernet/src/ETH.cpp b/libraries/Ethernet/src/ETH.cpp
index a9be448e6ac..4b9b5edee2f 100644
--- a/libraries/Ethernet/src/ETH.cpp
+++ b/libraries/Ethernet/src/ETH.cpp
@@ -392,7 +392,7 @@ bool ETHClass::begin(uint8_t phy_addr, int power, int mdc, int mdio, eth_phy_typ
         log_e("esp_eth_init error: %d", err);
     }
 #endif
-    // holds a few microseconds to let DHCP start and enter into a good state
+    // holds a few milliseconds to let DHCP start and enter into a good state
     // FIX ME -- adresses issue https://github.com/espressif/arduino-esp32/issues/5733
     delay(50);
 

From 7f4946375f826e5448b1cb71d5e658ab4322d469 Mon Sep 17 00:00:00 2001
From: Ha Thach <thach@tinyusb.org>
Date: Mon, 6 Feb 2023 19:31:06 +0700
Subject: [PATCH 03/11] add adafruit new board feather esp32s2 reserve tft
 (#7794)

---
 boards.txt                                    | 171 ++++++++++++++++++
 .../variant.cpp                               |   7 +-
 2 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/boards.txt b/boards.txt
index c0ceb0d7f88..0e253e434c3 100644
--- a/boards.txt
+++ b/boards.txt
@@ -8256,6 +8256,177 @@ adafruit_feather_esp32s2_tft.menu.EraseFlash.none.upload.erase_cmd=
 adafruit_feather_esp32s2_tft.menu.EraseFlash.all=Enabled
 adafruit_feather_esp32s2_tft.menu.EraseFlash.all.upload.erase_cmd=-e
 
+##############################################################
+# Adafruit Feather ESP32-S2 Reverse TFT
+
+adafruit_feather_esp32s2_reversetft.name=Adafruit Feather ESP32-S2 Reverse TFT
+adafruit_feather_esp32s2_reversetft.vid.0=0x239A
+adafruit_feather_esp32s2_reversetft.pid.0=0x80ED
+adafruit_feather_esp32s2_reversetft.vid.1=0x239A
+adafruit_feather_esp32s2_reversetft.pid.1=0x00ED
+adafruit_feather_esp32s2_reversetft.vid.2=0x239A
+adafruit_feather_esp32s2_reversetft.pid.2=0x80EE
+
+adafruit_feather_esp32s2_reversetft.bootloader.tool=esptool_py
+adafruit_feather_esp32s2_reversetft.bootloader.tool.default=esptool_py
+
+adafruit_feather_esp32s2_reversetft.upload.tool=esptool_py
+adafruit_feather_esp32s2_reversetft.upload.tool.default=esptool_py
+adafruit_feather_esp32s2_reversetft.upload.tool.network=esp_ota
+
+adafruit_feather_esp32s2_reversetft.upload.maximum_size=1310720
+adafruit_feather_esp32s2_reversetft.upload.maximum_data_size=327680
+adafruit_feather_esp32s2_reversetft.upload.flags=
+adafruit_feather_esp32s2_reversetft.upload.extra_flags=
+adafruit_feather_esp32s2_reversetft.upload.use_1200bps_touch=true
+adafruit_feather_esp32s2_reversetft.upload.wait_for_upload_port=true
+
+adafruit_feather_esp32s2_reversetft.serial.disableDTR=false
+adafruit_feather_esp32s2_reversetft.serial.disableRTS=false
+
+adafruit_feather_esp32s2_reversetft.build.tarch=xtensa
+adafruit_feather_esp32s2_reversetft.build.bootloader_addr=0x1000
+adafruit_feather_esp32s2_reversetft.build.target=esp32s2
+adafruit_feather_esp32s2_reversetft.build.mcu=esp32s2
+adafruit_feather_esp32s2_reversetft.build.core=esp32
+adafruit_feather_esp32s2_reversetft.build.variant=adafruit_feather_esp32s2_reversetft
+adafruit_feather_esp32s2_reversetft.build.board=ADAFRUIT_FEATHER_ESP32S2_REVTFT
+
+adafruit_feather_esp32s2_reversetft.build.cdc_on_boot=1
+adafruit_feather_esp32s2_reversetft.build.msc_on_boot=0
+adafruit_feather_esp32s2_reversetft.build.dfu_on_boot=0
+adafruit_feather_esp32s2_reversetft.build.f_cpu=240000000L
+adafruit_feather_esp32s2_reversetft.build.flash_size=4MB
+adafruit_feather_esp32s2_reversetft.build.flash_freq=80m
+adafruit_feather_esp32s2_reversetft.build.flash_mode=dio
+adafruit_feather_esp32s2_reversetft.build.boot=qio
+adafruit_feather_esp32s2_reversetft.build.partitions=default
+adafruit_feather_esp32s2_reversetft.build.defines=
+
+adafruit_feather_esp32s2_reversetft.menu.CDCOnBoot.cdc=Enabled
+adafruit_feather_esp32s2_reversetft.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+adafruit_feather_esp32s2_reversetft.menu.CDCOnBoot.default=Disabled
+adafruit_feather_esp32s2_reversetft.menu.CDCOnBoot.default.build.cdc_on_boot=0
+
+adafruit_feather_esp32s2_reversetft.menu.MSCOnBoot.default=Disabled
+adafruit_feather_esp32s2_reversetft.menu.MSCOnBoot.default.build.msc_on_boot=0
+adafruit_feather_esp32s2_reversetft.menu.MSCOnBoot.msc=Enabled
+adafruit_feather_esp32s2_reversetft.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+adafruit_feather_esp32s2_reversetft.menu.DFUOnBoot.default=Disabled
+adafruit_feather_esp32s2_reversetft.menu.DFUOnBoot.default.build.dfu_on_boot=0
+adafruit_feather_esp32s2_reversetft.menu.DFUOnBoot.dfu=Enabled
+adafruit_feather_esp32s2_reversetft.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+adafruit_feather_esp32s2_reversetft.menu.UploadMode.cdc=Internal USB
+adafruit_feather_esp32s2_reversetft.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+adafruit_feather_esp32s2_reversetft.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+adafruit_feather_esp32s2_reversetft.menu.UploadMode.default=UART0
+adafruit_feather_esp32s2_reversetft.menu.UploadMode.default.upload.use_1200bps_touch=false
+adafruit_feather_esp32s2_reversetft.menu.UploadMode.default.upload.wait_for_upload_port=false
+
+adafruit_feather_esp32s2_reversetft.menu.PSRAM.enabled=Enabled
+adafruit_feather_esp32s2_reversetft.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+adafruit_feather_esp32s2_reversetft.menu.PSRAM.disabled=Disabled
+adafruit_feather_esp32s2_reversetft.menu.PSRAM.disabled.build.defines=
+
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2=TinyUF2 4MB (1.3MB APP/960KB FFAT)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.custom_bootloader=bootloader-tinyuf2
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.build.custom_partitions=partitions-4MB-tinyuf2
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.upload.maximum_size=1441792
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.tinyuf2.upload.extra_flags=0x2d0000 "{runtime.platform.path}/variants/{build.variant}/tinyuf2.bin"
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.default.build.partitions=default
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.minimal.build.partitions=minimal
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.no_ota.build.partitions=no_ota
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.huge_app.build.partitions=huge_app
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+adafruit_feather_esp32s2_reversetft.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.240=240MHz (WiFi)
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.240.build.f_cpu=240000000L
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.160=160MHz (WiFi)
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.160.build.f_cpu=160000000L
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.80=80MHz (WiFi)
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.80.build.f_cpu=80000000L
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.40=40MHz
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.40.build.f_cpu=40000000L
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.20=20MHz
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.20.build.f_cpu=20000000L
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.10=10MHz
+adafruit_feather_esp32s2_reversetft.menu.CPUFreq.10.build.f_cpu=10000000L
+
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.qio=QIO
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.qio.build.flash_mode=dio
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.qio.build.boot=qio
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.dio=DIO
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.dio.build.flash_mode=dio
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.dio.build.boot=dio
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.qout=QOUT
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.qout.build.flash_mode=dout
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.qout.build.boot=qout
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.dout=DOUT
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.dout.build.flash_mode=dout
+adafruit_feather_esp32s2_reversetft.menu.FlashMode.dout.build.boot=dout
+
+adafruit_feather_esp32s2_reversetft.menu.FlashFreq.80=80MHz
+adafruit_feather_esp32s2_reversetft.menu.FlashFreq.80.build.flash_freq=80m
+adafruit_feather_esp32s2_reversetft.menu.FlashFreq.40=40MHz
+adafruit_feather_esp32s2_reversetft.menu.FlashFreq.40.build.flash_freq=40m
+
+adafruit_feather_esp32s2_reversetft.menu.FlashSize.4M=4MB (32Mb)
+adafruit_feather_esp32s2_reversetft.menu.FlashSize.4M.build.flash_size=4MB
+
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.921600=921600
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.921600.upload.speed=921600
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.115200=115200
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.115200.upload.speed=115200
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.256000.windows=256000
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.256000.upload.speed=256000
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.230400.windows.upload.speed=256000
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.230400=230400
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.230400.upload.speed=230400
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.460800.linux=460800
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.460800.macosx=460800
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.460800.upload.speed=460800
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.512000.windows=512000
+adafruit_feather_esp32s2_reversetft.menu.UploadSpeed.512000.upload.speed=512000
+
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.none=None
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.none.build.code_debug=0
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.error=Error
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.error.build.code_debug=1
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.warn=Warn
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.warn.build.code_debug=2
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.info=Info
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.info.build.code_debug=3
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.debug=Debug
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.debug.build.code_debug=4
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.verbose=Verbose
+adafruit_feather_esp32s2_reversetft.menu.DebugLevel.verbose.build.code_debug=5
+
+adafruit_feather_esp32s2_reversetft.menu.EraseFlash.none=Disabled
+adafruit_feather_esp32s2_reversetft.menu.EraseFlash.none.upload.erase_cmd=
+adafruit_feather_esp32s2_reversetft.menu.EraseFlash.all=Enabled
+adafruit_feather_esp32s2_reversetft.menu.EraseFlash.all.upload.erase_cmd=-e
+
 ##############################################################
 # Adafruit QT Py ESP32-S2
 
diff --git a/variants/adafruit_feather_esp32s2_reversetft/variant.cpp b/variants/adafruit_feather_esp32s2_reversetft/variant.cpp
index 750f5f72b02..548ce9ff4a1 100644
--- a/variants/adafruit_feather_esp32s2_reversetft/variant.cpp
+++ b/variants/adafruit_feather_esp32s2_reversetft/variant.cpp
@@ -31,7 +31,12 @@ extern "C" {
 // Initialize variant/board, called before setup()
 void initVariant(void)
 {
-
+  // This board has power control pins, and we must set them to output and high
+  // in order to enable the NeoPixels, TFT & I2C
+  pinMode(NEOPIXEL_POWER, OUTPUT);
+  digitalWrite(NEOPIXEL_POWER, HIGH);
+  pinMode(TFT_I2C_POWER, OUTPUT);
+  digitalWrite(TFT_I2C_POWER, HIGH);
 }
 
 }

From a807507c64b6b9b4b5b923c4438d998dbf2c4046 Mon Sep 17 00:00:00 2001
From: Me No Dev <me-no-dev@users.noreply.github.com>
Date: Mon, 6 Feb 2023 14:41:46 +0200
Subject: [PATCH 04/11] Backport some fixes from esp-idf-v5.1 (#7762)

---
 .github/scripts/install-arduino-cli.sh | 46 ++++++++++++++++++
 .github/scripts/on-push.sh             | 14 +++---
 .github/scripts/on-release.sh          |  8 ++--
 .github/scripts/sketch_utils.sh        | 64 +++++++++++++++++++-------
 platform.txt                           | 10 ++--
 5 files changed, 110 insertions(+), 32 deletions(-)
 create mode 100755 .github/scripts/install-arduino-cli.sh

diff --git a/.github/scripts/install-arduino-cli.sh b/.github/scripts/install-arduino-cli.sh
new file mode 100755
index 00000000000..ba7547ccc28
--- /dev/null
+++ b/.github/scripts/install-arduino-cli.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+OSBITS=`arch`
+if [[ "$OSTYPE" == "linux"* ]]; then
+    export OS_IS_LINUX="1"
+    if [[ "$OSBITS" == "i686" ]]; then
+        OS_NAME="linux32"
+    elif [[ "$OSBITS" == "x86_64" ]]; then
+        OS_NAME="linux64"
+    elif [[ "$OSBITS" == "armv7l" || "$OSBITS" == "aarch64" ]]; then
+        OS_NAME="linuxarm"
+    else
+        OS_NAME="$OSTYPE-$OSBITS"
+        echo "Unknown OS '$OS_NAME'"
+        exit 1
+    fi
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    export OS_IS_MACOS="1"
+    OS_NAME="macosx"
+elif [[ "$OSTYPE" == "cygwin" ]] || [[ "$OSTYPE" == "msys" ]] || [[ "$OSTYPE" == "win32" ]]; then
+    export OS_IS_WINDOWS="1"
+    OS_NAME="windows"
+else
+    OS_NAME="$OSTYPE-$OSBITS"
+    echo "Unknown OS '$OS_NAME'"
+    exit 1
+fi
+export OS_NAME
+
+if [ "$OS_IS_MACOS" == "1" ]; then
+    export ARDUINO_IDE_PATH="$HOME/bin"
+    export ARDUINO_USR_PATH="$HOME/Documents/Arduino"
+elif [ "$OS_IS_WINDOWS" == "1" ]; then
+    export ARDUINO_IDE_PATH="$HOME/bin"
+    export ARDUINO_USR_PATH="$HOME/Documents/Arduino"
+else
+    export ARDUINO_IDE_PATH="$HOME/bin"
+    export ARDUINO_USR_PATH="$HOME/Arduino"
+fi
+
+if [ ! -d "$ARDUINO_IDE_PATH" ] || [ ! -f "$ARDUINO_IDE_PATH/arduino-cli" ]; then
+    echo "Installing Arduino CLI on $OS_NAME ..."
+    mkdir -p "$ARDUINO_IDE_PATH"
+    curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR="$ARDUINO_IDE_PATH" sh
+fi
+
diff --git a/.github/scripts/on-push.sh b/.github/scripts/on-push.sh
index 71a92a1021a..0ca5a648fd0 100755
--- a/.github/scripts/on-push.sh
+++ b/.github/scripts/on-push.sh
@@ -9,7 +9,8 @@ function build(){
     local fqbn=$2
     local chunk_index=$3
     local chunks_cnt=$4
-    local sketches=$5
+    shift; shift; shift; shift;
+    local sketches=$*
 
     local BUILD_SKETCH="${SCRIPTS_DIR}/sketch_utils.sh build"
     local BUILD_SKETCHES="${SCRIPTS_DIR}/sketch_utils.sh chunk_build"
@@ -24,15 +25,15 @@ function build(){
         ${BUILD_SKETCHES} ${args}
     else
         for sketch in ${sketches}; do
-            args+=" -s $(dirname $sketch)"
-            if [ "$OS_IS_WINDOWS" == "1" ]; then
+            local sargs="$args -s $(dirname $sketch)"
+            if [ "$OS_IS_WINDOWS" == "1" ] && [ -d "$ARDUINO_IDE_PATH/tools-builder" ]; then
                 local ctags_version=`ls "$ARDUINO_IDE_PATH/tools-builder/ctags/"`
                 local preprocessor_version=`ls "$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/"`
                 win_opts="-prefs=runtime.tools.ctags.path=$ARDUINO_IDE_PATH/tools-builder/ctags/$ctags_version
                 -prefs=runtime.tools.arduino-preprocessor.path=$ARDUINO_IDE_PATH/tools-builder/arduino-preprocessor/$preprocessor_version"
-                args+=" ${win_opts}"
+                sargs+=" ${win_opts}"
             fi
-            ${BUILD_SKETCH} ${args}
+            ${BUILD_SKETCH} ${sargs}
         done
     fi
 }
@@ -59,7 +60,8 @@ fi
 
 SCRIPTS_DIR="./.github/scripts"
 if [ "$BUILD_PIO" -eq 0 ]; then
-    source ${SCRIPTS_DIR}/install-arduino-ide.sh
+    #source ${SCRIPTS_DIR}/install-arduino-ide.sh
+    source ${SCRIPTS_DIR}/install-arduino-cli.sh
     source ${SCRIPTS_DIR}/install-arduino-core-esp32.sh
 
     FQBN_ESP32="espressif:esp32:esp32:PSRAM=enabled,PartitionScheme=huge_app"
diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh
index fb595b4df2c..947146ec492 100755
--- a/.github/scripts/on-release.sh
+++ b/.github/scripts/on-release.sh
@@ -197,10 +197,10 @@ find "$PKG_DIR" -name '*.git*' -type f -delete
 echo "Generating platform.txt..."
 cat "$GITHUB_WORKSPACE/platform.txt" | \
 sed "s/version=.*/version=$ver$extent/g" | \
-sed 's/runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf//g' | \
-sed 's/runtime.tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s2-elf//g' | \
-sed 's/runtime.tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s3-elf//g' | \
-sed 's/runtime.tools.riscv32-esp-elf-gcc.path={runtime.platform.path}\/tools\/riscv32-esp-elf//g' | \
+sed 's/tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32-elf/tools.xtensa-esp32-elf-gcc.path=\{runtime.tools.xtensa-esp32-elf-gcc.path\}/g' | \
+sed 's/tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s2-elf/tools.xtensa-esp32s2-elf-gcc.path=\{runtime.tools.xtensa-esp32s2-elf-gcc.path\}/g' | \
+sed 's/tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}\/tools\/xtensa-esp32s3-elf/tools.xtensa-esp32s3-elf-gcc.path=\{runtime.tools.xtensa-esp32s3-elf-gcc.path\}/g' | \
+sed 's/tools.riscv32-esp-elf-gcc.path={runtime.platform.path}\/tools\/riscv32-esp-elf/tools.riscv32-esp-elf-gcc.path=\{runtime.tools.riscv32-esp-elf-gcc.path\}/g' | \
 sed 's/tools.esptool_py.path={runtime.platform.path}\/tools\/esptool/tools.esptool_py.path=\{runtime.tools.esptool_py.path\}/g' | \
 sed 's/debug.server.openocd.path={runtime.platform.path}\/tools\/openocd-esp32\/bin\/openocd/debug.server.openocd.path=\{runtime.tools.openocd-esp32.path\}\/bin\/openocd/g' | \
 sed 's/debug.server.openocd.scripts_dir={runtime.platform.path}\/tools\/openocd-esp32\/share\/openocd\/scripts\//debug.server.openocd.scripts_dir=\{runtime.tools.openocd-esp32.path\}\/share\/openocd\/scripts\//g' | \
diff --git a/.github/scripts/sketch_utils.sh b/.github/scripts/sketch_utils.sh
index 3a856202e51..4a8d500bcbc 100755
--- a/.github/scripts/sketch_utils.sh
+++ b/.github/scripts/sketch_utils.sh
@@ -121,34 +121,65 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
     if [ -n "$ARDUINO_BUILD_DIR" ]; then
         build_dir="$ARDUINO_BUILD_DIR"
     elif [ $len -eq 1 ]; then
-        build_dir="$sketchdir/build"
+        # build_dir="$sketchdir/build"
+        build_dir="$HOME/.arduino/build.tmp"
     fi
 
     mkdir -p "$ARDUINO_CACHE_DIR"
     for i in `seq 0 $(($len - 1))`
     do
         if [ $len -ne 1 ]; then
-          build_dir="$sketchdir/build$i"
+          # build_dir="$sketchdir/build$i"
+          build_dir="$HOME/.arduino/build$i.tmp"
         fi
         rm -rf $build_dir
         mkdir -p $build_dir
 
         currfqbn=`echo $fqbn | jq -r --argjson i $i '.[$i]'`
         sketchname=$(basename $sketchdir)
-        echo "Building $sketchname with FQBN=$currfqbn"
-        $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
-            -fqbn=\"$currfqbn\" \
-            -warnings="all" \
-            -tools "$ide_path/tools-builder" \
-            -tools "$ide_path/tools" \
-            -built-in-libraries "$ide_path/libraries" \
-            -hardware "$ide_path/hardware" \
-            -hardware "$user_path/hardware" \
-            -libraries "$user_path/libraries" \
-            -build-cache "$ARDUINO_CACHE_DIR" \
-            -build-path "$build_dir" \
-            $xtra_opts "${sketchdir}/${sketchname}.ino"
+
+        if [ -f "$ide_path/arduino-cli" ]; then
+            echo "Building $sketchname with arduino-cli and FQBN=$currfqbn"
+
+            curroptions=`echo "$currfqbn" | cut -d':' -f4`
+            currfqbn=`echo "$currfqbn" | cut -d':' -f1-3`
+            $ide_path/arduino-cli compile \
+                --fqbn "$currfqbn" \
+                --board-options "$curroptions" \
+                --warnings "all" \
+                --build-cache-path "$ARDUINO_CACHE_DIR" \
+                --build-path "$build_dir" \
+                $xtra_opts "${sketchdir}"
+        elif [ -f "$ide_path/arduino-builder" ]; then
+            echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
+
+            $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
+                -fqbn=\"$currfqbn\" \
+                -warnings="all" \
+                -tools "$ide_path/tools-builder" \
+                -hardware "$user_path/hardware" \
+                -libraries "$user_path/libraries" \
+                -build-cache "$ARDUINO_CACHE_DIR" \
+                -build-path "$build_dir" \
+                $xtra_opts "${sketchdir}/${sketchname}.ino"
+
+            # $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
+            #     -fqbn=\"$currfqbn\" \
+            #     -warnings="all" \
+            #     -tools "$ide_path/tools-builder" \
+            #     -tools "$ide_path/tools" \
+            #     -built-in-libraries "$ide_path/libraries" \
+            #     -hardware "$ide_path/hardware" \
+            #     -hardware "$user_path/hardware" \
+            #     -libraries "$user_path/libraries" \
+            #     -build-cache "$ARDUINO_CACHE_DIR" \
+            #     -build-path "$build_dir" \
+            #     $xtra_opts "${sketchdir}/${sketchname}.ino"
+        fi
     done
+    unset fqbn
+    unset xtra_opts
+    unset options
 }
 
 function count_sketches(){ # count_sketches <path> [target]
@@ -294,8 +325,7 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
         fi
         echo ""
         echo "Building Sketch Index $(($sketchnum - 1)) - $sketchdirname"
-        args+=" -s $sketchdir $xtra_opts"
-        build_sketch $args
+        build_sketch $args -s $sketchdir $xtra_opts
         local result=$?
         if [ $result -ne 0 ]; then
             return $result
diff --git a/platform.txt b/platform.txt
index 7fc48d07115..b6152789e24 100644
--- a/platform.txt
+++ b/platform.txt
@@ -1,10 +1,10 @@
 name=ESP32 Arduino
 version=2.0.6
 
-runtime.tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
-runtime.tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s2-elf
-runtime.tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s3-elf
-runtime.tools.riscv32-esp-elf-gcc.path={runtime.platform.path}/tools/riscv32-esp-elf
+tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
+tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s2-elf
+tools.xtensa-esp32s3-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s3-elf
+tools.riscv32-esp-elf-gcc.path={runtime.platform.path}/tools/riscv32-esp-elf
 
 debug.server.openocd.path={runtime.platform.path}/tools/openocd-esp32/bin/openocd
 debug.server.openocd.scripts_dir={runtime.platform.path}/tools/openocd-esp32/share/openocd/scripts/
@@ -27,7 +27,7 @@ tools.gen_esp32part.cmd.windows="{runtime.platform.path}/tools/gen_esp32part.exe
 tools.gen_insights_pkg.cmd=python3 "{runtime.platform.path}"/tools/gen_insights_package.py
 tools.gen_insights_pkg.cmd.windows="{runtime.platform.path}/tools/gen_insights_package.exe"
 
-compiler.path={runtime.tools.{build.tarch}-{build.target}-elf-gcc.path}/bin/
+compiler.path={tools.{build.tarch}-{build.target}-elf-gcc.path}/bin/
 compiler.sdk.path={runtime.platform.path}/tools/sdk/{build.mcu}
 compiler.prefix={build.tarch}-{build.target}-elf-
 

From 0c6222c0a3e485a77d8aea85920664d7ff0f1918 Mon Sep 17 00:00:00 2001
From: Martin Turski <quiret@vfemail.net>
Date: Mon, 6 Feb 2023 13:43:22 +0100
Subject: [PATCH 05/11] bugfix: add <stdint.h> for uint8_t to avoid compilation
 failure (GCC 11.2.0) (#7744)

---
 cores/esp32/FunctionalInterrupt.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cores/esp32/FunctionalInterrupt.h b/cores/esp32/FunctionalInterrupt.h
index b5e3181f986..69bb5aee7b3 100644
--- a/cores/esp32/FunctionalInterrupt.h
+++ b/cores/esp32/FunctionalInterrupt.h
@@ -9,6 +9,7 @@
 #define CORE_CORE_FUNCTIONALINTERRUPT_H_
 
 #include <functional>
+#include <stdint.h>
 
 struct InterruptArgStructure {
 	std::function<void(void)> interruptFunction;

From 0b645aec086643f6801f95ded65e1f4bf333520f Mon Sep 17 00:00:00 2001
From: raviypujar <raviypujar@gmail.com>
Date: Mon, 6 Feb 2023 18:14:17 +0530
Subject: [PATCH 06/11] Adding 3rd party boards for VALTRACK-V4-VTS-ESP32-C3 &
 VALTRACK-V4-MFW-ESP32-C3 (#7735)

* Added VALTRACK-V4-VTS-ESP32-C3 board definition

Created pins_arduino.h & made changes to boards.txt with necessary changes

* Modified the URL

* Renamed json

* renamed all auRL

* Adding VALTRACK-V4 series board definitions

Added VALTRACK-V4-VTS-ESP32C3 & VALTRACK-V4-MFW-ESP32-C3 board variants

* Adding VALTRACK-V4 series board definitions

Added VALTRACK-V4-VTS-ESP32C3 & VALTRACK-V4-MFW-ESP32-C3 board variants

* Reverted package_esp32_index.template.json

restored package_esp32_index.template.json from edits

* Reverted package_esp32_index.template.json

Added new line to package_esp32_index.template.json
---
 boards.txt                                    | 308 ++++++++++++++++++
 .../VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h   |  57 ++++
 .../VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h   |  57 ++++
 3 files changed, 422 insertions(+)
 create mode 100644 variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
 create mode 100644 variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h

diff --git a/boards.txt b/boards.txt
index 0e253e434c3..a165b97756a 100644
--- a/boards.txt
+++ b/boards.txt
@@ -20820,3 +20820,311 @@ esp32c3m1IKit.menu.EraseFlash.all=Enabled
 esp32c3m1IKit.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
+
+VALTRACK_V4_VTS_ESP32_C3.name=VALTRACK_V4_VTS_ESP32_C3
+VALTRACK_V4_VTS_ESP32_C3.vid.0=0x303a
+VALTRACK_V4_VTS_ESP32_C3.pid.0=0x1001
+
+VALTRACK_V4_VTS_ESP32_C3.bootloader.tool=esptool_py
+VALTRACK_V4_VTS_ESP32_C3.bootloader.tool.default=esptool_py
+
+VALTRACK_V4_VTS_ESP32_C3.upload.tool=esptool_py
+VALTRACK_V4_VTS_ESP32_C3.upload.tool.default=esptool_py
+VALTRACK_V4_VTS_ESP32_C3.upload.tool.network=esp_ota
+
+VALTRACK_V4_VTS_ESP32_C3.upload.maximum_size=1310720
+VALTRACK_V4_VTS_ESP32_C3.upload.maximum_data_size=327680
+VALTRACK_V4_VTS_ESP32_C3.upload.flags=
+VALTRACK_V4_VTS_ESP32_C3.upload.extra_flags=
+VALTRACK_V4_VTS_ESP32_C3.upload.use_1200bps_touch=false
+VALTRACK_V4_VTS_ESP32_C3.upload.wait_for_upload_port=false
+
+VALTRACK_V4_VTS_ESP32_C3.serial.disableDTR=false
+VALTRACK_V4_VTS_ESP32_C3.serial.disableRTS=false
+
+VALTRACK_V4_VTS_ESP32_C3.build.tarch=riscv32
+VALTRACK_V4_VTS_ESP32_C3.build.target=esp
+VALTRACK_V4_VTS_ESP32_C3.build.mcu=esp32c3
+VALTRACK_V4_VTS_ESP32_C3.build.core=esp32
+VALTRACK_V4_VTS_ESP32_C3.build.variant=VALTRACK_V4_VTS_ESP32_C3
+VALTRACK_V4_VTS_ESP32_C3.build.board=VALTRACK_V4_VTS_ESP32_C3
+VALTRACK_V4_VTS_ESP32_C3.build.bootloader_addr=0x0
+
+VALTRACK_V4_VTS_ESP32_C3.build.cdc_on_boot=1
+VALTRACK_V4_VTS_ESP32_C3.build.f_cpu=160000000L
+VALTRACK_V4_VTS_ESP32_C3.build.flash_size=4MB
+VALTRACK_V4_VTS_ESP32_C3.build.flash_freq=80m
+VALTRACK_V4_VTS_ESP32_C3.build.flash_mode=qio
+VALTRACK_V4_VTS_ESP32_C3.build.boot=qio
+VALTRACK_V4_VTS_ESP32_C3.build.partitions=default
+VALTRACK_V4_VTS_ESP32_C3.build.defines=
+
+VALTRACK_V4_VTS_ESP32_C3.menu.CDCOnBoot.default=Enabled
+VALTRACK_V4_VTS_ESP32_C3.menu.CDCOnBoot.default.build.cdc_on_boot=1
+VALTRACK_V4_VTS_ESP32_C3.menu.CDCOnBoot.cdc=Disabled
+VALTRACK_V4_VTS_ESP32_C3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.default.build.partitions=default
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.minimal.build.partitions=minimal
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.fatflash.build.partitions=ffat
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.rainmaker=RainMaker
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+VALTRACK_V4_VTS_ESP32_C3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.160=160MHz (WiFi)
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.160.build.f_cpu=160000000L
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.80=80MHz (WiFi)
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.80.build.f_cpu=80000000L
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.40=40MHz
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.40.build.f_cpu=40000000L
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.20=20MHz
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.20.build.f_cpu=20000000L
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.10=10MHz
+VALTRACK_V4_VTS_ESP32_C3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.qio=QIO
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.qio.build.flash_mode=dio
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.qio.build.boot=qio
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.dio=DIO
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.dio.build.flash_mode=dio
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.dio.build.boot=dio
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.qout=QOUT
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.qout.build.flash_mode=dout
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.qout.build.boot=qout
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.dout=DOUT
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashMode.dout.build.flash_mode=dout
+
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashFreq.80=80MHz
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashFreq.80.build.flash_freq=80m
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashFreq.40=40MHz
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashFreq.40.build.flash_freq=40m
+
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.4M=4MB (32Mb)
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.4M.build.flash_size=4MB
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.8M=8MB (64Mb)
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.8M.build.flash_size=8MB
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.8M.build.partitions=default_8MB
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.2M=2MB (16Mb)
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.2M.build.flash_size=2MB
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.2M.build.partitions=minimal
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.16M=16MB (128Mb)
+VALTRACK_V4_VTS_ESP32_C3.menu.FlashSize.16M.build.flash_size=16MB
+
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.921600=921600
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.921600.upload.speed=921600
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.115200=115200
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.115200.upload.speed=115200
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.256000.windows=256000
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.256000.upload.speed=256000
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.230400.windows.upload.speed=256000
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.230400=230400
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.230400.upload.speed=230400
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.460800.linux=460800
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.460800.macosx=460800
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.460800.upload.speed=460800
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.512000.windows=512000
+VALTRACK_V4_VTS_ESP32_C3.menu.UploadSpeed.512000.upload.speed=512000
+
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.none=None
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.none.build.code_debug=0
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.error=Error
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.error.build.code_debug=1
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.warn=Warn
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.warn.build.code_debug=2
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.info=Info
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.info.build.code_debug=3
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.debug=Debug
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.debug.build.code_debug=4
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.verbose=Verbose
+VALTRACK_V4_VTS_ESP32_C3.menu.DebugLevel.verbose.build.code_debug=5
+
+VALTRACK_V4_VTS_ESP32_C3.menu.EraseFlash.none=Disabled
+VALTRACK_V4_VTS_ESP32_C3.menu.EraseFlash.none.upload.erase_cmd=
+VALTRACK_V4_VTS_ESP32_C3.menu.EraseFlash.all=Enabled
+VALTRACK_V4_VTS_ESP32_C3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
+VALTRACK_V4_MFW_ESP32_C3.name=VALTRACK_V4_MFW_ESP32_C3
+VALTRACK_V4_MFW_ESP32_C3.vid.0=0x303a
+VALTRACK_V4_MFW_ESP32_C3.pid.0=0x1001
+
+VALTRACK_V4_MFW_ESP32_C3.bootloader.tool=esptool_py
+VALTRACK_V4_MFW_ESP32_C3.bootloader.tool.default=esptool_py
+
+VALTRACK_V4_MFW_ESP32_C3.upload.tool=esptool_py
+VALTRACK_V4_MFW_ESP32_C3.upload.tool.default=esptool_py
+VALTRACK_V4_MFW_ESP32_C3.upload.tool.network=esp_ota
+
+VALTRACK_V4_MFW_ESP32_C3.upload.maximum_size=1310720
+VALTRACK_V4_MFW_ESP32_C3.upload.maximum_data_size=327680
+VALTRACK_V4_MFW_ESP32_C3.upload.flags=
+VALTRACK_V4_MFW_ESP32_C3.upload.extra_flags=
+VALTRACK_V4_MFW_ESP32_C3.upload.use_1200bps_touch=false
+VALTRACK_V4_MFW_ESP32_C3.upload.wait_for_upload_port=false
+
+VALTRACK_V4_MFW_ESP32_C3.serial.disableDTR=false
+VALTRACK_V4_MFW_ESP32_C3.serial.disableRTS=false
+
+VALTRACK_V4_MFW_ESP32_C3.build.tarch=riscv32
+VALTRACK_V4_MFW_ESP32_C3.build.target=esp
+VALTRACK_V4_MFW_ESP32_C3.build.mcu=esp32c3
+VALTRACK_V4_MFW_ESP32_C3.build.core=esp32
+VALTRACK_V4_MFW_ESP32_C3.build.variant=VALTRACK_V4_MFW_ESP32_C3
+VALTRACK_V4_MFW_ESP32_C3.build.board=VALTRACK_V4_MFW_ESP32_C3
+VALTRACK_V4_MFW_ESP32_C3.build.bootloader_addr=0x0
+
+VALTRACK_V4_MFW_ESP32_C3.build.cdc_on_boot=1
+VALTRACK_V4_MFW_ESP32_C3.build.f_cpu=160000000L
+VALTRACK_V4_MFW_ESP32_C3.build.flash_size=4MB
+VALTRACK_V4_MFW_ESP32_C3.build.flash_freq=80m
+VALTRACK_V4_MFW_ESP32_C3.build.flash_mode=qio
+VALTRACK_V4_MFW_ESP32_C3.build.boot=qio
+VALTRACK_V4_MFW_ESP32_C3.build.partitions=default
+VALTRACK_V4_MFW_ESP32_C3.build.defines=
+
+VALTRACK_V4_MFW_ESP32_C3.menu.CDCOnBoot.default=Enabled
+VALTRACK_V4_MFW_ESP32_C3.menu.CDCOnBoot.default.build.cdc_on_boot=1
+VALTRACK_V4_MFW_ESP32_C3.menu.CDCOnBoot.cdc=Disabled
+VALTRACK_V4_MFW_ESP32_C3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
+
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.default.build.partitions=default
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.minimal.build.partitions=minimal
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.huge_app.build.partitions=huge_app
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.fatflash.build.partitions=ffat
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.rainmaker=RainMaker
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+VALTRACK_V4_MFW_ESP32_C3.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.160=160MHz (WiFi)
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.160.build.f_cpu=160000000L
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.80=80MHz (WiFi)
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.80.build.f_cpu=80000000L
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.40=40MHz
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.40.build.f_cpu=40000000L
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.20=20MHz
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.20.build.f_cpu=20000000L
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.10=10MHz
+VALTRACK_V4_MFW_ESP32_C3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.qio=QIO
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.qio.build.flash_mode=dio
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.qio.build.boot=qio
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.dio=DIO
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.dio.build.flash_mode=dio
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.dio.build.boot=dio
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.qout=QOUT
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.qout.build.flash_mode=dout
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.qout.build.boot=qout
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.dout=DOUT
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashMode.dout.build.flash_mode=dout
+
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashFreq.80=80MHz
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashFreq.80.build.flash_freq=80m
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashFreq.40=40MHz
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashFreq.40.build.flash_freq=40m
+
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.4M=4MB (32Mb)
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.4M.build.flash_size=4MB
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.8M=8MB (64Mb)
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.8M.build.flash_size=8MB
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.8M.build.partitions=default_8MB
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.2M=2MB (16Mb)
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.2M.build.flash_size=2MB
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.2M.build.partitions=minimal
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.16M=16MB (128Mb)
+VALTRACK_V4_MFW_ESP32_C3.menu.FlashSize.16M.build.flash_size=16MB
+
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.921600=921600
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.921600.upload.speed=921600
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.115200=115200
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.115200.upload.speed=115200
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.256000.windows=256000
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.256000.upload.speed=256000
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.230400.windows.upload.speed=256000
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.230400=230400
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.230400.upload.speed=230400
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.460800.linux=460800
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.460800.macosx=460800
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.460800.upload.speed=460800
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.512000.windows=512000
+VALTRACK_V4_MFW_ESP32_C3.menu.UploadSpeed.512000.upload.speed=512000
+
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.none=None
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.none.build.code_debug=0
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.error=Error
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.error.build.code_debug=1
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.warn=Warn
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.warn.build.code_debug=2
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.info=Info
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.info.build.code_debug=3
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.debug=Debug
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.debug.build.code_debug=4
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.verbose=Verbose
+VALTRACK_V4_MFW_ESP32_C3.menu.DebugLevel.verbose.build.code_debug=5
+
+VALTRACK_V4_MFW_ESP32_C3.menu.EraseFlash.none=Disabled
+VALTRACK_V4_MFW_ESP32_C3.menu.EraseFlash.none.upload.erase_cmd=
+VALTRACK_V4_MFW_ESP32_C3.menu.EraseFlash.all=Enabled
+VALTRACK_V4_MFW_ESP32_C3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
\ No newline at end of file
diff --git a/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
new file mode 100644
index 00000000000..4e3c771578b
--- /dev/null
+++ b/variants/VALTRACK_V4_MFW_ESP32_C3/pins_arduino.h
@@ -0,0 +1,57 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 22
+#define NUM_DIGITAL_PINS        22
+#define NUM_ANALOG_INPUTS       6
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
+
+static const uint8_t TX = 21;
+static const uint8_t RX = 20;
+
+static const uint8_t TX1 = 0;
+static const uint8_t RX1 = 1;
+
+static const uint8_t SDA = 5;
+static const uint8_t SCL = 6;
+
+static const uint8_t SS    = 20;
+static const uint8_t MOSI  = 10;
+static const uint8_t MISO  = 9;
+static const uint8_t SCK   = 8;
+
+static const uint8_t A0 = 2;
+static const uint8_t A1 = 3;
+static const uint8_t A2 = 4;
+static const uint8_t A3 = 5;
+
+static const uint8_t D0 = 2;
+static const uint8_t D1 = 3;
+static const uint8_t D2 = 4;
+static const uint8_t D3 = 5;
+static const uint8_t D4 = 6;
+static const uint8_t D5 = 7;
+static const uint8_t D6 = 21;
+static const uint8_t D7 = 20;
+static const uint8_t D8 = 8;
+static const uint8_t D9 = 9;
+static const uint8_t D10 = 10;
+
+static const uint8_t GPIO_IIC_DATA   = 5;
+static const uint8_t GPIO_IIC_CLOCK  = 6;
+static const uint8_t GPIO_PWRKEY     = 7;
+static const uint8_t GPIO_GSM_ENABLE = 10;
+static const uint8_t GPIO_TPS_ENABLE = 4;
+static const uint8_t GPIO_INT1       = 3;
+static const uint8_t GPIO_ANALOG_IN  = 2;
+static const uint8_t GPIO_SOS        = 9;
+static const uint8_t GPIO_CHG_IN     = 4;
+static const uint8_t GPIO_LED_SIGNAL = 8;
+
+
+#endif /* Pins_Arduino_h */
diff --git a/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
new file mode 100644
index 00000000000..4e3c771578b
--- /dev/null
+++ b/variants/VALTRACK_V4_VTS_ESP32_C3/pins_arduino.h
@@ -0,0 +1,57 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define EXTERNAL_NUM_INTERRUPTS 22
+#define NUM_DIGITAL_PINS        22
+#define NUM_ANALOG_INPUTS       6
+
+#define analogInputToDigitalPin(p)  (((p)<NUM_ANALOG_INPUTS)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
+#define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
+
+static const uint8_t TX = 21;
+static const uint8_t RX = 20;
+
+static const uint8_t TX1 = 0;
+static const uint8_t RX1 = 1;
+
+static const uint8_t SDA = 5;
+static const uint8_t SCL = 6;
+
+static const uint8_t SS    = 20;
+static const uint8_t MOSI  = 10;
+static const uint8_t MISO  = 9;
+static const uint8_t SCK   = 8;
+
+static const uint8_t A0 = 2;
+static const uint8_t A1 = 3;
+static const uint8_t A2 = 4;
+static const uint8_t A3 = 5;
+
+static const uint8_t D0 = 2;
+static const uint8_t D1 = 3;
+static const uint8_t D2 = 4;
+static const uint8_t D3 = 5;
+static const uint8_t D4 = 6;
+static const uint8_t D5 = 7;
+static const uint8_t D6 = 21;
+static const uint8_t D7 = 20;
+static const uint8_t D8 = 8;
+static const uint8_t D9 = 9;
+static const uint8_t D10 = 10;
+
+static const uint8_t GPIO_IIC_DATA   = 5;
+static const uint8_t GPIO_IIC_CLOCK  = 6;
+static const uint8_t GPIO_PWRKEY     = 7;
+static const uint8_t GPIO_GSM_ENABLE = 10;
+static const uint8_t GPIO_TPS_ENABLE = 4;
+static const uint8_t GPIO_INT1       = 3;
+static const uint8_t GPIO_ANALOG_IN  = 2;
+static const uint8_t GPIO_SOS        = 9;
+static const uint8_t GPIO_CHG_IN     = 4;
+static const uint8_t GPIO_LED_SIGNAL = 8;
+
+
+#endif /* Pins_Arduino_h */

From 26c8b3060f7dc78de9c8297e05c4e0e7e2b28656 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:45:30 +0100
Subject: [PATCH 07/11] Update Platformio CI (#7725)

---
 .github/scripts/install-platformio-esp32.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/install-platformio-esp32.sh b/.github/scripts/install-platformio-esp32.sh
index 96cf7330f6b..b3f7b081ba1 100755
--- a/.github/scripts/install-platformio-esp32.sh
+++ b/.github/scripts/install-platformio-esp32.sh
@@ -3,8 +3,8 @@
 export PLATFORMIO_ESP32_PATH="$HOME/.platformio/packages/framework-arduinoespressif32"
 PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"
 
-TOOLCHAIN_VERSION="8.4.0+2021r2-patch3"
-ESPTOOLPY_VERSION="~1.40201.0"
+TOOLCHAIN_VERSION="8.4.0+2021r2-patch5"
+ESPTOOLPY_VERSION="~1.40400.0"
 ESPRESSIF_ORGANIZATION_NAME="espressif"
 
 echo "Installing Python Wheel ..."

From ce497194a7d03fa183f29ead6dd23a84bbe96ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Piln=C3=BD?=
 <34927466+PilnyTomas@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:54:11 +0100
Subject: [PATCH 08/11] WiFiClient example fix (#7711)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Modified WiFiClient example to use thingspeak instead of non-functionig sparkfun

* Moved instructions to README

* Fixed spelling

* Added link to S3 datasheet

---------

Co-authored-by: Jan Procházka <90197375+P-R-O-C-H-Y@users.noreply.github.com>
---
 libraries/WiFi/examples/WiFiClient/README.md  | 165 ++++++++++++++++++
 .../WiFi/examples/WiFiClient/WiFiClient.ino   | 132 +++++++-------
 2 files changed, 238 insertions(+), 59 deletions(-)
 create mode 100644 libraries/WiFi/examples/WiFiClient/README.md

diff --git a/libraries/WiFi/examples/WiFiClient/README.md b/libraries/WiFi/examples/WiFiClient/README.md
new file mode 100644
index 00000000000..079ed9f29a8
--- /dev/null
+++ b/libraries/WiFi/examples/WiFiClient/README.md
@@ -0,0 +1,165 @@
+# WiFiClient
+
+This example demonstrates reading and writing data from and to a web service which can be used for logging data, creating insights and taking actions based on those data.
+
+# Supported Targets
+
+Currently, this example supports all SoC with WiFi.
+
+
+| Supported Targets | ESP32 | ESP32-S2 | ESP32-C3 | ESP32-S3 |
+
+
+## How to Use Example
+
+Flash this example and observe the serial output. You can also take a look at the values at [https://thingspeak.com/channels/2005329](https://thingspeak.com/channels/2005329)
+
+Please note that this public channel can be accessed by anyone and it is possible that more people will write their values.
+
+### Configure the Project
+
+Change `SSID` and `password` to connect to your WiFi.
+Default values will allow you to use this example without any changes. If you want to use your own channel and you don't have one already follow these steps:
+
+* Create an account on [thingspeak.com](https://www.thingspeak.com).
+* After logging in, click on the "New Channel" button to create a new channel for your data. This is where your data will be stored and displayed.
+* Fill in the Name, Description, and other fields for your channel as desired, then click the "Save Channel" button.
+* Take note of the "Write API Key" located in the "API keys" tab, this is the key you will use to send data to your channel.
+* Replace the channelID from tab "Channel Settings" and privateKey with "Read API Keys" from "API Keys" tab.
+* Replace the host variable with the thingspeak server hostname "api.thingspeak.com"
+* Upload the sketch to your ESP32 board and make sure that the board is connected to the internet. The ESP32 should now send data to your Thingspeak channel at the intervals specified by the loop function.
+* Go to the channel view page on thingspeak and check the "Field1" for the new incoming data.
+* You can use the data visualization and analysis tools provided by Thingspeak to display and process your data in various ways.
+* Please note, that Thingspeak accepts only integer values.
+
+#### Config example:
+
+You can find the data to be changed at the top of the file:
+
+```cpp
+const char* ssid     = "your-ssid"; // Change this to your WiFi SSID
+const char* password = "your-password"; // Change this to your WiFi password
+
+const char* host = "api.thingspeak.com"; // This should not be changed
+const int httpPort = 80; // This should not be changed
+const String channelID   = "2005329"; // Change this to your channel ID
+const String writeApiKey = "V6YOTILH9I7D51F9"; // Change this to your Write API key
+const String readApiKey = "34W6LGLIFXD56MPM"; // Change this to your Read API key
+
+// The default example accepts one data filed named "field1"
+// For your own server you can ofcourse create more of them.
+int field1 = 0;
+
+int numberOfResults = 3; // Number of results to be read
+int fieldNumber = 1; // Field number which will be read out
+```
+
+#### Using Arduino IDE
+
+To get more information about the Espressif boards see [Espressif Development Kits](https://www.espressif.com/en/products/devkits).
+
+* Before Compile/Verify, select the correct board: `Tools -> Board`.
+* Select the COM port: `Tools -> Port: xxx` where the `xxx` is the detected COM port.
+
+#### Using Platform IO
+
+* Select the COM port: `Devices` or set the `upload_port` option on the `platformio.ini` file.
+
+## Example Log Output
+
+The initial output which is common for all examples can be ignored:
+```
+SP-ROM:esp32c3-api1-20210207
+Build:Feb  7 2021
+rst:0x1 (POWERON),boot:0xc (SPI_FAST_FLASH_BOOT)
+SPIWP:0xee
+mode:DIO, clock div:1
+load:0x3fcd5810,len:0x438
+load:0x403cc710,len:0x918
+load:0x403ce710,len:0x24e4
+entry 0x403cc710
+```
+Follows the setup output where connection to your WiFi happens:
+```
+******************************************************
+Connecting to your-ssid
+.
+WiFi connected
+IP address:
+192.168.1.2
+```
+Then you can see the write log:
+```
+HTTP/1.1 200 OK
+Date: Fri, 13 Jan 2023 13:12:31 GMT
+Content-Type: text/plain; charset=utf-8
+Content-Length: 1
+Connection: close
+Status: 200 OK
+Cache-Control: max-age=0, private, must-revalidate
+Access-Control-Allow-Origin: *
+Access-Control-Max-Age: 1800
+X-Request-Id: 188e3464-f155-44b0-96f6-0f3614170bb0
+Access-Control-Allow-Headers: origin, content-type, X-Requested-With
+Access-Control-Allow-Methods: GET, POST, PUT, OPTIONS, DELETE, PATCH
+ETag: W/"5feceb66ffc86f38d952786c6d696c79"
+X-Frame-Options: SAMEORIGIN
+
+0
+Closing connection
+```
+Last portion is the read log:
+```
+HTTP/1.1 200 OK
+Date: Fri, 13 Jan 2023 13:12:32 GMT
+Content-Type: application/json; charset=utf-8
+Transfer-Encoding: chunked
+Connection: close
+Status: 200 OK
+Cache-Control: max-age=7, private
+Access-Control-Allow-Origin: *
+Access-Control-Max-Age: 1800
+X-Request-Id: 91b97016-7625-44f6-9797-1b2973aa57b7
+Access-Control-Allow-Headers: origin, content-type, X-Requested-With
+Access-Control-Allow-Methods: GET, POST, PUT, OPTIONS, DELETE, PATCH
+ETag: W/"8e9c308fe2c50309f991586be1aff28d"
+X-Frame-Options: SAMEORIGIN
+
+1e3
+{"channel":{"id":2005329,"name":"WiFiCLient example","description":"Default setup for Arduino ESP32 WiFiClient example","latitude":"0.0","longitude":"0.0","field1":"data0","created_at":"2023-01-11T15:56:08Z","updated_at":"2023-01-13T08:13:58Z","last_entry_id":2871},"feeds":[{"created_at":"2023-01-13T13:11:30Z","entry_id":2869,"field1":"359"},{"created_at":"2023-01-13T13:11:57Z","entry_id":2870,"field1":"361"},{"created_at":"2023-01-13T13:12:23Z","entry_id":2871,"field1":"363"}]}
+0
+
+
+Closing connection
+```
+After this the write+read log repeat every 10 seconds.
+
+
+## Troubleshooting
+
+***Important: Make sure you are using a good quality USB cable and that you have a reliable power source***
+
+* **WiFi not connected:** Check the SSID and password and also that the signal has sufficient strength.
+* **400 Bad Request:** Check the writeApiKey.
+* **404 Not Found:** Check the channel ID.
+* **No data on chart / reading NULL:** Data must be sent as an integer, without commas.
+
+If the error persists, you can ask for help at the official [ESP32 forum](https://esp32.com) or see [Contribute](#contribute).
+
+## Contribute
+
+To know how to contribute to this project, see [How to contribute.](https://github.com/espressif/arduino-esp32/blob/master/CONTRIBUTING.rst)
+
+If you have any **feedback** or **issue** to report on this example/library, please open an issue or fix it by creating a new PR. Contributions are more than welcome!
+
+Before creating a new issue, be sure to try the Troubleshooting and to check if the same issue was already created by someone else.
+
+## Resources
+
+* Official ESP32 Forum: [Link](https://esp32.com)
+* Arduino-ESP32 Official Repository: [espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
+* ESP32 Datasheet: [Link to datasheet](https://www.espressif.com/sites/default/files/documentation/esp32_datasheet_en.pdf)
+* ESP32-S2 Datasheet: [Link to datasheet](https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf)
+* ESP32-C3 Datasheet: [Link to datasheet](https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf)
+* ESP32-S3 Datasheet: [Link to datasheet](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf)
+* Official ESP-IDF documentation: [ESP-IDF](https://idf.espressif.com)
diff --git a/libraries/WiFi/examples/WiFiClient/WiFiClient.ino b/libraries/WiFi/examples/WiFiClient/WiFiClient.ino
index 7dd9c8d0d35..ebd207984a2 100644
--- a/libraries/WiFi/examples/WiFiClient/WiFiClient.ino
+++ b/libraries/WiFi/examples/WiFiClient/WiFiClient.ino
@@ -1,29 +1,46 @@
 /*
- *  This sketch sends data via HTTP GET requests to data.sparkfun.com service.
- *
- *  You need to get streamId and privateKey at data.sparkfun.com and paste them
- *  below. Or just customize this script to talk to other HTTP servers.
- *
+    Go to thingspeak.com and create an account if you don't have one already.
+    After logging in, click on the "New Channel" button to create a new channel for your data. This is where your data will be stored and displayed.
+    Fill in the Name, Description, and other fields for your channel as desired, then click the "Save Channel" button.
+    Take note of the "Write API Key" located in the "API keys" tab, this is the key you will use to send data to your channel.
+    Replace the channelID from tab "Channel Settings" and privateKey with "Read API Keys" from "API Keys" tab.
+    Replace the host variable with the thingspeak server hostname "api.thingspeak.com"
+    Upload the sketch to your ESP32 board and make sure that the board is connected to the internet. The ESP32 should now send data to your Thingspeak channel at the intervals specified by the loop function.
+    Go to the channel view page on thingspeak and check the "Field1" for the new incoming data.
+    You can use the data visualization and analysis tools provided by Thingspeak to display and process your data in various ways.
+    Please note, that Thingspeak accepts only integer values.
+
+    You can later check the values at https://thingspeak.com/channels/2005329
+    Please note that this public channel can be accessed by anyone and it is possible that more people will write their values.
  */
 
 #include <WiFi.h>
 
-const char* ssid     = "your-ssid";
-const char* password = "your-password";
+const char* ssid     = "your-ssid"; // Change this to your WiFi SSID
+const char* password = "your-password"; // Change this to your WiFi password
 
-const char* host = "data.sparkfun.com";
-const char* streamId   = "....................";
-const char* privateKey = "....................";
+const char* host = "api.thingspeak.com"; // This should not be changed
+const int httpPort = 80; // This should not be changed
+const String channelID   = "2005329"; // Change this to your channel ID
+const String writeApiKey = "V6YOTILH9I7D51F9"; // Change this to your Write API key
+const String readApiKey = "34W6LGLIFXD56MPM"; // Change this to your Read API key
+
+// The default example accepts one data filed named "field1"
+// For your own server you can ofcourse create more of them.
+int field1 = 0;
+
+int numberOfResults = 3; // Number of results to be read
+int fieldNumber = 1; // Field number which will be read out
 
 void setup()
 {
     Serial.begin(115200);
-    delay(10);
+    while(!Serial){delay(100);}
 
     // We start by connecting to a WiFi network
 
     Serial.println();
-    Serial.println();
+    Serial.println("******************************************************");
     Serial.print("Connecting to ");
     Serial.println(ssid);
 
@@ -40,55 +57,52 @@ void setup()
     Serial.println(WiFi.localIP());
 }
 
-int value = 0;
-
-void loop()
-{
-    delay(5000);
-    ++value;
-
-    Serial.print("connecting to ");
-    Serial.println(host);
-
-    // Use WiFiClient class to create TCP connections
-    WiFiClient client;
-    const int httpPort = 80;
-    if (!client.connect(host, httpPort)) {
-        Serial.println("connection failed");
-        return;
+void readResponse(WiFiClient *client){
+  unsigned long timeout = millis();
+  while(client->available() == 0){
+    if(millis() - timeout > 5000){
+      Serial.println(">>> Client Timeout !");
+      client->stop();
+      return;
     }
+  }
 
-    // We now create a URI for the request
-    String url = "/input/";
-    url += streamId;
-    url += "?private_key=";
-    url += privateKey;
-    url += "&value=";
-    url += value;
-
-    Serial.print("Requesting URL: ");
-    Serial.println(url);
-
-    // This will send the request to the server
-    client.print(String("GET ") + url + " HTTP/1.1\r\n" +
-                 "Host: " + host + "\r\n" +
-                 "Connection: close\r\n\r\n");
-    unsigned long timeout = millis();
-    while (client.available() == 0) {
-        if (millis() - timeout > 5000) {
-            Serial.println(">>> Client Timeout !");
-            client.stop();
-            return;
-        }
-    }
-
-    // Read all the lines of the reply from server and print them to Serial
-    while(client.available()) {
-        String line = client.readStringUntil('\r');
-        Serial.print(line);
-    }
+  // Read all the lines of the reply from server and print them to Serial
+  while(client->available()) {
+    String line = client->readStringUntil('\r');
+    Serial.print(line);
+  }
 
-    Serial.println();
-    Serial.println("closing connection");
+  Serial.printf("\nClosing connection\n\n");
 }
 
+void loop(){
+  WiFiClient client;
+  String footer = String(" HTTP/1.1\r\n") + "Host: " + String(host) + "\r\n" + "Connection: close\r\n\r\n";
+
+  // WRITE --------------------------------------------------------------------------------------------
+  if (!client.connect(host, httpPort)) {
+    return;
+  }
+
+  client.print("GET /update?api_key=" + writeApiKey + "&field1=" + field1 + footer);
+  readResponse(&client);
+
+  // READ --------------------------------------------------------------------------------------------
+
+  String readRequest = "GET /channels/" + channelID + "/fields/" + fieldNumber + ".json?results=" + numberOfResults + " HTTP/1.1\r\n" +
+                       "Host: " + host + "\r\n" +
+                       "Connection: close\r\n\r\n";
+
+  if (!client.connect(host, httpPort)) {
+    return;
+  }
+
+  client.print(readRequest);
+  readResponse(&client);
+
+  // -------------------------------------------------------------------------------------------------
+
+  ++field1;
+  delay(10000);
+}
\ No newline at end of file

From ff4bbc22a5bd15467fcd5657c1ffa8b6740c26d8 Mon Sep 17 00:00:00 2001
From: Daniel Berlin <dberlin@dberlin.org>
Date: Mon, 6 Feb 2023 07:54:44 -0500
Subject: [PATCH 09/11] Mirror update from Heltec repository (#7709)

Heltec updated the I2C pins in https://github.com/Heltec-Aaron-Lee/WiFi_Kit_series/commit/b10f4bf85d13fd01be80dcdb0eb59e6a8c8ba19a
---
 variants/heltec_wifi_lora_32_V3/pins_arduino.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/variants/heltec_wifi_lora_32_V3/pins_arduino.h b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
index 04dcadc4030..24fd2a41f28 100644
--- a/variants/heltec_wifi_lora_32_V3/pins_arduino.h
+++ b/variants/heltec_wifi_lora_32_V3/pins_arduino.h
@@ -29,8 +29,8 @@ static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT+48;
 static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
-static const uint8_t SDA = 8;
-static const uint8_t SCL = 9;
+static const uint8_t SDA = 41;
+static const uint8_t SCL = 42;
 
 static const uint8_t SS    = 10;
 static const uint8_t MOSI  = 11;

From 03e9e07f1a1954c5359e94c84ef2d2189275408e Mon Sep 17 00:00:00 2001
From: Rodrigo Garcia <rodrigo.garcia@espressif.com>
Date: Mon, 6 Feb 2023 09:55:41 -0300
Subject: [PATCH 10/11] Fixes BLE data printing (#7699)

* Fixes BLE data printing

BLE data has no '\0' terminator, therefore it can't be printed as a regular C string.
This fix just prints the BLE data based on its length.

* Simplify printing to a single call
---
 libraries/BLE/examples/BLE_client/BLE_client.ino | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/BLE/examples/BLE_client/BLE_client.ino b/libraries/BLE/examples/BLE_client/BLE_client.ino
index 5d39c109709..74ae8b7532d 100644
--- a/libraries/BLE/examples/BLE_client/BLE_client.ino
+++ b/libraries/BLE/examples/BLE_client/BLE_client.ino
@@ -29,7 +29,8 @@ static void notifyCallback(
     Serial.print(" of data length ");
     Serial.println(length);
     Serial.print("data: ");
-    Serial.println((char*)pData);
+    Serial.write(pData, length);
+    Serial.println();
 }
 
 class MyClientCallback : public BLEClientCallbacks {

From 072de744bff63e9936248a1b40ece40bf8a263c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Proch=C3=A1zka?=
 <90197375+P-R-O-C-H-Y@users.noreply.github.com>
Date: Mon, 6 Feb 2023 13:56:32 +0100
Subject: [PATCH 11/11] split menu options + lora_32_V3 fix (#7697)

---
 boards.txt | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/boards.txt b/boards.txt
index a165b97756a..ba4ee1a0316 100644
--- a/boards.txt
+++ b/boards.txt
@@ -1,3 +1,4 @@
+# Official Espressif options
 menu.UploadSpeed=Upload Speed
 menu.USBMode=USB Mode
 menu.CDCOnBoot=USB CDC On Boot
@@ -11,15 +12,19 @@ menu.FlashSize=Flash Size
 menu.PartitionScheme=Partition Scheme
 menu.DebugLevel=Core Debug Level
 menu.PSRAM=PSRAM
-menu.Revision=Board Revision
-menu.LORAWAN_REGION=LoRaWan Region
-menu.LoRaWanDebugLevel=LoRaWan Debug Level
 menu.LoopCore=Arduino Runs On
 menu.EventsCore=Events Run On
 menu.MemoryType=Memory Type
 menu.EraseFlash=Erase All Flash Before Sketch Upload
 menu.JTAGAdapter=JTAG Adapter
 
+# Custom options
+menu.Revision=Board Revision
+menu.LORAWAN_REGION=LoRaWan Region
+menu.LoRaWanDebugLevel=LoRaWan Debug Level
+menu.LORAWAN_DEVEUI=LoRaWan DevEUI
+menu.LORAWAN_PREAMBLE_LENGTH=LoRaWan Preamble Length
+
 ##############################################################
 ### DO NOT PUT BOARDS ABOVE THE OFFICIAL ESPRESSIF BOARDS! ###
 ##############################################################
@@ -12179,8 +12184,8 @@ heltec_wifi_lora_32_V3.build.bootloader_addr=0x0
 heltec_wifi_lora_32_V3.build.target=esp32s3
 heltec_wifi_lora_32_V3.build.mcu=esp32s3
 heltec_wifi_lora_32_V3.build.core=esp32
-heltec_wifi_lora_32_V3.build.variant=heltec_heltec_wifi_lora_32_V3
-heltec_wifi_lora_32_V3.build.board=heltec_heltec_wifi_32_lora_V3
+heltec_wifi_lora_32_V3.build.variant=heltec_wifi_lora_32_V3
+heltec_wifi_lora_32_V3.build.board=heltec_wifi_32_lora_V3
 
 heltec_wifi_lora_32_V3.build.usb_mode=1
 heltec_wifi_lora_32_V3.build.cdc_on_boot=0
@@ -12290,7 +12295,6 @@ heltec_wifi_lora_32_V3.menu.LORAWAN_PREAMBLE_LENGTH.1=16(For M00 and M00L)
 heltec_wifi_lora_32_V3.menu.LORAWAN_PREAMBLE_LENGTH.1.build.LORAWAN_PREAMBLE_LENGTH=16
 
 heltec_wifi_lora_32_V3.build.defines=-D{build.band} -DLoRaWAN_DEBUG_LEVEL={build.LoRaWanDebugLevel} -DACTIVE_REGION=LORAMAC_{build.band} -DLORAWAN_PREAMBLE_LENGTH={build.LORAWAN_PREAMBLE_LENGTH} -DLORAWAN_DEVEUI_AUTO={build.LORAWAN_DEVEUI_AUTO} -D{build.board}
-heltec_wifi_lora_32_V3.build.extra_libs=-lheltec
 
 heltec_wifi_lora_32_V3.menu.EraseFlash.none=Disabled
 heltec_wifi_lora_32_V3.menu.EraseFlash.none.upload.erase_cmd=