From b0f14056fc4b7219c27ba29d610c3ca459fd82e7 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Mon, 23 Jan 2023 12:09:24 +0200
Subject: [PATCH 01/42] Rework the lib-builder for ESP-IDF v5.1

---
 .gitignore                                   |  1 +
 build.sh                                     |  6 +-
 components/arduino_tinyusb/CMakeLists.txt    | 70 +++++++++++---------
 components/arduino_tinyusb/src/dcd_esp32sx.c | 29 +++++++-
 configs/defconfig.common                     |  1 +
 configs/defconfig.esp32                      |  6 +-
 configs/defconfig.esp32c3                    |  2 +-
 configs/defconfig.esp32s2                    |  4 +-
 configs/defconfig.esp32s3                    |  6 +-
 main/idf_component.yml                       | 47 +++++++++++++
 tools/config.sh                              |  5 +-
 tools/copy-libs.sh                           | 14 ++--
 tools/update-components.sh                   | 32 ++++-----
 13 files changed, 151 insertions(+), 72 deletions(-)
 create mode 100644 main/idf_component.yml

diff --git a/.gitignore b/.gitignore
index 4d9511e9d..3128aa229 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ sdkconfig
 sdkconfig.old
 version.txt
 dependencies.lock
+managed_components/
diff --git a/build.sh b/build.sh
index 2ef451734..5fc41769d 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ COPY_OUT=0
 DEPLOY_OUT=0
 
 function print_help() {
-    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
+    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf_libs|copy_bootloader|mem_variant>] [config ...]"
     echo "       -s     Skip installing/updating of ESP-IDF and all components"
     echo "       -A     Set which branch of arduino-esp32 to be used for compilation"
     echo "       -I     Set which branch of ESP-IDF to be used for compilation"
@@ -58,6 +58,7 @@ while getopts ":A:I:i:c:t:b:sd" opt; do
             b=$OPTARG
             if [ "$b" != "build" ] && 
                [ "$b" != "menuconfig" ] && 
+               [ "$b" != "reconfigure" ] && 
                [ "$b" != "idf_libs" ] && 
                [ "$b" != "copy_bootloader" ] && 
                [ "$b" != "mem_variant" ]; then
@@ -121,6 +122,9 @@ if [ "$BUILD_TYPE" != "all" ]; then
 fi
 
 rm -rf build sdkconfig out
+echo "* Reconfigure Project"
+idf.py reconfigure
+rm -rf build sdkconfig
 
 # Add components version info
 mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
diff --git a/components/arduino_tinyusb/CMakeLists.txt b/components/arduino_tinyusb/CMakeLists.txt
index 041eeec0f..0872021eb 100755
--- a/components/arduino_tinyusb/CMakeLists.txt
+++ b/components/arduino_tinyusb/CMakeLists.txt
@@ -1,37 +1,22 @@
-idf_component_register(REQUIRES esp_rom freertos soc PRIV_REQUIRES arduino main)
-
 if(CONFIG_TINYUSB_ENABLED)
 
   ### variables ###
   #################
-  # if(IDF_TARGET STREQUAL "esp32s2")
+
+  if(IDF_TARGET STREQUAL "esp32s2")
     set(compile_options
         "-DCFG_TUSB_MCU=OPT_MCU_ESP32S2"
         "-DCFG_TUSB_DEBUG=${CONFIG_TINYUSB_DEBUG_LEVEL}"
         "-Wno-type-limits" # needed for the vanila tinyusb with turned off classes
     )
-  # elseif(IDF_TARGET STREQUAL "esp32s3")
-  #   set(compile_options
-  #       "-DCFG_TUSB_MCU=OPT_MCU_ESP32S2"
-  #       "-DCFG_TUSB_DEBUG=${CONFIG_TINYUSB_DEBUG_LEVEL}"
-  #       "-Wno-type-limits" # needed for the vanila tinyusb with turned off classes
-  #   )
-  # endif()
-  idf_component_get_property(FREERTOS_ORIG_INCLUDE_PATH freertos
-                             ORIG_INCLUDE_PATH)
-  set(includes_private
-      # tusb:
-      "${COMPONENT_DIR}/tinyusb/hw/bsp/"
-      "${COMPONENT_DIR}/tinyusb/src/"
-      "${COMPONENT_DIR}/tinyusb/src/device"
-      )
+  elseif(IDF_TARGET STREQUAL "esp32s3")
+    set(compile_options
+        "-DCFG_TUSB_MCU=OPT_MCU_ESP32S3"
+        "-DCFG_TUSB_DEBUG=${CONFIG_TINYUSB_DEBUG_LEVEL}"
+        "-Wno-type-limits" # needed for the vanila tinyusb with turned off classes
+    )
+  endif()
 
-  set(includes_public
-      # tusb:
-      "${FREERTOS_ORIG_INCLUDE_PATH}"
-      "${COMPONENT_DIR}/tinyusb/src/"
-      # espressif:
-      "${COMPONENT_DIR}/include")
   set(srcs
       # espressif:
       "${COMPONENT_DIR}/src/dcd_esp32sx.c"
@@ -49,14 +34,37 @@ if(CONFIG_TINYUSB_ENABLED)
       "${COMPONENT_DIR}/tinyusb/src/device/usbd.c"
       "${COMPONENT_DIR}/tinyusb/src/tusb.c")
 
+  set(includes_private
+      # tusb:
+      "${COMPONENT_DIR}/tinyusb/hw/bsp/"
+      "${COMPONENT_DIR}/tinyusb/src/"
+      "${COMPONENT_DIR}/tinyusb/src/device"
+      )
+
+  idf_component_get_property(FREERTOS_ORIG_INCLUDE_PATH freertos
+                             ORIG_INCLUDE_PATH)
+  set(includes_public
+      # tusb:
+      "${FREERTOS_ORIG_INCLUDE_PATH}"
+      "${COMPONENT_DIR}/tinyusb/src/"
+      # espressif:
+      "${COMPONENT_DIR}/include")
+
+  set(requires esp_rom freertos soc)
+  set(priv_requires arduino main)
   ### tinyusb lib ###
   ###################
-  add_library(arduino_tinyusb STATIC ${srcs})
-  target_include_directories(
-    arduino_tinyusb
-    PUBLIC ${includes_public}
-    PRIVATE ${includes_private})
-  target_compile_options(arduino_tinyusb PRIVATE ${compile_options})
-  target_link_libraries(${COMPONENT_TARGET} INTERFACE arduino_tinyusb)
+  idf_component_register(INCLUDE_DIRS ${includes_public} PRIV_INCLUDE_DIRS ${includes_private} SRCS ${srcs} REQUIRES ${requires} PRIV_REQUIRES ${priv_requires})
+  # add_library(${COMPONENT_TARGET} STATIC ${srcs})
+  # target_include_directories(
+  #   ${COMPONENT_TARGET}
+  #   PUBLIC ${includes_public}
+  #   PRIVATE ${includes_private})
+  target_compile_options(${COMPONENT_TARGET} PRIVATE ${compile_options})
+  #target_link_libraries(${COMPONENT_TARGET} INTERFACE ${COMPONENT_TARGET})
+
+else()
+
+  idf_component_register()
 
 endif()
diff --git a/components/arduino_tinyusb/src/dcd_esp32sx.c b/components/arduino_tinyusb/src/dcd_esp32sx.c
index 048b44e61..29fbe99cb 100755
--- a/components/arduino_tinyusb/src/dcd_esp32sx.c
+++ b/components/arduino_tinyusb/src/dcd_esp32sx.c
@@ -28,17 +28,16 @@
 
 #include "tusb_option.h"
 
-#if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) ||  (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && TUSB_OPT_DEVICE_ENABLED)
+#if (((CFG_TUSB_MCU == OPT_MCU_ESP32S2) ||  (CFG_TUSB_MCU == OPT_MCU_ESP32S3)) && CFG_TUD_ENABLED)
 
 // Espressif
-#include "driver/periph_ctrl.h"
 #include "freertos/xtensa_api.h"
 #include "esp_intr_alloc.h"
 #include "esp_log.h"
-#include "driver/gpio.h"
 #include "soc/dport_reg.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/usb_periph.h"
+#include "soc/periph_defs.h" // for interrupt source
 
 #include "device/dcd.h"
 
@@ -60,6 +59,7 @@ typedef struct {
     uint16_t queued_len;
     uint16_t max_size;
     bool short_packet;
+    uint8_t interval;
 } xfer_ctl_t;
 
 static const char *TAG = "TUSB:DCD";
@@ -284,6 +284,14 @@ void dcd_disconnect(uint8_t rhport)
   USB0.dctl |= USB_SFTDISCON_M;
 }
 
+void dcd_sof_enable(uint8_t rhport, bool en)
+{
+  (void) rhport;
+  (void) en;
+
+  // TODO implement later
+}
+
 /*------------------------------------------------------------------*/
 /* DCD Endpoint port
  *------------------------------------------------------------------*/
@@ -303,6 +311,7 @@ bool dcd_edpt_open(uint8_t rhport, tusb_desc_endpoint_t const *desc_edpt)
 
   xfer_ctl_t *xfer = XFER_CTL_BASE(epnum, dir);
   xfer->max_size = tu_edpt_packet_size(desc_edpt);
+  xfer->interval = desc_edpt->bInterval;
 
   if (dir == TUSB_DIR_OUT) {
     out_ep[epnum].doepctl &= ~(USB_D_EPTYPE0_M | USB_D_MPS0_M);
@@ -423,6 +432,13 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to
     USB0.in_ep_reg[epnum].dieptsiz = (num_packets << USB_D_PKTCNT0_S) | total_bytes;
     USB0.in_ep_reg[epnum].diepctl |= USB_D_EPENA1_M | USB_D_CNAK1_M; // Enable | CNAK
 
+    // For ISO endpoint with interval=1 set correct DATA0/DATA1 bit for next frame
+    if ((USB0.in_ep_reg[epnum].diepctl & USB_D_EPTYPE0_M) == (1 << USB_D_EPTYPE1_S) && xfer->interval == 1) {
+      // Take odd/even bit from frame counter.
+      uint32_t const odd_frame_now = (USB0.dsts & (1u << USB_SOFFN_S));
+      USB0.in_ep_reg[epnum].diepctl |= (odd_frame_now ? USB_DI_SETD0PID1 : USB_DI_SETD1PID1);
+    }
+
     // Enable fifo empty interrupt only if there are something to put in the fifo.
     if(total_bytes != 0) {
       USB0.dtknqr4_fifoemptymsk |= (1 << epnum);
@@ -431,6 +447,13 @@ bool dcd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t *buffer, uint16_t to
     // Each complete packet for OUT xfers triggers XFRC.
     USB0.out_ep_reg[epnum].doeptsiz |= USB_PKTCNT0_M | ((xfer->max_size & USB_XFERSIZE0_V) << USB_XFERSIZE0_S);
     USB0.out_ep_reg[epnum].doepctl  |= USB_EPENA0_M | USB_CNAK0_M;
+
+    // For ISO endpoint with interval=1 set correct DATA0/DATA1 bit for next frame
+    if ((USB0.out_ep_reg[epnum].doepctl & USB_D_EPTYPE0_M) == (1 << USB_D_EPTYPE1_S) && xfer->interval == 1) {
+      // Take odd/even bit from frame counter.
+      uint32_t const odd_frame_now = (USB0.dsts & (1u << USB_SOFFN_S));
+      USB0.out_ep_reg[epnum].doepctl |= (odd_frame_now ? USB_DO_SETD0PID1 : USB_DO_SETD1PID1);
+    }
   }
   return true;
 }
diff --git a/configs/defconfig.common b/configs/defconfig.common
index cbcfd8d2c..fb9e2db86 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -37,6 +37,7 @@ CONFIG_FATFS_API_ENCODING_UTF_8=y
 # CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT is not set
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FREERTOS_HZ=1000
+CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY=y
 # CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=1024
 CONFIG_HEAP_POISONING_LIGHT=y
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index bd38b4829..14a4f2c17 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -8,10 +8,10 @@ CONFIG_BT_SPP_ENABLED=y
 CONFIG_BT_HFP_ENABLE=y
 CONFIG_BT_STACK_NO_LOG=y
 CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
-CONFIG_ESP32_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM=y
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
-CONFIG_ESP32_ULP_COPROC_ENABLED=y
-CONFIG_ESP32_XTAL_FREQ_AUTO=y
+CONFIG_ULP_COPROC_ENABLED=y
+CONFIG_XTAL_FREQ_AUTO=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 CONFIG_FREERTOS_FPU_IN_ISR=y
 # CONFIG_USE_WAKENET is not set
diff --git a/configs/defconfig.esp32c3 b/configs/defconfig.esp32c3
index 31c42f7a0..ced594733 100644
--- a/configs/defconfig.esp32c3
+++ b/configs/defconfig.esp32c3
@@ -1,4 +1,4 @@
 CONFIG_BT_BLE_BLUFI_ENABLE=y
-CONFIG_ESP32C3_RTC_CLK_CAL_CYCLES=576
+CONFIG_RTC_CLK_CAL_CYCLES=576
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
diff --git a/configs/defconfig.esp32s2 b/configs/defconfig.esp32s2
index 6dc619a9f..f6d2c82f7 100644
--- a/configs/defconfig.esp32s2
+++ b/configs/defconfig.esp32s2
@@ -1,6 +1,6 @@
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
-CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32S2_SPIRAM_SUPPORT=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_SPIRAM=y
 CONFIG_ESP32S2_KEEP_USB_ALIVE=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
 # CONFIG_USE_WAKENET is not set
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index d56dedcdc..2437efd2e 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -1,7 +1,7 @@
 CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
-CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
-CONFIG_ESP32S3_SPIRAM_SUPPORT=y
-CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=576
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_SPIRAM=y
+CONFIG_RTC_CLK_CAL_CYCLES=576
 CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
diff --git a/main/idf_component.yml b/main/idf_component.yml
new file mode 100644
index 000000000..fb266a7af
--- /dev/null
+++ b/main/idf_component.yml
@@ -0,0 +1,47 @@
+dependencies:
+  # Required IDF version
+  idf: ">=5.1"
+
+  mdns: "^1.0.7"
+  # nghttp: "^1.50.0"
+  # esp_jpeg: "^1.0.4"
+  # esp-dsp: "^1.2.0"
+  # esp-sr: "^1.0.3"
+  # esp32-camera: "^2.0.3"
+  # esp-dl:
+  #   git: https://github.com/espressif/esp-dl.git
+  # arduino:
+  #   path: components/arduino
+
+  # # Defining a dependency from the registry:
+  # # https://components.espressif.com/component/example/cmp
+  # example/cmp: "^3.3.3" # Automatically update minor releases
+  #
+  # # Other ways to define dependencies
+  #
+  # # For components maintained by Espressif only name can be used.
+  # # Same as `espressif/cmp`
+  # component: "~1.0.0" # Automatically update bugfix releases
+  #
+  # # Or in a longer form with extra parameters
+  # component2:
+  #   version: ">=2.0.0"
+  #
+  #   # For transient dependencies `public` flag can be set.
+  #   # `public` flag doesn't have an effect for the `main` component.
+  #   # All dependencies of `main` are public by default.
+  #   public: true
+  #
+  #   # For components hosted on non-default registry:
+  #   service_url: "https://componentregistry.company.com/"
+  #
+  # # For components in git repository:
+  # test_component:
+  #   path: test_component
+  #   git: ssh://git@gitlab.com/user/components.git
+  #
+  # # For test projects during component development
+  # # components can be used from a local directory
+  # # with relative or absolute path
+  # some_local_component:
+  #   path: ../../projects/component
diff --git a/tools/config.sh b/tools/config.sh
index 7aac39e5e..4216e0b1f 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="release/v4.4"
+	IDF_BRANCH="master"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -24,9 +24,6 @@ if [ -z $IDF_TARGET ]; then
 	fi
 fi
 
-IDF_COMPS="$IDF_PATH/components"
-IDF_TOOLCHAIN="xtensa-$IDF_TARGET-elf"
-
 # Owner of the target ESP32 Arduino repository
 AR_USER="espressif"
 
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index a6505d084..af8e1b339 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -95,7 +95,7 @@ for item in "${@:2:${#@}-5}"; do
 	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
+		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" ]]; then
 			C_FLAGS+="$item "
 		fi
 	fi
@@ -109,7 +109,7 @@ set -- $str
 for item in "${@:2:${#@}-5}"; do
 	prefix="${item:0:2}"
 	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
+		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" ]]; then
 			AS_FLAGS+="$item "
 			if [[ $C_FLAGS == *"$item"* ]]; then
 				PIO_CC_FLAGS+="$item "
@@ -128,7 +128,7 @@ set -- $str
 for item in "${@:2:${#@}-5}"; do
 	prefix="${item:0:2}"
 	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
+		if [[ "${item:0:23}" != "-mfix-esp32-psram-cache" && "${item:0:18}" != "-fmacro-prefix-map" && "${item:0:20}" != "-fdiagnostics-color=" ]]; then
 			CPP_FLAGS+="$item "
 			if [[ $PIO_CC_FLAGS != *"$item"* ]]; then
 				PIO_CXX_FLAGS+="$item "
@@ -155,13 +155,15 @@ else
 	libs="${libs:19:${#libs}-1}"
 	flags=`cat build/build.ninja | grep LINK_FLAGS`
 	flags="${flags:15:${#flags}-1}"
+	paths=`cat build/build.ninja | grep LINK_PATH`
+	paths="${paths:14:${#paths}-1}"
 	if [ "$IDF_TARGET" = "esp32" ]; then
 		flags="-Wno-frame-address $flags"
 	fi
 	if [ "$IDF_TARGET" != "esp32c3" ]; then
 		flags="-mlongcalls $flags"
 	fi
-	str="$flags $libs"
+	str="$flags $libs $paths"
 fi
 if [ "$IDF_TARGET" = "esp32" ]; then
 	LD_SCRIPTS+="-T esp32.rom.redefined.ld "
@@ -362,7 +364,7 @@ for item; do
 		if [[ "$fname" == "main" && "$dname" == "esp32-arduino-lib-builder" ]]; then
 			continue
 		fi
-		while [[ "$dname" != "components" && "$dname" != "build" ]]; do
+		while [[ "$dname" != "components" && "$dname" != "managed_components" && "$dname" != "build" ]]; do
 			ipath=`dirname "$ipath"`
 			fname=`basename "$ipath"`
 			dname=`basename $(dirname "$ipath")`
@@ -482,7 +484,7 @@ rm -rf platform_start.txt platform_mid.txt 1platform_mid.txt
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
 
 # gen_esp32part.py
-cp "$IDF_COMPS/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
+cp "$IDF_PATH/components/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
 
 # copy precompiled libs (if we need them)
 function copy_precompiled_lib(){
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 7bc0dce58..56a2b685e 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -63,10 +63,6 @@ else
 	git -C "$AR_COMPS/esp32-camera" fetch && \
 	git -C "$AR_COMPS/esp32-camera" pull --ff-only
 fi
-#this is a temp measure to fix build issue
-# if [ -f "$AR_COMPS/esp32-camera/idf_component.yml" ]; then
-# 	rm -rf "$AR_COMPS/esp32-camera/idf_component.yml"
-# fi
 if [ $? -ne 0 ]; then exit 1; fi
 
 #
@@ -98,16 +94,14 @@ fi
 if [ $? -ne 0 ]; then exit 1; fi
 
 #
-# CLONE/UPDATE ESP-LITTLEFS
+# CLONE/UPDATE ESP-DSP
 #
-echo "Updating ESP-LITTLEFS..."
-if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
-	git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \
-    git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
+echo "Updating ESP-DSP..."
+if [ ! -d "$AR_COMPS/esp-dsp" ]; then
+	git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp"
 else
-	git -C "$AR_COMPS/esp_littlefs" fetch && \
-	git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \
-    git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
+	git -C "$AR_COMPS/esp-dsp" fetch && \
+	git -C "$AR_COMPS/esp-dsp" pull --ff-only
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
@@ -140,14 +134,16 @@ fi
 if [ $? -ne 0 ]; then exit 1; fi
 
 #
-# CLONE/UPDATE ESP-DSP
+# CLONE/UPDATE ESP-LITTLEFS
 #
-echo "Updating ESP-DSP..."
-if [ ! -d "$AR_COMPS/esp-dsp" ]; then
-	git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp"
+echo "Updating ESP-LITTLEFS..."
+if [ ! -d "$AR_COMPS/esp_littlefs" ]; then
+	git clone $LITTLEFS_REPO_URL "$AR_COMPS/esp_littlefs" && \
+    git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
 else
-	git -C "$AR_COMPS/esp-dsp" fetch && \
-	git -C "$AR_COMPS/esp-dsp" pull --ff-only
+	git -C "$AR_COMPS/esp_littlefs" fetch && \
+	git -C "$AR_COMPS/esp_littlefs" pull --ff-only && \
+    git -C "$AR_COMPS/esp_littlefs" submodule update --init --recursive
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 

From 5a174cb7761c7b8e834622855d9c2ba5832c0c63 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Fri, 10 Feb 2023 00:29:35 +0200
Subject: [PATCH 02/42] Update package json with tolls matching the ESP-IDF
 version

---
 build.sh                 |   6 ++
 tools/copy-to-arduino.sh |   1 +
 tools/gen_tools_json.py  | 136 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 143 insertions(+)
 create mode 100644 tools/gen_tools_json.py

diff --git a/build.sh b/build.sh
index 5fc41769d..3a3cbadfa 100755
--- a/build.sh
+++ b/build.sh
@@ -191,6 +191,12 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     done
 done
 
+# update package_esp32_index.template.json
+if [ "$BUILD_TYPE" = "all" ]; then
+    python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
+
 # archive the build
 if [ "$BUILD_TYPE" = "all" ]; then
     ./tools/archive-build.sh
diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
index 6880b75d6..ef8b9074c 100755
--- a/tools/copy-to-arduino.sh
+++ b/tools/copy-to-arduino.sh
@@ -19,6 +19,7 @@ echo "Installing new libraries to $ESP32_ARDUINO"
 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 -f $AR_OUT/package_esp32_index.template.json $ESP32_ARDUINO/package/package_esp32_index.template.json
 cp -Rf $AR_TOOLS/sdk $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/gen_tools_json.py b/tools/gen_tools_json.py
new file mode 100644
index 000000000..98657ee71
--- /dev/null
+++ b/tools/gen_tools_json.py
@@ -0,0 +1,136 @@
+#!/usr/bin/env python
+# python tools/gen_tools_json.py -i $IDF_PATH -j components/arduino/package/package_esp32_index.template.json -o out/
+
+from __future__ import print_function
+
+__author__ = "Hristo Gochkov"
+__version__ = "2023"
+
+import os
+import shutil
+import errno
+import os.path
+import json
+import platform
+import sys
+import stat
+import argparse
+
+if sys.version_info[0] == 3:
+    unicode = lambda s: str(s)
+
+if __name__ == '__main__':
+
+    parser = argparse.ArgumentParser(
+        prog = 'gen_tools_json',
+        description = 'Update Arduino package index with the tolls found in ESP-IDF')
+    parser.add_argument('-i', '--esp-idf', dest='idf_path', required=True, help='Path to ESP-IDF')
+    parser.add_argument('-j', '--pkg-json', dest='arduino_json', required=True, help='path to Arduino package json')
+    parser.add_argument('-o', '--out-path', dest='out_path', required=True, help='Output path to store the update package json')
+    args = parser.parse_args()
+
+    idf_path = args.idf_path;
+    arduino_json = args.arduino_json;
+    out_path = args.out_path;
+
+    # settings
+    arduino_tools = ["xtensa-esp32-elf","xtensa-esp32s2-elf","xtensa-esp32s3-elf","riscv32-esp-elf","openocd-esp32"]
+
+    # code start
+    farray = json.load(open(arduino_json))
+
+    idf_tools = json.load(open(idf_path + '/tools/tools.json'))
+    for tool in idf_tools['tools']:
+        try:
+            tool_index = arduino_tools.index(tool['name'])
+        except:
+            continue
+        tool_name = tool['name']
+        tool_version = tool['versions'][0]['name']
+        if tool_name.endswith('-elf'):
+            tool_name += '-gcc'
+        print('Found {0}, version: {1}'.format(tool_name, tool_version))
+        
+        dep_found = False
+        dep_skip = False
+        for dep in farray['packages'][0]['platforms'][0]['toolsDependencies']:
+            if dep['name'] == tool_name:
+                if dep['version'] == tool_version:
+                    print('Skipping {0}. Same version {1}'.format(tool_name, tool_version))
+                    dep_skip = True
+                    break
+                print('Updating dependency version of {0} from {1} to {2}'.format(tool_name, dep['version'], tool_version))
+                dep['version'] = tool_version
+                dep_found = True
+        if dep_skip == True:
+            continue
+        if dep_found == False:
+            print('Adding new dependency: {0} version {1}'.format(tool_name, tool_version))
+            deps = {
+                "packager": "esp32",
+                "name": tool_name,
+                "version": tool_version
+            }
+            farray['packages'][0]['platforms'][0]['toolsDependencies'].append(deps)
+
+        systems = []
+        for arch in tool['versions'][0]:
+            if arch == 'name' or arch == 'status':
+                continue
+            tool_data = tool['versions'][0][arch]
+
+            system = {
+                "host": '',
+                "url": tool_data['url'],
+                "archiveFileName": os.path.basename(tool_data['url']),
+                "checksum": "SHA-256:"+tool_data['sha256'],
+                "size": tool_data['size']
+            }
+
+            if arch == "win32":
+                system["host"] = "i686-mingw32";
+            elif arch == "win64":
+                system["host"] = "x86_64-mingw32";
+            elif arch == "macos-arm64":
+                system["host"] = "arm64-apple-darwin";
+            elif arch == "macos":
+                system["host"] = "x86_64-apple-darwin";
+            elif arch == "linux-amd64":
+                system["host"] = "x86_64-pc-linux-gnu";
+            elif arch == "linux-i686":
+                system["host"] = "i686-pc-linux-gnu";
+            elif arch == "linux-arm64":
+                system["host"] = "aarch64-linux-gnu";
+            elif arch == "linux-armel":
+                system["host"] = "arm-linux-gnueabihf";
+            elif arch == "linux-armhf":
+                # system["host"] = "arm-linux-gnueabihf";
+                continue
+            else :
+                continue
+
+            systems.append(system)
+
+        tool_found = False
+        for t in farray['packages'][0]['tools']:
+            if t['name'] == tool_name:
+                t['version'] = tool_version
+                t['systems'] = systems
+                tool_found = True
+                print('Updating binaries of {0} to version {1}'.format(tool_name, tool_version))
+        if tool_found == False:
+            print('Adding new tool: {0} version {1}'.format(tool_name, tool_version))
+            tools = {
+                "name": tool_name,
+                "version": tool_version,
+                "systems": systems
+            }
+            farray['packages'][0]['tools'].append(tools)
+
+    json_str = json.dumps(farray, indent=2)
+    out_file = out_path + os.path.basename(arduino_json)
+    with open(out_file, "w") as f:
+        f.write(json_str+"\n")
+        f.close()
+    # print(json_str)
+    print('{0} generated'.format(out_file))

From 2591a439cab1e814eb80d1349e0275a9bc737e49 Mon Sep 17 00:00:00 2001
From: softwaregravy <426690+softwaregravy@users.noreply.github.com>
Date: Wed, 22 Feb 2023 17:31:15 -0500
Subject: [PATCH 03/42] support tags

---
 tools/update-components.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/tools/update-components.sh b/tools/update-components.sh
index c00b2853a..c116ca52d 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -19,7 +19,7 @@ if [ ! -d "$AR_COMPS/arduino" ]; then
 	git clone $AR_REPO_URL "$AR_COMPS/arduino"
 fi
 
-if [ -z $AR_BRANCH ]; then
+if [ -z $AR_BRANCH ] && [ -z $AR_TAG ]; then
 	if [ -z $GITHUB_HEAD_REF ]; then
 		current_branch=`git branch --show-current`
 	else
@@ -53,6 +53,16 @@ if [ "$AR_BRANCH" ]; then
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
+if [ "$AR_TAG" ]; then
+  if [ "$AR_BRANCH" ]; then
+    echo "Warning: Both branch and tag specifiied for arduino-esp32. Tag takes precedence. Ignoring branch."
+  fi
+	git -C "$AR_COMPS/arduino" checkout "tags/$AR_TAG" && \
+	git -C "$AR_COMPS/arduino" fetch && \
+	git -C "$AR_COMPS/arduino" pull --ff-only
+fi
+if [ $? -ne 0 ]; then exit 1; fi
+
 #
 # CLONE/UPDATE ESP32-CAMERA
 #

From 8d662974c81563c7b5d04f6a7bd68aa062085df7 Mon Sep 17 00:00:00 2001
From: softwaregravy <426690+softwaregravy@users.noreply.github.com>
Date: Wed, 22 Feb 2023 17:32:26 -0500
Subject: [PATCH 04/42] support -a option for arduino-esp32 tag

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

diff --git a/build.sh b/build.sh
index 7e4b1c190..e3d272dd0 100755
--- a/build.sh
+++ b/build.sh
@@ -20,6 +20,7 @@ function print_help() {
     echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
     echo "       -s     Skip installing/updating of ESP-IDF and all components"
     echo "       -A     Set which branch of arduino-esp32 to be used for compilation"
+    echo "       -a     Set which tag of arduino-esp32 to be used for compilation"
     echo "       -I     Set which branch of ESP-IDF to be used for compilation"
     echo "       -i     Set which commit of ESP-IDF to be used for compilation"
     echo "       -d     Deploy the build to github arduino-esp32"
@@ -45,6 +46,9 @@ while getopts ":A:I:i:c:t:b:sd" opt; do
         A )
             export AR_BRANCH="$OPTARG"
             ;;
+        a )
+            export AR_TAG="$OPTARG"
+            ;;
         I )
             export IDF_BRANCH="$OPTARG"
             ;;

From e58a21bdfcfdccff927979a4b60b4321e2cdde41 Mon Sep 17 00:00:00 2001
From: softwaregravy <426690+softwaregravy@users.noreply.github.com>
Date: Wed, 22 Feb 2023 17:59:55 -0500
Subject: [PATCH 05/42] fix checkout of change at tag

---
 build.sh                   | 4 ++--
 tools/update-components.sh | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.sh b/build.sh
index e3d272dd0..9d5ec9cf5 100755
--- a/build.sh
+++ b/build.sh
@@ -17,7 +17,7 @@ COPY_OUT=0
 DEPLOY_OUT=0
 
 function print_help() {
-    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
+    echo "Usage: build.sh [-s] [-A <arduino_branch>] [-a <arduino_tag>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
     echo "       -s     Skip installing/updating of ESP-IDF and all components"
     echo "       -A     Set which branch of arduino-esp32 to be used for compilation"
     echo "       -a     Set which tag of arduino-esp32 to be used for compilation"
@@ -31,7 +31,7 @@ function print_help() {
     exit 1
 }
 
-while getopts ":A:I:i:c:t:b:sd" opt; do
+while getopts ":A:a:I:i:c:t:b:sd" opt; do
     case ${opt} in
         s )
             SKIP_ENV=1
diff --git a/tools/update-components.sh b/tools/update-components.sh
index c116ca52d..4193f0a7f 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -57,9 +57,7 @@ if [ "$AR_TAG" ]; then
   if [ "$AR_BRANCH" ]; then
     echo "Warning: Both branch and tag specifiied for arduino-esp32. Tag takes precedence. Ignoring branch."
   fi
-	git -C "$AR_COMPS/arduino" checkout "tags/$AR_TAG" && \
-	git -C "$AR_COMPS/arduino" fetch && \
-	git -C "$AR_COMPS/arduino" pull --ff-only
+	git -C "$AR_COMPS/arduino" checkout "tags/$AR_TAG" 
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 

From cafcea037618a53dca758aac1700fd39a8ff2264 Mon Sep 17 00:00:00 2001
From: Sanket Wadekar <67091512+sanketwadekar@users.noreply.github.com>
Date: Thu, 23 Feb 2023 15:25:11 +0530
Subject: [PATCH 06/42] fix: rainmaker examples crashing on s3 due to low stack
 memory. (#106) (#107)

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

diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 2437efd2e..54c3aa350 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -9,4 +9,5 @@ CONFIG_SR_WN_MODEL_WN8_QUANT=y
 CONFIG_SR_WN_WN8_HIESP=y
 CONFIG_SR_MN_ENGLISH=y
 CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
-CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
\ No newline at end of file
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
\ No newline at end of file

From 55c332143ebbd817eeb63c5bccdd182487ee7cfe Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 14 Mar 2023 01:16:50 +0200
Subject: [PATCH 07/42] Update scripts with the latest requirements

---
 .gitignore                 |  2 +-
 configs/defconfig.esp32    |  1 -
 tools/copy-libs.sh         | 45 +++++++++++++++-----------------------
 tools/copy-to-arduino.sh   |  3 +--
 tools/gen_tools_json.py    |  2 +-
 tools/update-components.sh |  9 ++++----
 6 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3128aa229..fe7dfec1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ components/esp-sr/
 components/esp32-camera/
 components/esp_littlefs/
 components/esp-rainmaker/
-components/esp-dsp/
+components/espressif__esp-dsp/
 components/esp-insights/
 components/arduino_tinyusb/tinyusb/
 esp-idf/
diff --git a/configs/defconfig.esp32 b/configs/defconfig.esp32
index 14a4f2c17..65bc3f0c3 100644
--- a/configs/defconfig.esp32
+++ b/configs/defconfig.esp32
@@ -11,7 +11,6 @@ CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY=y
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
 CONFIG_ULP_COPROC_ENABLED=y
-CONFIG_XTAL_FREQ_AUTO=y
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
 CONFIG_FREERTOS_FPU_IN_ISR=y
 # CONFIG_USE_WAKENET is not set
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index af8e1b339..5aa0e9c14 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -350,8 +350,8 @@ echo "        '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
-# # include dirs
-AR_INC=""
+# include dirs
+REL_INC=""
 echo "    CPPPATH=[" >> "$AR_PLATFORMIO_PY"
 
 set -- $INCLUDES
@@ -378,7 +378,7 @@ for item; do
 
 		out_sub="${item#*$ipath}"
 		out_cpath="$AR_SDK/include/$fname$out_sub"
-		AR_INC+=" \"-I{compiler.sdk.path}/include/$fname$out_sub\""
+		REL_INC+="-iwithprefixbefore $fname$out_sub "
 		if [ "$out_sub" = "" ]; then
 			echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"include\", \"$fname\")," >> "$AR_PLATFORMIO_PY"
 		else
@@ -451,34 +451,25 @@ for item; do
 	fi
 done
 
-# remove backslashes for Arduino
-DEFINES=`echo "$DEFINES" | tr -d '\\'`
-
-
 # end generation of platformio-build.py
 cat 1pio_end.txt >> "$AR_PLATFORMIO_PY"
 rm 1pio_end.txt
 
-# arduino platform.txt
-platform_file="$AR_COMPS/arduino/platform.txt"
-if [ -f "$AR_PLATFORM_TXT" ]; then
-	# use the file we have already compiled for other chips
-	platform_file="$AR_PLATFORM_TXT"
-fi
-awk "/compiler.cpreprocessor.flags.$IDF_TARGET=/{n++}{print>n\"platform_start.txt\"}" "$platform_file"
-$SED -i "/compiler.cpreprocessor.flags.$IDF_TARGET\=/d" 1platform_start.txt
-awk "/compiler.ar.flags.$IDF_TARGET=/{n++}{print>n\"platform_mid.txt\"}" 1platform_start.txt
-rm -rf 1platform_start.txt
-
-cat platform_start.txt > "$AR_PLATFORM_TXT"
-echo "compiler.cpreprocessor.flags.$IDF_TARGET=$DEFINES $AR_INC" >> "$AR_PLATFORM_TXT"
-echo "compiler.c.elf.libs.$IDF_TARGET=$AR_LIBS" >> "$AR_PLATFORM_TXT"
-echo "compiler.c.flags.$IDF_TARGET=$C_FLAGS -MMD -c" >> "$AR_PLATFORM_TXT"
-echo "compiler.cpp.flags.$IDF_TARGET=$CPP_FLAGS -MMD -c" >> "$AR_PLATFORM_TXT"
-echo "compiler.S.flags.$IDF_TARGET=$AS_FLAGS -x assembler-with-cpp -MMD -c" >> "$AR_PLATFORM_TXT"
-echo "compiler.c.elf.flags.$IDF_TARGET=$LD_SCRIPTS $LD_FLAGS" >> "$AR_PLATFORM_TXT"
-cat 1platform_mid.txt >> "$AR_PLATFORM_TXT"
-rm -rf platform_start.txt platform_mid.txt 1platform_mid.txt
+# replace double backslashes with single one
+DEFINES=`echo "$DEFINES" | tr -s '\'`
+
+# target flags files
+FLAGS_DIR="$AR_SDK/flags"
+mkdir -p "$FLAGS_DIR"
+echo -n "$DEFINES" > "$FLAGS_DIR/defines"
+echo -n "$REL_INC" > "$FLAGS_DIR/includes"
+echo -n "$C_FLAGS" > "$FLAGS_DIR/c_flags"
+echo -n "$CPP_FLAGS" > "$FLAGS_DIR/cpp_flags"
+echo -n "$AS_FLAGS" > "$FLAGS_DIR/S_flags"
+echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags"
+echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
+echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
+
 
 # sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
index ef8b9074c..5448c7bcb 100755
--- a/tools/copy-to-arduino.sh
+++ b/tools/copy-to-arduino.sh
@@ -16,9 +16,8 @@ fi
 
 echo "Installing new libraries to $ESP32_ARDUINO"
 
-rm -rf $ESP32_ARDUINO/tools/sdk $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
 
-cp -f $AR_OUT/platform.txt $ESP32_ARDUINO/
 cp -f $AR_OUT/package_esp32_index.template.json $ESP32_ARDUINO/package/package_esp32_index.template.json
 cp -Rf $AR_TOOLS/sdk $ESP32_ARDUINO/tools/
 cp -f $AR_TOOLS/gen_esp32part.py $ESP32_ARDUINO/tools/
diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
index 98657ee71..2544c69b1 100644
--- a/tools/gen_tools_json.py
+++ b/tools/gen_tools_json.py
@@ -84,7 +84,7 @@
                 "url": tool_data['url'],
                 "archiveFileName": os.path.basename(tool_data['url']),
                 "checksum": "SHA-256:"+tool_data['sha256'],
-                "size": tool_data['size']
+                "size": str(tool_data['size'])
             }
 
             if arch == "win32":
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 56a2b685e..24240f112 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -47,6 +47,7 @@ if [ -z $AR_BRANCH ]; then
 fi
 
 if [ "$AR_BRANCH" ]; then
+	echo "AR_BRANCH='$AR_BRANCH'"
 	git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
 	git -C "$AR_COMPS/arduino" fetch && \
 	git -C "$AR_COMPS/arduino" pull --ff-only
@@ -97,11 +98,11 @@ if [ $? -ne 0 ]; then exit 1; fi
 # CLONE/UPDATE ESP-DSP
 #
 echo "Updating ESP-DSP..."
-if [ ! -d "$AR_COMPS/esp-dsp" ]; then
-	git clone $DSP_REPO_URL "$AR_COMPS/esp-dsp"
+if [ ! -d "$AR_COMPS/espressif__esp-dsp" ]; then
+	git clone $DSP_REPO_URL "$AR_COMPS/espressif__esp-dsp"
 else
-	git -C "$AR_COMPS/esp-dsp" fetch && \
-	git -C "$AR_COMPS/esp-dsp" pull --ff-only
+	git -C "$AR_COMPS/espressif__esp-dsp" fetch && \
+	git -C "$AR_COMPS/espressif__esp-dsp" pull --ff-only
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 

From 47ea807e35b677263378fccf9856fad5c5f2ead0 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Fri, 7 Apr 2023 16:58:47 +0300
Subject: [PATCH 08/42] Update configs + SR Support

---
 .gitignore                |  1 +
 CMakeLists.txt            |  2 +-
 build.sh                  |  4 +-
 configs/builds.json       |  8 +++-
 configs/defconfig.common  | 14 +++----
 configs/defconfig.esp32s3 |  4 --
 configs/defconfig.esp_sr  | 37 +++++++++++++++++
 configs/pio_end.txt       | 10 +++++
 configs/pio_start.txt     | 35 ++++++++++++++++
 partitions.csv            |  8 ++++
 tools/config.sh           |  4 +-
 tools/copy-libs.sh        | 37 ++++++++++-------
 tools/copy-to-arduino.sh  |  7 ++--
 tools/gen_tools_json.py   | 84 ++++++++++++++++++++++++++-------------
 14 files changed, 193 insertions(+), 62 deletions(-)
 create mode 100644 configs/defconfig.esp_sr
 create mode 100644 configs/pio_end.txt
 create mode 100644 configs/pio_start.txt
 create mode 100644 partitions.csv

diff --git a/.gitignore b/.gitignore
index fe7dfec1c..d38c0423d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ sdkconfig.old
 version.txt
 dependencies.lock
 managed_components/
+target/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a3be4c620..c562bf23f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ idf_build_get_property(elf EXECUTABLE GENERATOR_EXPRESSION)
 add_custom_command(
 	OUTPUT "idf_libs" 
 	COMMAND ${CMAKE_SOURCE_DIR}/tools/copy-libs.sh ${IDF_TARGET} "${CONFIG_LIB_BUILDER_FLASHMODE}" "${CONFIG_SPIRAM_MODE_OCT}" "${CONFIG_IDF_TARGET_ARCH_XTENSA}"
-	DEPENDS ${elf} 
+	DEPENDS all 
 	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} 
 	VERBATIM
 )
diff --git a/build.sh b/build.sh
index 3a3cbadfa..4dc1d0a70 100755
--- a/build.sh
+++ b/build.sh
@@ -122,9 +122,6 @@ if [ "$BUILD_TYPE" != "all" ]; then
 fi
 
 rm -rf build sdkconfig out
-echo "* Reconfigure Project"
-idf.py reconfigure
-rm -rf build sdkconfig
 
 # Add components version info
 mkdir -p "$AR_TOOLS/sdk" && rm -rf version.txt && rm -rf "$AR_TOOLS/sdk/versions.txt"
@@ -194,6 +191,7 @@ done
 # update package_esp32_index.template.json
 if [ "$BUILD_TYPE" = "all" ]; then
     python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -j "$AR_COMPS/arduino/package/package_esp32_index.template.json" -o "$AR_OUT/"
+    python3 ./tools/gen_tools_json.py -i "$IDF_PATH" -o "$TOOLS_JSON_OUT/"
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
diff --git a/configs/builds.json b/configs/builds.json
index c32e465e4..3a5dd67c9 100644
--- a/configs/builds.json
+++ b/configs/builds.json
@@ -6,6 +6,12 @@
 			"out":"lib/libspi_flash.a",
 			"targets":["esp32","esp32c3","esp32s2","esp32s3"]
 		},
+		{
+			"file":"libesp_psram.a",
+			"src":"build/esp-idf/esp_psram/libesp_psram.a",
+			"out":"lib/libesp_psram.a",
+			"targets":["esp32s3"]
+		},
 		{
 			"file":"libesp_system.a",
 			"src":"build/esp-idf/esp_system/libesp_system.a",
@@ -40,7 +46,7 @@
 	"targets":[
 		{
 			"target": "esp32s3",
-			"features":[],
+			"features":["esp_sr"],
 			"idf_libs":["qio","80m","qio_ram"],
 			"bootloaders":[
 				["qio","120m","qio_ram"],
diff --git a/configs/defconfig.common b/configs/defconfig.common
index fb9e2db86..34727c842 100644
--- a/configs/defconfig.common
+++ b/configs/defconfig.common
@@ -21,13 +21,13 @@ CONFIG_ESP_TASK_WDT_PANIC=y
 CONFIG_ESP_TIMER_TASK_STACK_SIZE=4096
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_ESP_WIFI_FTM_ENABLE=y
-CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_STATIC_TX_BUFFER_NUM=8
-CONFIG_ESP32_WIFI_CACHE_TX_BUFFER_NUM=16
-CONFIG_ESP32_WIFI_CSI_ENABLED=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
-# CONFIG_ESP32_WIFI_IRAM_OPT is not set
-# CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_STATIC_TX_BUFFER_NUM=8
+CONFIG_ESP_WIFI_CACHE_TX_BUFFER_NUM=16
+CONFIG_ESP_WIFI_CSI_ENABLED=y
+CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
+# CONFIG_ESP_WIFI_IRAM_OPT is not set
+# CONFIG_ESP_WIFI_RX_IRAM_OPT is not set
 CONFIG_ETH_SPI_ETHERNET_DM9051=y
 CONFIG_ETH_SPI_ETHERNET_W5500=y
 CONFIG_FATFS_CODEPAGE_850=y
diff --git a/configs/defconfig.esp32s3 b/configs/defconfig.esp32s3
index 54c3aa350..f3a2412ce 100644
--- a/configs/defconfig.esp32s3
+++ b/configs/defconfig.esp32s3
@@ -5,9 +5,5 @@ CONFIG_RTC_CLK_CAL_CYCLES=576
 CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
 # CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1 is not set
-CONFIG_SR_WN_MODEL_WN8_QUANT=y
-CONFIG_SR_WN_WN8_HIESP=y
-CONFIG_SR_MN_ENGLISH=y
-CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
 CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=3120
\ No newline at end of file
diff --git a/configs/defconfig.esp_sr b/configs/defconfig.esp_sr
new file mode 100644
index 000000000..03b7c462e
--- /dev/null
+++ b/configs/defconfig.esp_sr
@@ -0,0 +1,37 @@
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SR_WN_WN9_HIESP=y
+CONFIG_SR_MN_CN_NONE=y
+CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8=y
+CONFIG_EN_SPEECH_COMMAND_ID0=""
+CONFIG_EN_SPEECH_COMMAND_ID1=""
+CONFIG_EN_SPEECH_COMMAND_ID2=""
+CONFIG_EN_SPEECH_COMMAND_ID3=""
+CONFIG_EN_SPEECH_COMMAND_ID4=""
+CONFIG_EN_SPEECH_COMMAND_ID5=""
+CONFIG_EN_SPEECH_COMMAND_ID6=""
+CONFIG_EN_SPEECH_COMMAND_ID7=""
+CONFIG_EN_SPEECH_COMMAND_ID8=""
+CONFIG_EN_SPEECH_COMMAND_ID9=""
+CONFIG_EN_SPEECH_COMMAND_ID10=""
+CONFIG_EN_SPEECH_COMMAND_ID11=""
+CONFIG_EN_SPEECH_COMMAND_ID12=""
+CONFIG_EN_SPEECH_COMMAND_ID13=""
+CONFIG_EN_SPEECH_COMMAND_ID14=""
+CONFIG_EN_SPEECH_COMMAND_ID15=""
+CONFIG_EN_SPEECH_COMMAND_ID16=""
+CONFIG_EN_SPEECH_COMMAND_ID17=""
+CONFIG_EN_SPEECH_COMMAND_ID18=""
+CONFIG_EN_SPEECH_COMMAND_ID19=""
+CONFIG_EN_SPEECH_COMMAND_ID20=""
+CONFIG_EN_SPEECH_COMMAND_ID21=""
+CONFIG_EN_SPEECH_COMMAND_ID22=""
+CONFIG_EN_SPEECH_COMMAND_ID23=""
+CONFIG_EN_SPEECH_COMMAND_ID24=""
+CONFIG_EN_SPEECH_COMMAND_ID25=""
+CONFIG_EN_SPEECH_COMMAND_ID26=""
+CONFIG_EN_SPEECH_COMMAND_ID27=""
+CONFIG_EN_SPEECH_COMMAND_ID28=""
+CONFIG_EN_SPEECH_COMMAND_ID29=""
+CONFIG_EN_SPEECH_COMMAND_ID30=""
+CONFIG_EN_SPEECH_COMMAND_ID31=""
diff --git a/configs/pio_end.txt b/configs/pio_end.txt
new file mode 100644
index 000000000..3190217a1
--- /dev/null
+++ b/configs/pio_end.txt
@@ -0,0 +1,10 @@
+        "ARDUINO_ARCH_ESP32",
+        "ESP32",
+        ("F_CPU", "$BOARD_F_CPU"),
+        ("ARDUINO", 10812),
+        ("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),
+        ("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),
+        "ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(
+            "build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")
+    ]
+)
diff --git a/configs/pio_start.txt b/configs/pio_start.txt
new file mode 100644
index 000000000..010ba60aa
--- /dev/null
+++ b/configs/pio_start.txt
@@ -0,0 +1,35 @@
+# Copyright 2014-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""
+Arduino
+
+Arduino Wiring-based Framework allows writing cross-platform software to
+control devices attached to a wide range of Arduino boards to create all
+kinds of creative coding, interactive objects, spaces or physical experiences.
+
+http://arduino.cc/en/Reference/HomePage
+"""
+
+# Extends: https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
+
+from os.path import basename, join
+
+from SCons.Script import DefaultEnvironment
+
+env = DefaultEnvironment()
+
+FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoespressif32")
+
+env.Append(
diff --git a/partitions.csv b/partitions.csv
new file mode 100644
index 000000000..3cf7a7587
--- /dev/null
+++ b/partitions.csv
@@ -0,0 +1,8 @@
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,       0x9000,   0x5000,
+otadata,  data, ota,       0xe000,   0x2000,
+app0,     app,  ota_0,    0x10000, 0x300000,
+app1,     app,  ota_1,   0x310000, 0x300000,
+spiffs,   data, spiffs,  0x610000, 0x5E0000,
+model,    data, spiffs,  0xBF0000, 0x400000,
+coredump, data, coredump,0xFF0000,  0x10000,
diff --git a/tools/config.sh b/tools/config.sh
index 4216e0b1f..cba97ff0a 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="master"
+	IDF_BRANCH="release/v5.1"
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
@@ -42,6 +42,8 @@ AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
+PIO_SDK="FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\""
+TOOLS_JSON_OUT="$AR_TOOLS/sdk"
 
 function get_os(){
   	OSBITS=`arch`
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 5aa0e9c14..d3269649c 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -30,9 +30,15 @@ fi
 if [ -e "$AR_SDK/include" ]; then
 	rm -rf "$AR_SDK/include"
 fi
+if [ -e "$AR_SDK/flags" ]; then
+	rm -rf "$AR_SDK/flags"
+fi
 if [ -e "$AR_SDK/$MEMCONF" ]; then
 	rm -rf "$AR_SDK/$MEMCONF"
 fi
+if [ -e "$AR_SDK/platformio-build.py" ]; then
+	rm -rf "$AR_SDK/platformio-build.py"
+fi
 mkdir -p "$AR_SDK"
 
 function get_actual_path(){
@@ -273,13 +279,11 @@ done
 # END OF DATA EXTRACTION FROM CMAKE
 #
 
-AR_PLATFORMIO_PY="$AR_TOOLS/platformio-build-$IDF_TARGET.py"
+mkdir -p "$AR_SDK"
 
 # start generation of platformio-build.py
-awk "/ASFLAGS=\[/{n++}{print>n\"pio_start.txt\"}" $AR_COMPS/arduino/tools/platformio-build-$IDF_TARGET.py
-awk "/\"ARDUINO_ARCH_ESP32\"/{n++}{print>n\"pio_end.txt\"}" 1pio_start.txt
-cat pio_start.txt > "$AR_PLATFORMIO_PY"
-rm pio_end.txt 1pio_start.txt pio_start.txt
+AR_PLATFORMIO_PY="$AR_SDK/platformio-build.py"
+cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
 echo "    ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
 if [ "$IS_XTENSA" = "y" ]; then
@@ -380,11 +384,11 @@ for item; do
 		out_cpath="$AR_SDK/include/$fname$out_sub"
 		REL_INC+="-iwithprefixbefore $fname$out_sub "
 		if [ "$out_sub" = "" ]; then
-			echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"include\", \"$fname\")," >> "$AR_PLATFORMIO_PY"
+			echo "        join($PIO_SDK, \"include\", \"$fname\")," >> "$AR_PLATFORMIO_PY"
 		else
 			pio_sub="${out_sub:1}"
 			pio_sub=`echo $pio_sub | sed 's/\//\\", \\"/g'`
-			echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"include\", \"$fname\", \"$pio_sub\")," >> "$AR_PLATFORMIO_PY"
+			echo "        join($PIO_SDK, \"include\", \"$fname\", \"$pio_sub\")," >> "$AR_PLATFORMIO_PY"
 		fi
 		for f in `find "$item" -name '*.h'`; do
 			rel_f=${f#*$item}
@@ -400,7 +404,7 @@ for item; do
 		done
 	fi
 done
-echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
 echo "        join(FRAMEWORK_DIR, \"cores\", env.BoardConfig().get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
@@ -423,9 +427,9 @@ for item; do
 done
 
 echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"lib\")," >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", \"ld\")," >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\", env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -452,8 +456,7 @@ for item; do
 done
 
 # end generation of platformio-build.py
-cat 1pio_end.txt >> "$AR_PLATFORMIO_PY"
-rm 1pio_end.txt
+cat configs/pio_end.txt >> "$AR_PLATFORMIO_PY"
 
 # replace double backslashes with single one
 DEFINES=`echo "$DEFINES" | tr -s '\'`
@@ -470,12 +473,18 @@ echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags"
 echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
 echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
 
+# sr model.bin
+if [ -f "build/model.bin" ]; then
+	mkdir -p "$AR_SDK/esp_sr"
+	cp -f "build/model.bin" "$AR_SDK/esp_sr/"
+	cp -f "partitions.csv" "$AR_SDK/esp_sr/"
+fi
 
 # sdkconfig
 cp -f "sdkconfig" "$AR_SDK/sdkconfig"
 
 # gen_esp32part.py
-cp "$IDF_PATH/components/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
+# cp "$IDF_PATH/components/partition_table/gen_esp32part.py" "$AR_GEN_PART_PY"
 
 # copy precompiled libs (if we need them)
 function copy_precompiled_lib(){
diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
index 5448c7bcb..2ed90fa9b 100755
--- a/tools/copy-to-arduino.sh
+++ b/tools/copy-to-arduino.sh
@@ -16,9 +16,8 @@ fi
 
 echo "Installing new libraries to $ESP32_ARDUINO"
 
-rm -rf $ESP32_ARDUINO/tools/sdk $ESP32_ARDUINO/tools/gen_esp32part.py $ESP32_ARDUINO/tools/platformio-build-*.py
-
+rm -rf $ESP32_ARDUINO/package/package_esp32_index.template.json && \
 cp -f $AR_OUT/package_esp32_index.template.json $ESP32_ARDUINO/package/package_esp32_index.template.json
+
+rm -rf $ESP32_ARDUINO/tools/sdk && \
 cp -Rf $AR_TOOLS/sdk $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/gen_tools_json.py b/tools/gen_tools_json.py
index 2544c69b1..92fa6f74e 100644
--- a/tools/gen_tools_json.py
+++ b/tools/gen_tools_json.py
@@ -25,10 +25,17 @@
         prog = 'gen_tools_json',
         description = 'Update Arduino package index with the tolls found in ESP-IDF')
     parser.add_argument('-i', '--esp-idf', dest='idf_path', required=True, help='Path to ESP-IDF')
-    parser.add_argument('-j', '--pkg-json', dest='arduino_json', required=True, help='path to Arduino package json')
+    parser.add_argument('-j', '--pkg-json', dest='arduino_json', required=False, help='path to Arduino package json')
     parser.add_argument('-o', '--out-path', dest='out_path', required=True, help='Output path to store the update package json')
     args = parser.parse_args()
 
+    simple_output = False
+    if args.arduino_json == None:
+        print('Source was not selected')
+        simple_output = True
+    else:
+        print('Source {0}.'.format(args.arduino_json))
+
     idf_path = args.idf_path;
     arduino_json = args.arduino_json;
     out_path = args.out_path;
@@ -37,7 +44,9 @@
     arduino_tools = ["xtensa-esp32-elf","xtensa-esp32s2-elf","xtensa-esp32s3-elf","riscv32-esp-elf","openocd-esp32"]
 
     # code start
-    farray = json.load(open(arduino_json))
+    farray = {"packages":[{"platforms":[{"toolsDependencies":[]}],"tools":[]}]}
+    if simple_output == False:
+        farray = json.load(open(arduino_json))
 
     idf_tools = json.load(open(idf_path + '/tools/tools.json'))
     for tool in idf_tools['tools']:
@@ -51,21 +60,30 @@
             tool_name += '-gcc'
         print('Found {0}, version: {1}'.format(tool_name, tool_version))
         
-        dep_found = False
-        dep_skip = False
-        for dep in farray['packages'][0]['platforms'][0]['toolsDependencies']:
-            if dep['name'] == tool_name:
-                if dep['version'] == tool_version:
-                    print('Skipping {0}. Same version {1}'.format(tool_name, tool_version))
-                    dep_skip = True
-                    break
-                print('Updating dependency version of {0} from {1} to {2}'.format(tool_name, dep['version'], tool_version))
-                dep['version'] = tool_version
-                dep_found = True
-        if dep_skip == True:
-            continue
-        if dep_found == False:
-            print('Adding new dependency: {0} version {1}'.format(tool_name, tool_version))
+        if simple_output == False:
+            dep_found = False
+            dep_skip = False
+            for dep in farray['packages'][0]['platforms'][0]['toolsDependencies']:
+                if dep['name'] == tool_name:
+                    if dep['version'] == tool_version:
+                        print('Skipping {0}. Same version {1}'.format(tool_name, tool_version))
+                        dep_skip = True
+                        break
+                    print('Updating dependency version of {0} from {1} to {2}'.format(tool_name, dep['version'], tool_version))
+                    dep['version'] = tool_version
+                    dep_found = True
+            if dep_skip == True:
+                continue
+            if dep_found == False:
+                print('Adding new dependency: {0} version {1}'.format(tool_name, tool_version))
+                deps = {
+                    "packager": "esp32",
+                    "name": tool_name,
+                    "version": tool_version
+                }
+                farray['packages'][0]['platforms'][0]['toolsDependencies'].append(deps)
+        else:
+            print('Adding dependency: {0} version {1}'.format(tool_name, tool_version))
             deps = {
                 "packager": "esp32",
                 "name": tool_name,
@@ -111,15 +129,24 @@
 
             systems.append(system)
 
-        tool_found = False
-        for t in farray['packages'][0]['tools']:
-            if t['name'] == tool_name:
-                t['version'] = tool_version
-                t['systems'] = systems
-                tool_found = True
-                print('Updating binaries of {0} to version {1}'.format(tool_name, tool_version))
-        if tool_found == False:
-            print('Adding new tool: {0} version {1}'.format(tool_name, tool_version))
+        if simple_output == False:
+            tool_found = False
+            for t in farray['packages'][0]['tools']:
+                if t['name'] == tool_name:
+                    t['version'] = tool_version
+                    t['systems'] = systems
+                    tool_found = True
+                    print('Updating binaries of {0} to version {1}'.format(tool_name, tool_version))
+            if tool_found == False:
+                print('Adding new tool: {0} version {1}'.format(tool_name, tool_version))
+                tools = {
+                    "name": tool_name,
+                    "version": tool_version,
+                    "systems": systems
+                }
+                farray['packages'][0]['tools'].append(tools)
+        else:
+            print('Adding tool: {0} version {1}'.format(tool_name, tool_version))
             tools = {
                 "name": tool_name,
                 "version": tool_version,
@@ -128,7 +155,10 @@
             farray['packages'][0]['tools'].append(tools)
 
     json_str = json.dumps(farray, indent=2)
-    out_file = out_path + os.path.basename(arduino_json)
+    out_file = out_path + "tools.json"
+    if simple_output == False:
+        out_file = out_path + os.path.basename(arduino_json)
+
     with open(out_file, "w") as f:
         f.write(json_str+"\n")
         f.close()

From 725f9c3c6aaf7c35c68d3ffd37aae4c707384a4a Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Sat, 8 Apr 2023 03:10:23 +0300
Subject: [PATCH 09/42] Add esp-elf-gdp to the list of packages

---
 tools/gen_tools_json.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/gen_tools_json.py b/tools/gen_tools_json.py
index 92fa6f74e..ca53ec8cb 100644
--- a/tools/gen_tools_json.py
+++ b/tools/gen_tools_json.py
@@ -41,7 +41,7 @@
     out_path = args.out_path;
 
     # settings
-    arduino_tools = ["xtensa-esp32-elf","xtensa-esp32s2-elf","xtensa-esp32s3-elf","riscv32-esp-elf","openocd-esp32"]
+    arduino_tools = ["xtensa-esp32-elf","xtensa-esp32s2-elf","xtensa-esp32s3-elf","xtensa-esp-elf-gdb","riscv32-esp-elf","riscv32-esp-elf-gdb","openocd-esp32"]
 
     # code start
     farray = {"packages":[{"platforms":[{"toolsDependencies":[]}],"tools":[]}]}

From 01a9e3984360f44087f599c5df8168bbe69d83aa Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Mon, 10 Apr 2023 17:27:18 +0300
Subject: [PATCH 10/42] Fix RainMaker builds and new sr models path

---
 CMakeLists.txt     | 3 ++-
 tools/copy-libs.sh | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c562bf23f..5cc989c62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 
-set(EXTRA_COMPONENT_DIRS ${CMAKE_SOURCE_DIR}/components/esp-rainmaker/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
+set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
+set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(arduino-lib-builder)
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index d3269649c..32992d624 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -84,7 +84,7 @@ for item in "${@:2:${#@}-5}"; do
 			item=`get_actual_path $item`
 			INCLUDES+="$item "
 		elif [ "${item:0:2}" = ".." ]; then
-			if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]]; then
+			if [[ "${item:0:14}" = "../components/" && "${item:0:22}" != "../components/arduino/" ]] || [[ "${item:0:11}" = "../esp-idf/" ]] || [[ "${item:0:22}" = "../managed_components/" ]]; then
 				item="$PWD${item:2}"
 				item=`get_actual_path $item`
 				INCLUDES+="$item "
@@ -474,9 +474,9 @@ echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
 echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
 
 # sr model.bin
-if [ -f "build/model.bin" ]; then
+if [ -f "build/srmodels/srmodels.bin" ]; then
 	mkdir -p "$AR_SDK/esp_sr"
-	cp -f "build/model.bin" "$AR_SDK/esp_sr/"
+	cp -f "build/srmodels/srmodels.bin" "$AR_SDK/esp_sr/"
 	cp -f "partitions.csv" "$AR_SDK/esp_sr/"
 fi
 

From 32acbb776c1b8b9c8c8c4e42924c657d6b6cd1c0 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 11 Apr 2023 00:50:31 +0300
Subject: [PATCH 11/42] Temporary force arduino branch for CI to work

---
 tools/update-components.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tools/update-components.sh b/tools/update-components.sh
index 24240f112..ac7e40253 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -26,7 +26,10 @@ if [ -z $AR_BRANCH ]; then
 		current_branch="$GITHUB_HEAD_REF"
 	fi
 	echo "Current Branch: $current_branch"
-	if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
+	# Temporary to get CI working
+	if [[ "$current_branch" == "esp-idf-v5.1" ]]; then
+		export AR_BRANCH="esp-idf-v5.1-libs"
+	elif [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
 		export AR_BRANCH="$current_branch"
 	else
 		if [ -z "$IDF_COMMIT" ]; then #commit was not specified at build time

From 248e8e8e84846e1b44c8f87d44ad12124f1eb0a1 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 11 Apr 2023 00:59:30 +0300
Subject: [PATCH 12/42] fix target branch

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

diff --git a/tools/config.sh b/tools/config.sh
index 8f6686f8e..cba97ff0a 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -10,7 +10,7 @@ if [ -z $IDF_BRANCH ]; then
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-	AR_PR_TARGET_BRANCH="release/v2.x"
+	AR_PR_TARGET_BRANCH="master"
 fi
 
 if [ -z $IDF_TARGET ]; then

From 362fbfb41433486f6e72daf4354dfb80289c04ed Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 11 Apr 2023 01:07:13 +0300
Subject: [PATCH 13/42] Delete esp-dl component manifest for requiring IDF
 4.4.x

---
 tools/update-components.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/update-components.sh b/tools/update-components.sh
index ac7e40253..4111dd489 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -80,6 +80,10 @@ else
 	git -C "$AR_COMPS/esp-dl" pull --ff-only
 fi
 if [ $? -ne 0 ]; then exit 1; fi
+#this is a temp measure to fix build issue
+if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then
+	rm -rf "$AR_COMPS/esp-dl/idf_component.yml"
+fi
 
 #
 # CLONE/UPDATE ESP-SR
@@ -91,10 +95,6 @@ else
 	git -C "$AR_COMPS/esp-sr" fetch && \
 	git -C "$AR_COMPS/esp-sr" pull --ff-only
 fi
-#this is a temp measure to fix build issue
-if [ -f "$AR_COMPS/esp-sr/idf_component.yml" ]; then
-	rm -rf "$AR_COMPS/esp-sr/idf_component.yml"
-fi
 if [ $? -ne 0 ]; then exit 1; fi
 
 #

From 4db7ea72512fb76f14e8fb3efe7d56b9b8965d33 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 11 Apr 2023 01:41:12 +0300
Subject: [PATCH 14/42] Temporary changes to allow Cron CI to run

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

diff --git a/tools/config.sh b/tools/config.sh
index cba97ff0a..294d8f078 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -10,7 +10,8 @@ if [ -z $IDF_BRANCH ]; then
 fi
 
 if [ -z $AR_PR_TARGET_BRANCH ]; then
-	AR_PR_TARGET_BRANCH="master"
+	# Temporary to get CI working. original is master
+	AR_PR_TARGET_BRANCH="esp-idf-v5.1-libs"
 fi
 
 if [ -z $IDF_TARGET ]; then

From 3b1b774c954b1560a615607004f7b2b9e48c561a Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 11 Apr 2023 15:57:55 +0300
Subject: [PATCH 15/42] Support builds based on ESP-IDF tag

---
 tools/install-esp-idf.sh     |  5 ++++-
 tools/repository_dispatch.sh |  5 ++++-
 tools/update-components.sh   | 13 ++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index 2b7a0f5fb..6f7442d5f 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -18,7 +18,10 @@ if [ ! -d "$IDF_PATH" ]; then
 	idf_was_installed="1"
 fi
 
-if [ "$IDF_COMMIT" ]; then
+if [ "$IDF_TAG" ]; then
+    git -C "$IDF_PATH" checkout "tags/$IDF_TAG"
+    idf_was_installed="1"
+elif [ "$IDF_COMMIT" ]; then
     git -C "$IDF_PATH" checkout "$IDF_COMMIT"
     commit_predefined="1"
 fi
diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh
index a920f5b45..8b2d1b888 100644
--- a/tools/repository_dispatch.sh
+++ b/tools/repository_dispatch.sh
@@ -9,11 +9,12 @@ EVENT_JSON=`cat "$GITHUB_EVENT_PATH"`
 action=`echo "$EVENT_JSON" | jq -r '.action'`
 payload=`echo "$EVENT_JSON" | jq -r '.client_payload'`
 branch=`echo "$payload" | jq -r '.branch'`
+tag=`echo "$payload" | jq -r '.tag'`
 commit=`echo "$payload" | jq -r '.commit'`
 builder=`echo "$payload" | jq -r '.builder'`
 arduino=`echo "$payload" | jq -r '.arduino'`
 
-echo "Action: $action, Branch: $branch, Commit: $commit, Builder: $builder"
+echo "Action: $action, Branch: $branch, Tag: $tag, Commit: $commit, Builder: $builder, Arduino: $arduino"
 
 if [ ! "$action" == "deploy" ] && [ ! "$action" == "build" ]; then
     echo "Bad Action $action"
@@ -26,6 +27,8 @@ if [ ! "$commit" == "" ] && [ ! "$commit" == "null" ]; then
     export IDF_COMMIT="$commit"
 else
     commit=""
+    if [ ! "$tag" == "" ] && [ ! "$tag" == "null" ]; then
+        export IDF_TAG="$tag"
     if [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then
         export IDF_BRANCH="$branch"
     fi
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 4111dd489..64bc85b1f 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -26,16 +26,15 @@ if [ -z $AR_BRANCH ]; then
 		current_branch="$GITHUB_HEAD_REF"
 	fi
 	echo "Current Branch: $current_branch"
-	# Temporary to get CI working
-	if [[ "$current_branch" == "esp-idf-v5.1" ]]; then
-		export AR_BRANCH="esp-idf-v5.1-libs"
-	elif [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
+	if [[ "$current_branch" != "master" && `git_branch_exists "$AR_COMPS/arduino" "$current_branch"` == "1" ]]; then
 		export AR_BRANCH="$current_branch"
 	else
-		if [ -z "$IDF_COMMIT" ]; then #commit was not specified at build time
-			AR_BRANCH_NAME="idf-$IDF_BRANCH"
-		else
+		if [ "$IDF_TAG" ]; then #tag was specified at build time
+			AR_BRANCH_NAME="idf-$IDF_TAG"
+		elif [ "$IDF_COMMIT" ]; then #commit was specified at build time
 			AR_BRANCH_NAME="idf-$IDF_COMMIT"
+		else
+			AR_BRANCH_NAME="idf-$IDF_BRANCH"
 		fi
 		has_ar_branch=`git_branch_exists "$AR_COMPS/arduino" "$AR_BRANCH_NAME"`
 		if [ "$has_ar_branch" == "1" ]; then

From 8fce687bf7a8c69aea6129a15feaca379f916f06 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 01:28:26 +0300
Subject: [PATCH 16/42] Push to esp32-arduino-libs

---
 tools/push-to-arduino.sh | 65 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index f9a2b9955..70b19cda3 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -51,4 +51,69 @@ if [ "$AR_HAS_PR" == "0" ]; then
 		exit 1
 	fi
 fi
+
+#
+# esp32-arduino-libs
+#
+cd "$AR_ROOT"
+IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
+
+if [ ! -d "$IDF_LIBS_DIR" ]; then
+	echo "Cloning esp32-arduino-libs..."
+	git clone "https://github.com/espressif/esp32-arduino-libs.git" "$IDF_LIBS_DIR"
+else
+	echo "Updating esp32-arduino-libs..."
+	git -C "$IDF_LIBS_DIR" fetch && \
+	git -C "$IDF_LIBS_DIR" pull --ff-only
+fi
+if [ $? -ne 0 ]; then exit 1; fi
+
+LIBS_HAS_COMMIT=`git_commit_exists "$IDF_LIBS_DIR" "$AR_NEW_COMMIT_MESSAGE"`
+LIBS_HAS_BRANCH=`git_branch_exists "$IDF_LIBS_DIR" "$AR_NEW_BRANCH_NAME"`
+
+if [ "$LIBS_HAS_COMMIT" == "1" ]; then
+	echo "Commit '$AR_NEW_COMMIT_MESSAGE' in esp32-arduino-libs Already Exists"
+	mkdir -p dist && echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists" > dist/log.txt
+	exit 0
+fi
+
+if [ "$LIBS_HAS_BRANCH" == "1" ]; then
+	echo "Branch '$AR_NEW_BRANCH_NAME' Already Exists"
+	echo "Switching to esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
+	git -C "$IDF_LIBS_DIR" checkout $AR_NEW_BRANCH_NAME
+else
+	echo "Creating esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
+	git -C "$IDF_LIBS_DIR" checkout -b $AR_NEW_BRANCH_NAME
+fi
+if [ $? -ne 0 ]; then
+    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
+	exit 1
+fi
+
+if [ $LIBS_HAS_COMMIT == "0" ]; then
+	# make changes to the files
+	echo "Patching files in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
+	rm -rf $IDF_LIBS_DIR/sdk && cp -Rf $AR_TOOLS/sdk $IDF_LIBS_DIR/
+	
+	cd $IDF_LIBS_DIR
+
+	# did any of the files change?
+	if [ -n "$(git status --porcelain)" ]; then
+		echo "Pushing changes to esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
+	    git add . && git commit --message "$AR_NEW_COMMIT_MESSAGE" && git push -u origin $AR_NEW_BRANCH_NAME
+		if [ $? -ne 0 ]; then
+		    echo "ERROR: Pushing to branch '$AR_NEW_BRANCH_NAME' failed"
+			exit 1
+		fi
+	else
+	    echo "No changes in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'"
+	    if [ $LIBS_HAS_BRANCH == "0" ]; then
+	    	echo "Delete created branch '$AR_NEW_BRANCH_NAME'"
+	    	git branch -d $AR_NEW_BRANCH_NAME
+	    fi
+	    exit 0
+	fi
+fi
+
+
 exit 0

From 055de09035ebb5b094ac567224db4aa51658f203 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 01:32:14 +0300
Subject: [PATCH 17/42] Update repository_dispatch.sh

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

diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh
index 8b2d1b888..fff912b07 100644
--- a/tools/repository_dispatch.sh
+++ b/tools/repository_dispatch.sh
@@ -29,7 +29,7 @@ else
     commit=""
     if [ ! "$tag" == "" ] && [ ! "$tag" == "null" ]; then
         export IDF_TAG="$tag"
-    if [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then
+    elif [ ! "$branch" == "" ] && [ ! "$branch" == "null" ]; then
         export IDF_BRANCH="$branch"
     fi
 fi

From 7ceb0469fccf14983f962ae00c99f57f026f9427 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 03:43:25 +0300
Subject: [PATCH 18/42] Rework scripts to allow build when either dst needs it

---
 tools/config.sh            |  1 +
 tools/install-esp-idf.sh   | 38 ++++++-----------
 tools/push-to-arduino.sh   | 85 +++++++++++++++++++-------------------
 tools/update-components.sh | 14 +++++++
 4 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/tools/config.sh b/tools/config.sh
index 294d8f078..e339f31ee 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -45,6 +45,7 @@ AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
 PIO_SDK="FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\""
 TOOLS_JSON_OUT="$AR_TOOLS/sdk"
+IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
 
 function get_os(){
   	OSBITS=`arch`
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index 6f7442d5f..5c4dec5b9 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -63,36 +63,21 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 	AR_HAS_BRANCH=`git_branch_exists "$AR_COMPS/arduino" "$AR_NEW_BRANCH_NAME"`
 	AR_HAS_PR=`git_pr_exists "$AR_NEW_BRANCH_NAME"`
 
-	if [ "$AR_HAS_COMMIT" == "1" ]; then
-		echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists"
-		mkdir -p dist && echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists" > dist/log.txt
-		exit 0
-	fi
+	LIBS_HAS_COMMIT=`git_commit_exists "$IDF_LIBS_DIR" "$AR_NEW_COMMIT_MESSAGE"`
+	LIBS_HAS_BRANCH=`git_branch_exists "$IDF_LIBS_DIR" "$AR_NEW_BRANCH_NAME"`
 
-	if [ "$AR_HAS_BRANCH" == "1" ]; then
-		echo "Branch '$AR_NEW_BRANCH_NAME' Already Exists"
+	if [ "$LIBS_HAS_COMMIT" == "1" ]; then
+		echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists in esp32-arduino-libs"
+		mkdir -p dist && echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists in esp32-arduino-libs" > dist/log.txt
 	fi
 
-	if [ "$AR_HAS_PR" == "1" ]; then
-		echo "PR '$AR_NEW_PR_TITLE' Already Exists"
+	if [ "$AR_HAS_COMMIT" == "1" ]; then
+		echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists in arduino-esp32"
+		mkdir -p dist && echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists in arduino-esp32" > dist/log.txt
 	fi
 
-	# setup git for pushing
-	git config --global github.user "$GITHUB_ACTOR"
-	git config --global user.name "$GITHUB_ACTOR"
-	git config --global user.email "$GITHUB_ACTOR@github.com"
-
-	# create or checkout the branch
-	if [ ! $AR_HAS_BRANCH == "0" ]; then
-		echo "Switching to arduino branch '$AR_NEW_BRANCH_NAME'..."
-		git -C "$AR_COMPS/arduino" checkout $AR_NEW_BRANCH_NAME
-	else
-		echo "Creating arduino branch '$AR_NEW_BRANCH_NAME'..."
-		git -C "$AR_COMPS/arduino" checkout -b $AR_NEW_BRANCH_NAME
-	fi
-	if [ $? -ne 0 ]; then
-	    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
-		exit 1
+	if [ "$LIBS_HAS_COMMIT" == "1" ] && [ "$AR_HAS_COMMIT" == "1" ]; then
+		exit 0
 	fi
 
 	export AR_NEW_BRANCH_NAME
@@ -102,4 +87,7 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 	export AR_HAS_COMMIT
 	export AR_HAS_BRANCH
 	export AR_HAS_PR
+
+	export LIBS_HAS_COMMIT
+	export LIBS_HAS_BRANCH
 fi
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index 70b19cda3..1e3c50c30 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -11,11 +11,29 @@ if ! [ -d "$AR_COMPS/arduino" ]; then
 	exit 1
 fi
 
+# setup git for pushing
+git config --global github.user "$GITHUB_ACTOR"
+git config --global user.name "$GITHUB_ACTOR"
+git config --global user.email "$GITHUB_ACTOR@github.com"
+
 #
 # UPDATE FILES
 #
 
 if [ $AR_HAS_COMMIT == "0" ]; then
+	# create or checkout the branch
+	if [ ! $AR_HAS_BRANCH == "0" ]; then
+		echo "Switching to arduino branch '$AR_NEW_BRANCH_NAME'..."
+		git -C "$AR_COMPS/arduino" checkout $AR_NEW_BRANCH_NAME
+	else
+		echo "Creating arduino branch '$AR_NEW_BRANCH_NAME'..."
+		git -C "$AR_COMPS/arduino" checkout -b $AR_NEW_BRANCH_NAME
+	fi
+	if [ $? -ne 0 ]; then
+	    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
+		exit 1
+	fi
+
 	# make changes to the files
 	echo "Patching files in branch '$AR_NEW_BRANCH_NAME'..."
 	ESP32_ARDUINO="$AR_COMPS/arduino" ./tools/copy-to-arduino.sh
@@ -38,17 +56,17 @@ if [ $AR_HAS_COMMIT == "0" ]; then
 	    fi
 	    exit 0
 	fi
-fi
 
-#
-# CREATE PULL REQUEST
-#
-
-if [ "$AR_HAS_PR" == "0" ]; then
-	pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
-	if [ $pr_created == "0" ]; then
-		echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" | jq -r '.message'`": "`echo "$git_create_pr_res" | jq -r '.errors[].message'`
-		exit 1
+	# CREATE PULL REQUEST
+	if [ "$AR_HAS_PR" == "0" ]; then
+		echo "Creating PR '$AR_NEW_PR_TITLE'..."
+		pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
+		if [ $pr_created == "0" ]; then
+			echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" | jq -r '.message'`": "`echo "$git_create_pr_res" | jq -r '.errors[].message'`
+			exit 1
+		fi
+	else
+		echo "PR '$AR_NEW_PR_TITLE' Already Exists"
 	fi
 fi
 
@@ -56,41 +74,22 @@ fi
 # esp32-arduino-libs
 #
 cd "$AR_ROOT"
-IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
-
-if [ ! -d "$IDF_LIBS_DIR" ]; then
-	echo "Cloning esp32-arduino-libs..."
-	git clone "https://github.com/espressif/esp32-arduino-libs.git" "$IDF_LIBS_DIR"
-else
-	echo "Updating esp32-arduino-libs..."
-	git -C "$IDF_LIBS_DIR" fetch && \
-	git -C "$IDF_LIBS_DIR" pull --ff-only
-fi
-if [ $? -ne 0 ]; then exit 1; fi
-
-LIBS_HAS_COMMIT=`git_commit_exists "$IDF_LIBS_DIR" "$AR_NEW_COMMIT_MESSAGE"`
-LIBS_HAS_BRANCH=`git_branch_exists "$IDF_LIBS_DIR" "$AR_NEW_BRANCH_NAME"`
-
-if [ "$LIBS_HAS_COMMIT" == "1" ]; then
-	echo "Commit '$AR_NEW_COMMIT_MESSAGE' in esp32-arduino-libs Already Exists"
-	mkdir -p dist && echo "Commit '$AR_NEW_COMMIT_MESSAGE' Already Exists" > dist/log.txt
-	exit 0
-fi
-
-if [ "$LIBS_HAS_BRANCH" == "1" ]; then
-	echo "Branch '$AR_NEW_BRANCH_NAME' Already Exists"
-	echo "Switching to esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
-	git -C "$IDF_LIBS_DIR" checkout $AR_NEW_BRANCH_NAME
-else
-	echo "Creating esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
-	git -C "$IDF_LIBS_DIR" checkout -b $AR_NEW_BRANCH_NAME
-fi
-if [ $? -ne 0 ]; then
-    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
-	exit 1
-fi
 
 if [ $LIBS_HAS_COMMIT == "0" ]; then
+	# create branch if necessary
+	if [ "$LIBS_HAS_BRANCH" == "1" ]; then
+		echo "Branch '$AR_NEW_BRANCH_NAME' Already Exists"
+		echo "Switching to esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
+		git -C "$IDF_LIBS_DIR" checkout $AR_NEW_BRANCH_NAME
+	else
+		echo "Creating esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
+		git -C "$IDF_LIBS_DIR" checkout -b $AR_NEW_BRANCH_NAME
+	fi
+	if [ $? -ne 0 ]; then
+		echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
+		exit 1
+	fi
+
 	# make changes to the files
 	echo "Patching files in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
 	rm -rf $IDF_LIBS_DIR/sdk && cp -Rf $AR_TOOLS/sdk $IDF_LIBS_DIR/
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 64bc85b1f..d2cc7f2f3 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -10,6 +10,7 @@ INSIGHTS_REPO_URL="https://github.com/espressif/esp-insights.git"
 DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
 LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
 TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
+IDF_LIBS_REPO_URL="https://github.com/espressif/esp32-arduino-libs.git"
 
 #
 # CLONE/UPDATE ARDUINO
@@ -56,6 +57,19 @@ if [ "$AR_BRANCH" ]; then
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
+#
+# CLONE/UPDATE ESP32-ARDUINO-LIBS
+#
+if [ ! -d "$IDF_LIBS_DIR" ]; then
+	echo "Cloning esp32-arduino-libs..."
+	git clone "$IDF_LIBS_REPO_URL" "$IDF_LIBS_DIR"
+else
+	echo "Updating esp32-arduino-libs..."
+	git -C "$IDF_LIBS_DIR" fetch && \
+	git -C "$IDF_LIBS_DIR" pull --ff-only
+fi
+if [ $? -ne 0 ]; then exit 1; fi
+
 #
 # CLONE/UPDATE ESP32-CAMERA
 #

From 7562fbd76de5398d6b555dc6e6383b78137d2fe7 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 12:20:48 +0300
Subject: [PATCH 19/42] Github complains when pushing to the libs repo

---
 tools/install-esp-idf.sh     | 5 +++++
 tools/push-to-arduino.sh     | 5 -----
 tools/repository_dispatch.sh | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index 5c4dec5b9..ceb8cbfe6 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -80,6 +80,11 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 		exit 0
 	fi
 
+	# setup git for pushing
+	git config --global github.user "$GITHUB_ACTOR"
+	git config --global user.name "$GITHUB_ACTOR"
+	git config --global user.email "$GITHUB_ACTOR@github.com"
+
 	export AR_NEW_BRANCH_NAME
 	export AR_NEW_COMMIT_MESSAGE
 	export AR_NEW_PR_TITLE
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index 1e3c50c30..01f0b59d5 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -11,11 +11,6 @@ if ! [ -d "$AR_COMPS/arduino" ]; then
 	exit 1
 fi
 
-# setup git for pushing
-git config --global github.user "$GITHUB_ACTOR"
-git config --global user.name "$GITHUB_ACTOR"
-git config --global user.email "$GITHUB_ACTOR@github.com"
-
 #
 # UPDATE FILES
 #
diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh
index fff912b07..9c9cf1d19 100644
--- a/tools/repository_dispatch.sh
+++ b/tools/repository_dispatch.sh
@@ -14,7 +14,7 @@ commit=`echo "$payload" | jq -r '.commit'`
 builder=`echo "$payload" | jq -r '.builder'`
 arduino=`echo "$payload" | jq -r '.arduino'`
 
-echo "Action: $action, Branch: $branch, Tag: $tag, Commit: $commit, Builder: $builder, Arduino: $arduino"
+echo "Action: $action, Branch: $branch, Tag: $tag, Commit: $commit, Builder: $builder, Arduino: $arduino, Actor: $GITHUB_ACTOR"
 
 if [ ! "$action" == "deploy" ] && [ ! "$action" == "build" ]; then
     echo "Bad Action $action"

From 08eef9c9efc7dd2a986372d821dba524ccc4b8b9 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 12:54:30 +0300
Subject: [PATCH 20/42] Authenticate to the libs repo

---
 tools/config.sh            | 2 ++
 tools/update-components.sh | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/config.sh b/tools/config.sh
index e339f31ee..c35e1ee42 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -32,8 +32,10 @@ AR_USER="espressif"
 AR_REPO="$AR_USER/arduino-esp32"
 
 AR_REPO_URL="https://github.com/$AR_REPO.git"
+IDF_LIBS_REPO_URL="https://github.com/espressif/esp32-arduino-libs.git"
 if [ -n $GITHUB_TOKEN ]; then
 	AR_REPO_URL="https://$GITHUB_TOKEN@github.com/$AR_REPO.git"
+	IDF_LIBS_REPO_URL="https://$GITHUB_TOKEN@github.com/espressif/esp32-arduino-libs.git"
 fi
 
 AR_ROOT="$PWD"
diff --git a/tools/update-components.sh b/tools/update-components.sh
index d2cc7f2f3..f6cf986e8 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -10,7 +10,6 @@ INSIGHTS_REPO_URL="https://github.com/espressif/esp-insights.git"
 DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
 LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
 TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
-IDF_LIBS_REPO_URL="https://github.com/espressif/esp32-arduino-libs.git"
 
 #
 # CLONE/UPDATE ARDUINO

From dbf19e2b7e53347c831c8a3058180c8c8a068ec0 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 16:53:38 +0300
Subject: [PATCH 21/42] Attempt at splitting SDK from Arduino

---
 tools/add_sdk_json.py    | 128 +++++++++++++++++++++++++++
 tools/install-esp-idf.sh |   7 +-
 tools/push-to-arduino.sh | 187 +++++++++++++++++++++++++++++----------
 3 files changed, 271 insertions(+), 51 deletions(-)
 create mode 100644 tools/add_sdk_json.py

diff --git a/tools/add_sdk_json.py b/tools/add_sdk_json.py
new file mode 100644
index 000000000..dae269af9
--- /dev/null
+++ b/tools/add_sdk_json.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+__author__ = "Hristo Gochkov"
+__version__ = "2023"
+
+import os
+import shutil
+import errno
+import os.path
+import json
+import platform
+import sys
+import stat
+import argparse
+
+if sys.version_info[0] == 3:
+    unicode = lambda s: str(s)
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(
+        prog = 'add_sdk_json',
+        description = 'Update SDK in Arduino package index')
+    parser.add_argument('-j', '--pkg-json', dest='arduino_json',  required=True, help='path to package json')
+    parser.add_argument('-n', '--name',     dest='tool_name',     required=True, help='name of the SDK package')
+    parser.add_argument('-v', '--version',  dest='tool_version',  required=True, help='version of the new SDK')
+    parser.add_argument('-u', '--url',      dest='tool_url',      required=True, help='url to the zip of the new SDK')
+    parser.add_argument('-f', '--filename', dest='tool_filename', required=True, help='filename of the zip of the new SDK')
+    parser.add_argument('-s', '--size',     dest='tool_size',     required=True, help='size of the zip of the new SDK')
+    parser.add_argument('-c', '--sha',      dest='tool_sha',      required=True, help='sha256 of the zip of the new SDK')
+    args = parser.parse_args()
+
+    print('Destination   : {0}.'.format(args.arduino_json))
+    print('Tool Name     : {0}.'.format(args.tool_name))
+    print('Tool Version  : {0}.'.format(args.tool_version))
+    print('Tool URL      : {0}.'.format(args.tool_url))
+    print('Tool File Name: {0}.'.format(args.tool_filename))
+    print('Tool Size     : {0}.'.format(args.tool_size))
+    print('Tool SHA256   : {0}.'.format(args.tool_sha))
+
+    idf_path = args.idf_path;
+    arduino_json = args.arduino_json;
+    tool_name = args.tool_name;
+    tool_version = args.tool_version;
+    tool_url = args.tool_url;
+    tool_filename = args.tool_filename;
+    tool_size = args.tool_size;
+    tool_sha = args.tool_sha;
+
+    # code start
+    farray = {"packages":[{"platforms":[{"toolsDependencies":[]}],"tools":[]}]}
+    if os.path.isfile(arduino_json) == True:
+        farray = json.load(open(arduino_json))
+
+    dep_found = False
+    dep_skip = False
+    for dep in farray['packages'][0]['platforms'][0]['toolsDependencies']:
+        if dep['name'] == tool_name:
+            if dep['version'] == tool_version:
+                print('Skipping {0}. Same version {1}'.format(tool_name, tool_version))
+                dep_skip = True
+                break
+            print('Updating dependency version of {0} from {1} to {2}'.format(tool_name, dep['version'], tool_version))
+            dep['version'] = tool_version
+            dep_found = True
+            break
+
+    if dep_skip == False:
+        if dep_found == False:
+            print('Adding new dependency: {0} version {1}'.format(tool_name, tool_version))
+            deps = {
+                "packager": "esp32",
+                "name": tool_name,
+                "version": tool_version
+            }
+            farray['packages'][0]['platforms'][0]['toolsDependencies'].append(deps)
+
+        systems = []
+        system = {
+            "host": '',
+            "url": tool_url,
+            "archiveFileName": tool_filename,
+            "checksum": "SHA-256:"+tool_sha,
+            "size": str(tool_size)
+        }
+
+        system["host"] = "i686-mingw32";
+        systems.append(system)
+        system["host"] = "x86_64-mingw32";
+        systems.append(system)
+        system["host"] = "arm64-apple-darwin";
+        systems.append(system)
+        system["host"] = "x86_64-apple-darwin";
+        systems.append(system)
+        system["host"] = "x86_64-pc-linux-gnu";
+        systems.append(system)
+        system["host"] = "i686-pc-linux-gnu";
+        systems.append(system)
+        system["host"] = "aarch64-linux-gnu";
+        systems.append(system)
+        system["host"] = "arm-linux-gnueabihf";
+        systems.append(system)
+
+        tool_found = False
+        for t in farray['packages'][0]['tools']:
+            if t['name'] == tool_name:
+                t['version'] = tool_version
+                t['systems'] = systems
+                tool_found = True
+                print('Updating systems of {0} to version {1}'.format(tool_name, tool_version))
+                break
+
+        if tool_found == False:
+            print('Adding new tool: {0} version {1}'.format(tool_name, tool_version))
+            tools = {
+                "name": tool_name,
+                "version": tool_version,
+                "systems": systems
+            }
+            farray['packages'][0]['tools'].append(tools)
+
+        json_str = json.dumps(farray, indent=2)
+        with open(arduino_json, "w") as f:
+            f.write(json_str+"\n")
+            f.close()
+        # print(json_str)
+        print('{0} generated'.format(arduino_json))
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index ceb8cbfe6..f88b069f5 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -58,6 +58,7 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 		AR_NEW_COMMIT_MESSAGE="IDF $IDF_COMMIT"
 		AR_NEW_PR_TITLE="$AR_NEW_COMMIT_MESSAGE"
 	fi
+	LIBS_VERSION="idf-$IDF_BRANCH-$IDF_COMMIT"
 
 	AR_HAS_COMMIT=`git_commit_exists "$AR_COMPS/arduino" "$AR_NEW_COMMIT_MESSAGE"`
 	AR_HAS_BRANCH=`git_branch_exists "$AR_COMPS/arduino" "$AR_NEW_BRANCH_NAME"`
@@ -80,11 +81,6 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 		exit 0
 	fi
 
-	# setup git for pushing
-	git config --global github.user "$GITHUB_ACTOR"
-	git config --global user.name "$GITHUB_ACTOR"
-	git config --global user.email "$GITHUB_ACTOR@github.com"
-
 	export AR_NEW_BRANCH_NAME
 	export AR_NEW_COMMIT_MESSAGE
 	export AR_NEW_PR_TITLE
@@ -93,6 +89,7 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 	export AR_HAS_BRANCH
 	export AR_HAS_PR
 
+	export LIBS_VERSION
 	export LIBS_HAS_COMMIT
 	export LIBS_HAS_BRANCH
 fi
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index 01f0b59d5..36d38ca21 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -11,66 +11,71 @@ if ! [ -d "$AR_COMPS/arduino" ]; then
 	exit 1
 fi
 
+# setup git for pushing
+git config --global github.user "$GITHUB_ACTOR"
+git config --global user.name "$GITHUB_ACTOR"
+git config --global user.email "$GITHUB_ACTOR@github.com"
+
 #
 # UPDATE FILES
 #
 
-if [ $AR_HAS_COMMIT == "0" ]; then
-	# create or checkout the branch
-	if [ ! $AR_HAS_BRANCH == "0" ]; then
-		echo "Switching to arduino branch '$AR_NEW_BRANCH_NAME'..."
-		git -C "$AR_COMPS/arduino" checkout $AR_NEW_BRANCH_NAME
-	else
-		echo "Creating arduino branch '$AR_NEW_BRANCH_NAME'..."
-		git -C "$AR_COMPS/arduino" checkout -b $AR_NEW_BRANCH_NAME
-	fi
-	if [ $? -ne 0 ]; then
-	    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
-		exit 1
-	fi
+# if [ $AR_HAS_COMMIT == "0" ]; then
+# 	# create or checkout the branch
+# 	if [ ! $AR_HAS_BRANCH == "0" ]; then
+# 		echo "Switching to arduino branch '$AR_NEW_BRANCH_NAME'..."
+# 		git -C "$AR_COMPS/arduino" checkout $AR_NEW_BRANCH_NAME
+# 	else
+# 		echo "Creating arduino branch '$AR_NEW_BRANCH_NAME'..."
+# 		git -C "$AR_COMPS/arduino" checkout -b $AR_NEW_BRANCH_NAME
+# 	fi
+# 	if [ $? -ne 0 ]; then
+# 	    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
+# 		exit 1
+# 	fi
 
-	# make changes to the files
-	echo "Patching files in branch '$AR_NEW_BRANCH_NAME'..."
-	ESP32_ARDUINO="$AR_COMPS/arduino" ./tools/copy-to-arduino.sh
+# 	# make changes to the files
+# 	echo "Patching files in branch '$AR_NEW_BRANCH_NAME'..."
+# 	ESP32_ARDUINO="$AR_COMPS/arduino" ./tools/copy-to-arduino.sh
 	
-	cd $AR_COMPS/arduino
+# 	cd $AR_COMPS/arduino
 
-	# did any of the files change?
-	if [ -n "$(git status --porcelain)" ]; then
-		echo "Pushing changes to branch '$AR_NEW_BRANCH_NAME'..."
-	    git add . && git commit --message "$AR_NEW_COMMIT_MESSAGE" && git push -u origin $AR_NEW_BRANCH_NAME
-		if [ $? -ne 0 ]; then
-		    echo "ERROR: Pushing to branch '$AR_NEW_BRANCH_NAME' failed"
-			exit 1
-		fi
-	else
-	    echo "No changes in branch '$AR_NEW_BRANCH_NAME'"
-	    if [ $AR_HAS_BRANCH == "0" ]; then
-	    	echo "Delete created branch '$AR_NEW_BRANCH_NAME'"
-	    	git branch -d $AR_NEW_BRANCH_NAME
-	    fi
-	    exit 0
-	fi
+# 	# did any of the files change?
+# 	if [ -n "$(git status --porcelain)" ]; then
+# 		echo "Pushing changes to branch '$AR_NEW_BRANCH_NAME'..."
+# 	    git add . && git commit --message "$AR_NEW_COMMIT_MESSAGE" && git push -u origin $AR_NEW_BRANCH_NAME
+# 		if [ $? -ne 0 ]; then
+# 		    echo "ERROR: Pushing to branch '$AR_NEW_BRANCH_NAME' failed"
+# 			exit 1
+# 		fi
+# 	else
+# 	    echo "No changes in branch '$AR_NEW_BRANCH_NAME'"
+# 	    if [ $AR_HAS_BRANCH == "0" ]; then
+# 	    	echo "Delete created branch '$AR_NEW_BRANCH_NAME'"
+# 	    	git branch -d $AR_NEW_BRANCH_NAME
+# 	    fi
+# 	    exit 0
+# 	fi
 
-	# CREATE PULL REQUEST
-	if [ "$AR_HAS_PR" == "0" ]; then
-		echo "Creating PR '$AR_NEW_PR_TITLE'..."
-		pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
-		if [ $pr_created == "0" ]; then
-			echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" | jq -r '.message'`": "`echo "$git_create_pr_res" | jq -r '.errors[].message'`
-			exit 1
-		fi
-	else
-		echo "PR '$AR_NEW_PR_TITLE' Already Exists"
-	fi
-fi
+# 	# CREATE PULL REQUEST
+# 	if [ "$AR_HAS_PR" == "0" ]; then
+# 		echo "Creating PR '$AR_NEW_PR_TITLE'..."
+# 		pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
+# 		if [ $pr_created == "0" ]; then
+# 			echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" | jq -r '.message'`": "`echo "$git_create_pr_res" | jq -r '.errors[].message'`
+# 			exit 1
+# 		fi
+# 	else
+# 		echo "PR '$AR_NEW_PR_TITLE' Already Exists"
+# 	fi
+# fi
 
 #
 # esp32-arduino-libs
 #
-cd "$AR_ROOT"
 
 if [ $LIBS_HAS_COMMIT == "0" ]; then
+	cd "$AR_ROOT"
 	# create branch if necessary
 	if [ "$LIBS_HAS_BRANCH" == "1" ]; then
 		echo "Branch '$AR_NEW_BRANCH_NAME' Already Exists"
@@ -90,6 +95,9 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 	rm -rf $IDF_LIBS_DIR/sdk && cp -Rf $AR_TOOLS/sdk $IDF_LIBS_DIR/
 	
 	cd $IDF_LIBS_DIR
+	if [ -f "README.md" ]; then
+		rm -rf "README.md"
+	fi
 
 	# did any of the files change?
 	if [ -n "$(git status --porcelain)" ]; then
@@ -99,6 +107,38 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 		    echo "ERROR: Pushing to branch '$AR_NEW_BRANCH_NAME' failed"
 			exit 1
 		fi
+		IDF_LIBS_COMMIT=`git rev-parse --verify HEAD`
+		IDF_LIBS_DL_URL="https://github.com/espressif/esp32-arduino-libs/archive/$IDF_LIBS_COMMIT.zip"
+		# ToDo: this URL needs to get into Arduino's package.json
+
+		# Download the file
+		filename=$(basename "$IDF_LIBS_DL_URL")
+		curl -s -O "$IDF_LIBS_DL_URL"
+
+		# Check if the download was successful
+		if [ $? -ne 0 ]; then
+		  echo "Error downloading file from $IDF_LIBS_DL_URL"
+		  exit 1
+		fi
+
+		# Calculate the size in bytes and SHA-256 sum
+		size=$(stat -c%s "$filename")
+		sha256sum=$(sha256sum "$filename" | awk '{print $1}')
+
+		# Clean up the downloaded file
+		rm "$filename"
+
+		# Print the results
+		echo "Tool: esp32-arduino-libs"
+		echo "Version: $LIBS_VERSION"
+		echo "URL: $IDF_LIBS_DL_URL"
+		echo "File: $filename"
+		echo "Size: $size bytes"
+		echo "SHA-256: $sha256sum"
+		echo "JSON: $AR_OUT/package_esp32_index.template.json"
+		python3 tools/add_sdk_json.py -j "$AR_OUT/package_esp32_index.template.json" -n "esp32-arduino-libs" -v "$LIBS_VERSION" -u "$IDF_LIBS_DL_URL" -f "$filename" -s "$size" -c "$sha256sum"
+		if [ $? -ne 0 ]; then exit 1; fi
+
 	else
 	    echo "No changes in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'"
 	    if [ $LIBS_HAS_BRANCH == "0" ]; then
@@ -109,5 +149,60 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 	fi
 fi
 
+# https://github.com/espressif/esp32-arduino-libs/archive/refs/heads/[branch].zip
+# https://github.com/espressif/esp32-arduino-libs/archive/refs/tags/[tag].zip
+# https://github.com/espressif/esp32-arduino-libs/archive/[commit_hash].zip
+
+if [ $AR_HAS_COMMIT == "0" ]; then
+	cd "$AR_ROOT"
+	# create or checkout the branch
+	if [ ! $AR_HAS_BRANCH == "0" ]; then
+		echo "Switching to arduino branch '$AR_NEW_BRANCH_NAME'..."
+		git -C "$AR_COMPS/arduino" checkout $AR_NEW_BRANCH_NAME
+	else
+		echo "Creating arduino branch '$AR_NEW_BRANCH_NAME'..."
+		git -C "$AR_COMPS/arduino" checkout -b $AR_NEW_BRANCH_NAME
+	fi
+	if [ $? -ne 0 ]; then
+	    echo "ERROR: Checkout of branch '$AR_NEW_BRANCH_NAME' failed"
+		exit 1
+	fi
+
+	# make changes to the files
+	echo "Patching files in branch '$AR_NEW_BRANCH_NAME'..."
+	rm -rf "$AR_COMPS/arduino/tools/sdk"
+	rm -rf "$AR_COMPS/arduino/package/package_esp32_index.template.json" && cp -f "$AR_OUT/package_esp32_index.template.json" "$AR_COMPS/arduino/package/package_esp32_index.template.json"
+	
+	cd $AR_COMPS/arduino
+
+	# did any of the files change?
+	if [ -n "$(git status --porcelain)" ]; then
+		echo "Pushing changes to branch '$AR_NEW_BRANCH_NAME'..."
+	    git add . && git commit --message "$AR_NEW_COMMIT_MESSAGE" && git push -u origin $AR_NEW_BRANCH_NAME
+		if [ $? -ne 0 ]; then
+		    echo "ERROR: Pushing to branch '$AR_NEW_BRANCH_NAME' failed"
+			exit 1
+		fi
+	else
+	    echo "No changes in branch '$AR_NEW_BRANCH_NAME'"
+	    if [ $AR_HAS_BRANCH == "0" ]; then
+	    	echo "Delete created branch '$AR_NEW_BRANCH_NAME'"
+	    	git branch -d $AR_NEW_BRANCH_NAME
+	    fi
+	    exit 0
+	fi
+
+	# CREATE PULL REQUEST
+	if [ "$AR_HAS_PR" == "0" ]; then
+		echo "Creating PR '$AR_NEW_PR_TITLE'..."
+		pr_created=`git_create_pr "$AR_NEW_BRANCH_NAME" "$AR_NEW_PR_TITLE" "$AR_PR_TARGET_BRANCH"`
+		if [ $pr_created == "0" ]; then
+			echo "ERROR: Failed to create PR '$AR_NEW_PR_TITLE': "`echo "$git_create_pr_res" | jq -r '.message'`": "`echo "$git_create_pr_res" | jq -r '.errors[].message'`
+			exit 1
+		fi
+	else
+		echo "PR '$AR_NEW_PR_TITLE' Already Exists"
+	fi
+fi
 
 exit 0

From 846dc299f7a35125066b308eeecaa21e06fe786c Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 19:15:51 +0300
Subject: [PATCH 22/42] Archive only the result and reorder deploy commands

---
 build.sh                     | 18 +++++++++++-------
 tools/archive-build.sh       |  8 ++++----
 tools/install-esp-idf.sh     |  2 +-
 tools/repository_dispatch.sh | 10 +++++++---
 4 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/build.sh b/build.sh
index 4dc1d0a70..0af3871d8 100755
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,9 @@ TARGET="all"
 BUILD_TYPE="all"
 SKIP_ENV=0
 COPY_OUT=0
-DEPLOY_OUT=0
+if [ -z $DEPLOY_OUT ]; then
+    DEPLOY_OUT=0
+fi
 
 function print_help() {
     echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|reconfigure|idf_libs|copy_bootloader|mem_variant>] [config ...]"
@@ -195,17 +197,19 @@ if [ "$BUILD_TYPE" = "all" ]; then
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
-# archive the build
-if [ "$BUILD_TYPE" = "all" ]; then
-    ./tools/archive-build.sh
-    if [ $? -ne 0 ]; then exit 1; fi
-fi
-
 # copy everything to arduino-esp32 installation
 if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
     ./tools/copy-to-arduino.sh
+    if [ $? -ne 0 ]; then exit 1; fi
 fi
 
 if [ $DEPLOY_OUT -eq 1 ]; then
     ./tools/push-to-arduino.sh
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
+
+# archive the build
+if [ "$BUILD_TYPE" = "all" ]; then
+    ./tools/archive-build.sh
+    if [ $? -ne 0 ]; then exit 1; fi
 fi
diff --git a/tools/archive-build.sh b/tools/archive-build.sh
index 432f69031..7a5afc5da 100755
--- a/tools/archive-build.sh
+++ b/tools/archive-build.sh
@@ -5,12 +5,12 @@ IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH"
 
 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"
+# build_archive_path="dist/arduino-esp32-build-$idf_version_string.tar.gz"
 
 mkdir -p dist && rm -rf "$archive_path" "$build_archive_path"
 if [ -d "out" ]; then
 	cd out && tar zcf "../$archive_path" * && cd ..
 fi
-if [ -d "build" ]; then
-	cd build && tar zcf "../$build_archive_path" * && cd ..
-fi
+# if [ -d "build" ]; then
+# 	cd build && tar zcf "../$build_archive_path" * && cd ..
+# fi
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index f88b069f5..ec73eb4ee 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -58,7 +58,7 @@ if [ "$GITHUB_EVENT_NAME" == "schedule" ] || [ "$GITHUB_EVENT_NAME" == "reposito
 		AR_NEW_COMMIT_MESSAGE="IDF $IDF_COMMIT"
 		AR_NEW_PR_TITLE="$AR_NEW_COMMIT_MESSAGE"
 	fi
-	LIBS_VERSION="idf-$IDF_BRANCH-$IDF_COMMIT"
+	LIBS_VERSION="idf-"${IDF_BRANCH//\//_}"-$IDF_COMMIT"
 
 	AR_HAS_COMMIT=`git_commit_exists "$AR_COMPS/arduino" "$AR_NEW_COMMIT_MESSAGE"`
 	AR_HAS_BRANCH=`git_branch_exists "$AR_COMPS/arduino" "$AR_NEW_BRANCH_NAME"`
diff --git a/tools/repository_dispatch.sh b/tools/repository_dispatch.sh
index 9c9cf1d19..15198e98e 100644
--- a/tools/repository_dispatch.sh
+++ b/tools/repository_dispatch.sh
@@ -42,8 +42,12 @@ if [ ! "$arduino" == "" ] && [ ! "$arduino" == "null" ]; then
     export AR_BRANCH="$arduino"
 fi
 
-source ./build.sh
-
 if [ "$action" == "deploy" ]; then
-    bash ./tools/push-to-arduino.sh
+    DEPLOY_OUT=1
 fi
+
+source ./build.sh
+
+# if [ "$action" == "deploy" ]; then
+#     bash ./tools/push-to-arduino.sh
+# fi

From 4e718665b3d451da9247943a526b167972b8ba94 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 19:17:17 +0300
Subject: [PATCH 23/42] Update cron.sh

---
 tools/cron.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/cron.sh b/tools/cron.sh
index 6122b1eed..2a3fb88cd 100644
--- a/tools/cron.sh
+++ b/tools/cron.sh
@@ -6,5 +6,6 @@ if [ ! "$GITHUB_EVENT_NAME" == "schedule" ]; then
 fi
 
 git checkout "$IDF_BRANCH" #local branches should match what the matrix wants to build
+DEPLOY_OUT=1
 source ./build.sh
-bash ./tools/push-to-arduino.sh
+# bash ./tools/push-to-arduino.sh

From ae1bfb5462a7d39b06901b549df2981fa38c7e84 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Wed, 12 Apr 2023 21:01:54 +0300
Subject: [PATCH 24/42] Fix script and zip paths

---
 tools/push-to-arduino.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index 36d38ca21..58d1c2f8a 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -112,7 +112,7 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 		# ToDo: this URL needs to get into Arduino's package.json
 
 		# Download the file
-		filename=$(basename "$IDF_LIBS_DL_URL")
+		filename="esp32-arduino-libs-$IDF_LIBS_COMMIT.zip"
 		curl -s -O "$IDF_LIBS_DL_URL"
 
 		# Check if the download was successful
@@ -136,6 +136,7 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 		echo "Size: $size bytes"
 		echo "SHA-256: $sha256sum"
 		echo "JSON: $AR_OUT/package_esp32_index.template.json"
+		cd "$AR_ROOT"
 		python3 tools/add_sdk_json.py -j "$AR_OUT/package_esp32_index.template.json" -n "esp32-arduino-libs" -v "$LIBS_VERSION" -u "$IDF_LIBS_DL_URL" -f "$filename" -s "$size" -c "$sha256sum"
 		if [ $? -ne 0 ]; then exit 1; fi
 

From 8b4c2c9bdf83d3a158d10cf2b24016d20b60e394 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Thu, 13 Apr 2023 00:14:30 +0300
Subject: [PATCH 25/42] Fix download URL and json merger

---
 tools/add_sdk_json.py    | 1 -
 tools/push-to-arduino.sh | 8 ++------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/tools/add_sdk_json.py b/tools/add_sdk_json.py
index dae269af9..c8216f11c 100644
--- a/tools/add_sdk_json.py
+++ b/tools/add_sdk_json.py
@@ -39,7 +39,6 @@
     print('Tool Size     : {0}.'.format(args.tool_size))
     print('Tool SHA256   : {0}.'.format(args.tool_sha))
 
-    idf_path = args.idf_path;
     arduino_json = args.arduino_json;
     tool_name = args.tool_name;
     tool_version = args.tool_version;
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index 58d1c2f8a..168fadf6e 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -108,12 +108,12 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 			exit 1
 		fi
 		IDF_LIBS_COMMIT=`git rev-parse --verify HEAD`
-		IDF_LIBS_DL_URL="https://github.com/espressif/esp32-arduino-libs/archive/$IDF_LIBS_COMMIT.zip"
+		IDF_LIBS_DL_URL="https://codeload.github.com/espressif/esp32-arduino-libs/zip/$IDF_LIBS_COMMIT"
 		# ToDo: this URL needs to get into Arduino's package.json
 
 		# Download the file
 		filename="esp32-arduino-libs-$IDF_LIBS_COMMIT.zip"
-		curl -s -O "$IDF_LIBS_DL_URL"
+		curl -s -o "$filename" "$IDF_LIBS_DL_URL"
 
 		# Check if the download was successful
 		if [ $? -ne 0 ]; then
@@ -150,10 +150,6 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 	fi
 fi
 
-# https://github.com/espressif/esp32-arduino-libs/archive/refs/heads/[branch].zip
-# https://github.com/espressif/esp32-arduino-libs/archive/refs/tags/[tag].zip
-# https://github.com/espressif/esp32-arduino-libs/archive/[commit_hash].zip
-
 if [ $AR_HAS_COMMIT == "0" ]; then
 	cd "$AR_ROOT"
 	# create or checkout the branch

From 6a16048ec460271c6d3b08598933fe3b971ff267 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Thu, 13 Apr 2023 11:15:08 +0300
Subject: [PATCH 26/42] Change sdk folder structure and fix json generation

---
 tools/add_sdk_json.py    | 42 +++++++++++++++++-----------------------
 tools/push-to-arduino.sh |  2 +-
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/tools/add_sdk_json.py b/tools/add_sdk_json.py
index c8216f11c..d2deb4a87 100644
--- a/tools/add_sdk_json.py
+++ b/tools/add_sdk_json.py
@@ -18,6 +18,16 @@
 if sys.version_info[0] == 3:
     unicode = lambda s: str(s)
 
+def add_system(systems, host, url, filename, sha, size):
+    system = {
+        "host": host,
+        "url": url,
+        "archiveFileName": filename,
+        "checksum": "SHA-256:"+sha,
+        "size": str(size)
+    }
+    systems.append(system)
+
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(
         prog = 'add_sdk_json',
@@ -76,30 +86,14 @@
             farray['packages'][0]['platforms'][0]['toolsDependencies'].append(deps)
 
         systems = []
-        system = {
-            "host": '',
-            "url": tool_url,
-            "archiveFileName": tool_filename,
-            "checksum": "SHA-256:"+tool_sha,
-            "size": str(tool_size)
-        }
-
-        system["host"] = "i686-mingw32";
-        systems.append(system)
-        system["host"] = "x86_64-mingw32";
-        systems.append(system)
-        system["host"] = "arm64-apple-darwin";
-        systems.append(system)
-        system["host"] = "x86_64-apple-darwin";
-        systems.append(system)
-        system["host"] = "x86_64-pc-linux-gnu";
-        systems.append(system)
-        system["host"] = "i686-pc-linux-gnu";
-        systems.append(system)
-        system["host"] = "aarch64-linux-gnu";
-        systems.append(system)
-        system["host"] = "arm-linux-gnueabihf";
-        systems.append(system)
+        add_system(systems, "i686-mingw32", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "x86_64-mingw32", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "arm64-apple-darwin", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "x86_64-apple-darwin", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "x86_64-pc-linux-gnu", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "i686-pc-linux-gnu", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "aarch64-linux-gnu", tool_url, tool_filename, tool_sha, tool_size)
+        add_system(systems, "arm-linux-gnueabihf", tool_url, tool_filename, tool_sha, tool_size)
 
         tool_found = False
         for t in farray['packages'][0]['tools']:
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index 168fadf6e..e6b9453c0 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -92,7 +92,7 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 
 	# make changes to the files
 	echo "Patching files in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
-	rm -rf $IDF_LIBS_DIR/sdk && cp -Rf $AR_TOOLS/sdk $IDF_LIBS_DIR/
+	rm -rf $IDF_LIBS_DIR/* && cp -Rf $AR_TOOLS/sdk/* $IDF_LIBS_DIR/
 	
 	cd $IDF_LIBS_DIR
 	if [ -f "README.md" ]; then

From 361e98aa20a4ce9dad478b3151d1ebe0df8d1634 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Thu, 13 Apr 2023 12:44:19 +0300
Subject: [PATCH 27/42] Switch output folder from sdk to esp32-arduino-libs

---
 build.sh                 | 8 ++++----
 tools/config.sh          | 6 +++---
 tools/copy-to-arduino.sh | 4 ++--
 tools/push-to-arduino.sh | 3 +--
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/build.sh b/build.sh
index 0af3871d8..a5ea518e2 100755
--- a/build.sh
+++ b/build.sh
@@ -126,17 +126,17 @@ fi
 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"
+mkdir -p "$AR_TOOLS/esp32-arduino-libs" && rm -rf version.txt && rm -rf "$AR_TOOLS/esp32-arduino-libs/versions.txt"
 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"
+echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/esp32-arduino-libs/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" 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"
+        echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/esp32-arduino-libs/versions.txt"
     fi
 done
 component_version="tinyusb: "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" symbolic-ref --short HEAD || git -C "$AR_COMPS/arduino_tinyusb/tinyusb" tag --points-at HEAD)" "$(git -C "$AR_COMPS/arduino_tinyusb/tinyusb" rev-parse --short HEAD)
-echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/sdk/versions.txt"
+echo $component_version >> version.txt && echo $component_version >> "$AR_TOOLS/esp32-arduino-libs/versions.txt"
 
 #targets_count=`jq -c '.targets[] | length' configs/builds.json`
 for target_json in `jq -c '.targets[]' configs/builds.json`; do
diff --git a/tools/config.sh b/tools/config.sh
index c35e1ee42..96d04d054 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -44,9 +44,9 @@ AR_OUT="$AR_ROOT/out"
 AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
-AR_SDK="$AR_TOOLS/sdk/$IDF_TARGET"
-PIO_SDK="FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\""
-TOOLS_JSON_OUT="$AR_TOOLS/sdk"
+AR_SDK="$AR_TOOLS/esp32-arduino-libs/$IDF_TARGET"
+PIO_SDK="FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\""
+TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
 IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
 
 function get_os(){
diff --git a/tools/copy-to-arduino.sh b/tools/copy-to-arduino.sh
index 2ed90fa9b..96092e068 100755
--- a/tools/copy-to-arduino.sh
+++ b/tools/copy-to-arduino.sh
@@ -19,5 +19,5 @@ echo "Installing new libraries to $ESP32_ARDUINO"
 rm -rf $ESP32_ARDUINO/package/package_esp32_index.template.json && \
 cp -f $AR_OUT/package_esp32_index.template.json $ESP32_ARDUINO/package/package_esp32_index.template.json
 
-rm -rf $ESP32_ARDUINO/tools/sdk && \
-cp -Rf $AR_TOOLS/sdk $ESP32_ARDUINO/tools/
+rm -rf $ESP32_ARDUINO/tools/esp32-arduino-libs && \
+cp -Rf $AR_TOOLS/esp32-arduino-libs $ESP32_ARDUINO/tools/
diff --git a/tools/push-to-arduino.sh b/tools/push-to-arduino.sh
index e6b9453c0..d66e7c3c1 100755
--- a/tools/push-to-arduino.sh
+++ b/tools/push-to-arduino.sh
@@ -92,7 +92,7 @@ if [ $LIBS_HAS_COMMIT == "0" ]; then
 
 	# make changes to the files
 	echo "Patching files in esp32-arduino-libs branch '$AR_NEW_BRANCH_NAME'..."
-	rm -rf $IDF_LIBS_DIR/* && cp -Rf $AR_TOOLS/sdk/* $IDF_LIBS_DIR/
+	rm -rf $IDF_LIBS_DIR/* && cp -Rf $AR_TOOLS/esp32-arduino-libs/* $IDF_LIBS_DIR/
 	
 	cd $IDF_LIBS_DIR
 	if [ -f "README.md" ]; then
@@ -167,7 +167,6 @@ if [ $AR_HAS_COMMIT == "0" ]; then
 
 	# make changes to the files
 	echo "Patching files in branch '$AR_NEW_BRANCH_NAME'..."
-	rm -rf "$AR_COMPS/arduino/tools/sdk"
 	rm -rf "$AR_COMPS/arduino/package/package_esp32_index.template.json" && cp -f "$AR_OUT/package_esp32_index.template.json" "$AR_COMPS/arduino/package/package_esp32_index.template.json"
 	
 	cd $AR_COMPS/arduino

From 4e9db6158125bb3ec7c0481c431e28e69e383c66 Mon Sep 17 00:00:00 2001
From: Luca Burelli <pil@iol.it>
Date: Wed, 19 Apr 2023 23:41:48 +0200
Subject: [PATCH 28/42] arduino_tinyusb: compile support for DFU mode (#116)

---
 components/arduino_tinyusb/CMakeLists.txt     |  1 +
 components/arduino_tinyusb/Kconfig.projbuild  | 25 +++++++++++++++++++
 .../arduino_tinyusb/include/tusb_config.h     |  8 ++++++
 3 files changed, 34 insertions(+)

diff --git a/components/arduino_tinyusb/CMakeLists.txt b/components/arduino_tinyusb/CMakeLists.txt
index 0872021eb..97591440f 100755
--- a/components/arduino_tinyusb/CMakeLists.txt
+++ b/components/arduino_tinyusb/CMakeLists.txt
@@ -28,6 +28,7 @@ if(CONFIG_TINYUSB_ENABLED)
       "${COMPONENT_DIR}/tinyusb/src/class/msc/msc_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/video/video_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/dfu/dfu_rt_device.c"
+      "${COMPONENT_DIR}/tinyusb/src/class/dfu/dfu_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/vendor/vendor_device.c"
       "${COMPONENT_DIR}/tinyusb/src/common/tusb_fifo.c"
       "${COMPONENT_DIR}/tinyusb/src/device/usbd_control.c"
diff --git a/components/arduino_tinyusb/Kconfig.projbuild b/components/arduino_tinyusb/Kconfig.projbuild
index a6abd4d8a..80983657f 100755
--- a/components/arduino_tinyusb/Kconfig.projbuild
+++ b/components/arduino_tinyusb/Kconfig.projbuild
@@ -175,6 +175,31 @@ menu "Arduino TinyUSB"
 
     endmenu
 
+    menu "DFU driver"
+        depends on TINYUSB_ENABLED
+
+        config TINYUSB_DFU_ENABLED
+            bool "Enable USB DFU TinyUSB driver"
+            default y
+            help
+                Enable USB DFU TinyUSB driver.
+
+        config TINYUSB_DESC_DFU_STRING
+            string "DFU Device String"
+            default "Espressif DFU Device"
+            depends on TINYUSB_DFU_ENABLED
+            help
+                Specify name of the DFU device
+
+        config TINYUSB_DFU_BUFSIZE
+            int "DFU buffer size"
+            default 4096
+            depends on TINYUSB_DFU_ENABLED
+            help
+                DFU buffer size
+
+    endmenu
+
     menu "VENDOR driver"
         depends on TINYUSB_ENABLED
 
diff --git a/components/arduino_tinyusb/include/tusb_config.h b/components/arduino_tinyusb/include/tusb_config.h
index a5a0afd32..ee1e5d270 100755
--- a/components/arduino_tinyusb/include/tusb_config.h
+++ b/components/arduino_tinyusb/include/tusb_config.h
@@ -64,6 +64,10 @@ extern "C" {
 #   define CONFIG_TINYUSB_DFU_RT_ENABLED 0
 #endif
 
+#ifndef CONFIG_TINYUSB_DFU_ENABLED
+#   define CONFIG_TINYUSB_DFU_ENABLED 0
+#endif
+
 #ifndef CONFIG_TINYUSB_VENDOR_ENABLED
 #   define CONFIG_TINYUSB_VENDOR_ENABLED 0
 #endif
@@ -106,6 +110,7 @@ extern "C" {
 #define CFG_TUD_VIDEO               CONFIG_TINYUSB_VIDEO_ENABLED
 #define CFG_TUD_CUSTOM_CLASS 		CONFIG_TINYUSB_CUSTOM_CLASS_ENABLED
 #define CFG_TUD_DFU_RUNTIME			CONFIG_TINYUSB_DFU_RT_ENABLED
+#define CFG_TUD_DFU					CONFIG_TINYUSB_DFU_ENABLED
 #define CFG_TUD_VENDOR 				CONFIG_TINYUSB_VENDOR_ENABLED
 
 // CDC FIFO size of TX and RX
@@ -126,6 +131,9 @@ extern "C" {
 #define CFG_TUD_VIDEO_STREAMING     CONFIG_TINYUSB_VIDEO_STREAMING_IFS
 #define CFG_TUD_VIDEO_STREAMING_EP_BUFSIZE  CONFIG_TINYUSB_VIDEO_STREAMING_BUFSIZE
 
+// DFU buffer size
+#define CFG_TUD_DFU_XFER_BUFSIZE	CONFIG_TINYUSB_DFU_BUFSIZE
+
 // VENDOR FIFO size of TX and RX
 #define CFG_TUD_VENDOR_RX_BUFSIZE 	CONFIG_TINYUSB_VENDOR_RX_BUFSIZE
 #define CFG_TUD_VENDOR_TX_BUFSIZE 	CONFIG_TINYUSB_VENDOR_TX_BUFSIZE

From 2cd35e73444409d9eb69a8e82baadfe36a6a2d34 Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros@users.noreply.github.com>
Date: Fri, 28 Apr 2023 11:56:16 +0300
Subject: [PATCH 29/42] Update PlatformIO build script templates (#118)

Adds support for new package with precompiled SDK libraries
---
 configs/pio_end.txt   | 6 +++---
 configs/pio_start.txt | 5 +++++
 tools/config.sh       | 2 +-
 tools/copy-libs.sh    | 6 +++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/configs/pio_end.txt b/configs/pio_end.txt
index 3190217a1..e7544f1dd 100644
--- a/configs/pio_end.txt
+++ b/configs/pio_end.txt
@@ -2,9 +2,9 @@
         "ESP32",
         ("F_CPU", "$BOARD_F_CPU"),
         ("ARDUINO", 10812),
-        ("ARDUINO_VARIANT", '\\"%s\\"' % env.BoardConfig().get("build.variant").replace('"', "")),
-        ("ARDUINO_BOARD", '\\"%s\\"' % env.BoardConfig().get("name").replace('"', "")),
-        "ARDUINO_PARTITION_%s" % basename(env.BoardConfig().get(
+        ("ARDUINO_VARIANT", '\\"%s\\"' % board_config.get("build.variant").replace('"', "")),
+        ("ARDUINO_BOARD", '\\"%s\\"' % board_config.get("name").replace('"', "")),
+        "ARDUINO_PARTITION_%s" % basename(board_config.get(
             "build.partitions", "default.csv")).replace(".csv", "").replace("-", "_")
     ]
 )
diff --git a/configs/pio_start.txt b/configs/pio_start.txt
index 010ba60aa..9a38020fb 100644
--- a/configs/pio_start.txt
+++ b/configs/pio_start.txt
@@ -31,5 +31,10 @@ from SCons.Script import DefaultEnvironment
 env = DefaultEnvironment()
 
 FRAMEWORK_DIR = env.PioPlatform().get_package_dir("framework-arduinoespressif32")
+FRAMEWORK_SDK_DIR = env.PioPlatform().get_package_dir(
+    "framework-arduinoespressif32-libs"
+)
+
+board_config = env.BoardConfig()
 
 env.Append(
diff --git a/tools/config.sh b/tools/config.sh
index 96d04d054..9b2fa3133 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -45,7 +45,7 @@ AR_TOOLS="$AR_OUT/tools"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/esp32-arduino-libs/$IDF_TARGET"
-PIO_SDK="FRAMEWORK_DIR, \"tools\", \"esp32-arduino-libs\", \"$IDF_TARGET\""
+PIO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
 TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
 IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
 
diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index 32992d624..fad66279e 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -404,8 +404,8 @@ for item; do
 		done
 	fi
 done
-echo "        join($PIO_SDK, env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"cores\", env.BoardConfig().get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")), \"include\")," >> "$AR_PLATFORMIO_PY"
+echo "        join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -429,7 +429,7 @@ done
 echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
 echo "        join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
 echo "        join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
-echo "        join($PIO_SDK, env.BoardConfig().get(\"build.arduino.memory_type\", (env.BoardConfig().get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_$OCT_PSRAM\")))" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 

From f7ccc89f48cb49d3e21c9e6add29be3bcd4e37de Mon Sep 17 00:00:00 2001
From: Valerii Koval <valeros@users.noreply.github.com>
Date: Thu, 4 May 2023 11:18:48 +0300
Subject: [PATCH 30/42] Autogenerate PlatformIO manifest file for prebuilt SDK
 libs (#119)

* Autogenerate PlatformIO manifest file for prebuilt SDK libs

- Add a special Python script that generates "package.json" with IDF revision from the "version.txt" according to SemVer

* Tidy up

* Refactor manifest generator

Now IDF version and commit hash are passed directly from Git client instead of reading from a pregenerated "version.txt" file
---
 build.sh                         |  6 +++
 tools/gen_platformio_manifest.py | 86 ++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 tools/gen_platformio_manifest.py

diff --git a/build.sh b/build.sh
index a5ea518e2..7465f04be 100755
--- a/build.sh
+++ b/build.sh
@@ -197,6 +197,12 @@ if [ "$BUILD_TYPE" = "all" ]; then
     if [ $? -ne 0 ]; then exit 1; fi
 fi
 
+# Generate PlatformIO manifest file
+if [ "$BUILD_TYPE" = "all" ]; then
+    python3 ./tools/gen_platformio_manifest.py -o "$TOOLS_JSON_OUT/" -s $(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD) -c $(git -C "$IDF_PATH" rev-parse --short HEAD)
+    if [ $? -ne 0 ]; then exit 1; fi
+fi
+
 # copy everything to arduino-esp32 installation
 if [ $COPY_OUT -eq 1 ] && [ -d "$ESP32_ARDUINO" ]; then
     ./tools/copy-to-arduino.sh
diff --git a/tools/gen_platformio_manifest.py b/tools/gen_platformio_manifest.py
new file mode 100644
index 000000000..2d031b687
--- /dev/null
+++ b/tools/gen_platformio_manifest.py
@@ -0,0 +1,86 @@
+import argparse
+import json
+import os
+import re
+import sys
+
+MANIFEST_DATA = {
+    "name": "framework-arduinoespressif32-libs",
+    "description": "Precompiled libraries for Arduino Wiring-based Framework for the Espressif ESP32 series of SoCs",
+    "keywords": ["framework", "arduino", "espressif", "esp32"],
+    "license": "LGPL-2.1-or-later",
+    "repository": {
+        "type": "git",
+        "url": "https://github.com/espressif/esp32-arduino-libs",
+    },
+}
+
+
+def convert_version(version_string):
+    """A helper function that converts a custom IDF version string
+    extracted from a Git repository to a suitable SemVer alternative. For example:
+    'release/v5.1' becomes '5.1.0',
+    'v7.7.7' becomes '7.7.7'
+    """
+
+    regex_pattern = (
+        r"v(?P<MAJOR>0|[1-9]\d*)\.(?P<MINOR>0|[1-9]\d*)\.*(?P<PATCH>0|[1-9]\d*)*"
+    )
+    match = re.search(regex_pattern, version_string)
+    if not match:
+        sys.stderr.write(
+            f"Failed to find a regex match for '{regex_pattern}' in '{version_string}'\n"
+        )
+        return ""
+
+    major, minor, patch = match.groups()
+    if not patch:
+        patch = "0"
+
+    return ".".join((major, minor, patch))
+
+
+def main(dst_dir, version_string, commit_hash):
+
+    converted_version = convert_version(version_string)
+    if not converted_version:
+        sys.stderr.write(f"Failed to convert version '{version_string}'\n")
+        return -1
+
+    manifest_file_path = os.path.join(dst_dir, "package.json")
+    with open(manifest_file_path, "w", encoding="utf8") as fp:
+        MANIFEST_DATA["version"] = f"{converted_version}+sha.{commit_hash}"
+        json.dump(MANIFEST_DATA, fp, indent=2)
+
+    print(
+        f"Generated PlatformIO manifest file '{manifest_file_path}' with '{converted_version}' version"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-o",
+        "--dst-dir",
+        dest="dst_dir",
+        required=True,
+        help="Destination folder where the 'package.json' manifest will be located",
+    )
+    parser.add_argument(
+        "-s",
+        "--version-string",
+        dest="version_string",
+        required=True,
+        help="ESP-IDF version string used for compiling libraries",
+    )
+    parser.add_argument(
+        "-c",
+        "--commit-hash",
+        dest="commit_hash",
+        required=True,
+        help="ESP-IDF revision in form of a commit hash",
+    )
+    args = parser.parse_args()
+
+    sys.exit(main(args.dst_dir, args.version_string, args.commit_hash))

From 690ecfc073f5eb270ef363224d1733937a728084 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Thu, 4 May 2023 11:20:38 +0300
Subject: [PATCH 31/42] Move IDF definitions to be available with any build

---
 tools/config.sh          | 5 +++++
 tools/install-esp-idf.sh | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/config.sh b/tools/config.sh
index 9b2fa3133..b1c09d108 100755
--- a/tools/config.sh
+++ b/tools/config.sh
@@ -49,6 +49,11 @@ PIO_SDK="FRAMEWORK_SDK_DIR, \"$IDF_TARGET\""
 TOOLS_JSON_OUT="$AR_TOOLS/esp32-arduino-libs"
 IDF_LIBS_DIR="$AR_ROOT/../esp32-arduino-libs"
 
+if [ -d "$IDF_PATH" ]; then
+	export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
+	export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
+fi
+
 function get_os(){
   	OSBITS=`arch`
   	if [[ "$OSTYPE" == "linux"* ]]; then
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
index ec73eb4ee..e3d7ebc03 100755
--- a/tools/install-esp-idf.sh
+++ b/tools/install-esp-idf.sh
@@ -33,6 +33,8 @@ fi
 if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
 	git -C $IDF_PATH submodule update --init --recursive
 	$IDF_PATH/install.sh
+	export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
+	export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
 fi
 
 #
@@ -40,8 +42,6 @@ fi
 #
 
 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 || git -C "$IDF_PATH" tag --points-at HEAD)
 
 #
 # SETUP ARDUINO DEPLOY

From 5ac6498723b9e1fd2ee86552c2d93d7cf7bb7078 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Fri, 12 May 2023 21:08:07 +0300
Subject: [PATCH 32/42] Use more components from registry and add mp3 decoder

---
 build.sh                   |  6 +++++
 main/idf_component.yml     | 17 +++++++------
 partitions.csv             |  4 +--
 tools/update-components.sh | 52 +++++++++++++++++++-------------------
 4 files changed, 43 insertions(+), 36 deletions(-)

diff --git a/build.sh b/build.sh
index 7465f04be..35de53f61 100755
--- a/build.sh
+++ b/build.sh
@@ -91,9 +91,15 @@ if [ $SKIP_ENV -eq 0 ]; then
     source ./tools/install-esp-idf.sh
     if [ $? -ne 0 ]; then exit 1; fi
 else
+    # $IDF_PATH/install.sh
+    # source $IDF_PATH/export.sh
     source ./tools/config.sh
 fi
 
+if [ -f "./managed_components/espressif__esp-sr/.component_hash" ]; then
+    rm -rf ./managed_components/espressif__esp-sr/.component_hash
+fi
+
 if [ "$BUILD_TYPE" != "all" ]; then
     if [ "$TARGET" = "all" ]; then
         echo "ERROR: You need to specify target for non-default builds"
diff --git a/main/idf_component.yml b/main/idf_component.yml
index fb266a7af..764beef99 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -2,16 +2,17 @@ dependencies:
   # Required IDF version
   idf: ">=5.1"
 
-  mdns: "^1.0.7"
-  # nghttp: "^1.50.0"
-  # esp_jpeg: "^1.0.4"
-  # esp-dsp: "^1.2.0"
-  # esp-sr: "^1.0.3"
-  # esp32-camera: "^2.0.3"
+  mdns: "^1.1.0"
+  chmorgan/esp-libhelix-mp3: "1.0.3"
+  esp-sr: "^1.3.1"
+  esp-dsp: "^1.3.4"
+
+  # esp32-camera: "^2.0.4"
   # esp-dl:
   #   git: https://github.com/espressif/esp-dl.git
-  # arduino:
-  #   path: components/arduino
+  # espressif/esp_rainmaker:
+  #   path: components/esp_rainmaker
+  #   git: https://github.com/espressif/esp-rainmaker.git
 
   # # Defining a dependency from the registry:
   # # https://components.espressif.com/component/example/cmp
diff --git a/partitions.csv b/partitions.csv
index 3cf7a7587..97e41c452 100644
--- a/partitions.csv
+++ b/partitions.csv
@@ -3,6 +3,6 @@ nvs,      data, nvs,       0x9000,   0x5000,
 otadata,  data, ota,       0xe000,   0x2000,
 app0,     app,  ota_0,    0x10000, 0x300000,
 app1,     app,  ota_1,   0x310000, 0x300000,
-spiffs,   data, spiffs,  0x610000, 0x5E0000,
-model,    data, spiffs,  0xBF0000, 0x400000,
+spiffs,   data, spiffs,  0x610000, 0x700000,
+model,    data, spiffs,  0xD10000, 0x2E0000,
 coredump, data, coredump,0xFF0000,  0x10000,
diff --git a/tools/update-components.sh b/tools/update-components.sh
index f6cf986e8..056ca680d 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -4,10 +4,8 @@ source ./tools/config.sh
 
 CAMERA_REPO_URL="https://github.com/espressif/esp32-camera.git"
 DL_REPO_URL="https://github.com/espressif/esp-dl.git"
-SR_REPO_URL="https://github.com/espressif/esp-sr.git"
 RMAKER_REPO_URL="https://github.com/espressif/esp-rainmaker.git"
 INSIGHTS_REPO_URL="https://github.com/espressif/esp-insights.git"
-DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
 LITTLEFS_REPO_URL="https://github.com/joltwallet/esp_littlefs.git"
 TINYUSB_REPO_URL="https://github.com/hathach/tinyusb.git"
 
@@ -97,30 +95,6 @@ if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then
 	rm -rf "$AR_COMPS/esp-dl/idf_component.yml"
 fi
 
-#
-# CLONE/UPDATE ESP-SR
-#
-echo "Updating 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
-
-#
-# CLONE/UPDATE ESP-DSP
-#
-echo "Updating ESP-DSP..."
-if [ ! -d "$AR_COMPS/espressif__esp-dsp" ]; then
-	git clone $DSP_REPO_URL "$AR_COMPS/espressif__esp-dsp"
-else
-	git -C "$AR_COMPS/espressif__esp-dsp" fetch && \
-	git -C "$AR_COMPS/espressif__esp-dsp" pull --ff-only
-fi
-if [ $? -ne 0 ]; then exit 1; fi
-
 #
 # CLONE/UPDATE ESP-RAINMAKER
 #
@@ -175,3 +149,29 @@ else
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
+# #
+# # CLONE/UPDATE ESP-SR
+# #
+# SR_REPO_URL="https://github.com/espressif/esp-sr.git"
+# echo "Updating 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
+
+# #
+# # CLONE/UPDATE ESP-DSP
+# #
+# DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
+# echo "Updating ESP-DSP..."
+# if [ ! -d "$AR_COMPS/espressif__esp-dsp" ]; then
+# 	git clone $DSP_REPO_URL "$AR_COMPS/espressif__esp-dsp"
+# else
+# 	git -C "$AR_COMPS/espressif__esp-dsp" fetch && \
+# 	git -C "$AR_COMPS/espressif__esp-dsp" pull --ff-only
+# fi
+# if [ $? -ne 0 ]; then exit 1; fi
+

From 470ee2e107f6a34955e3e3e52ec142a23fecfd0a Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Fri, 12 May 2023 21:22:03 +0300
Subject: [PATCH 33/42] esp-sr component requires clearing before each build

---
 build.sh | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/build.sh b/build.sh
index 35de53f61..2c3cdaf6e 100755
--- a/build.sh
+++ b/build.sh
@@ -166,6 +166,11 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
     for defconf in `echo "$target_json" | jq -c '.idf_libs[]' | tr -d '"'`; do
         idf_libs_configs="$idf_libs_configs;configs/defconfig.$defconf"
     done
+
+    if [ -f "./managed_components/espressif__esp-sr/.component_hash" ]; then
+        rm -rf ./managed_components/espressif__esp-sr/.component_hash
+    fi
+
     echo "* Build IDF-Libs: $idf_libs_configs"
     rm -rf build sdkconfig
     idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf_libs
@@ -177,6 +182,11 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
         for defconf in `echo "$boot_conf" | jq -c '.[]' | tr -d '"'`; do
             bootloader_configs="$bootloader_configs;configs/defconfig.$defconf";
         done
+
+        if [ -f "./managed_components/espressif__esp-sr/.component_hash" ]; then
+            rm -rf ./managed_components/espressif__esp-sr/.component_hash
+        fi
+
         echo "* Build BootLoader: $bootloader_configs"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy_bootloader
@@ -189,6 +199,11 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
         for defconf in `echo "$mem_conf" | jq -c '.[]' | tr -d '"'`; do
             mem_configs="$mem_configs;configs/defconfig.$defconf";
         done
+
+        if [ -f "./managed_components/espressif__esp-sr/.component_hash" ]; then
+            rm -rf ./managed_components/espressif__esp-sr/.component_hash
+        fi
+
         echo "* Build Memory Variant: $mem_configs"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem_variant

From c3ce3455b10b5f74e3e4e882d2e8ba2e60aeb979 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Sat, 13 May 2023 02:01:11 +0300
Subject: [PATCH 34/42] revert ESP_SR from component manager

---
 main/idf_component.yml     |  2 +-
 tools/update-components.sh | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/main/idf_component.yml b/main/idf_component.yml
index 764beef99..2ba047577 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -4,9 +4,9 @@ dependencies:
 
   mdns: "^1.1.0"
   chmorgan/esp-libhelix-mp3: "1.0.3"
-  esp-sr: "^1.3.1"
   esp-dsp: "^1.3.4"
 
+  # esp-sr: "^1.3.1"
   # esp32-camera: "^2.0.4"
   # esp-dl:
   #   git: https://github.com/espressif/esp-dl.git
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 056ca680d..00e143bc1 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -149,18 +149,18 @@ else
 fi
 if [ $? -ne 0 ]; then exit 1; fi
 
-# #
-# # CLONE/UPDATE ESP-SR
-# #
-# SR_REPO_URL="https://github.com/espressif/esp-sr.git"
-# echo "Updating 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
+#
+# CLONE/UPDATE ESP-SR
+#
+SR_REPO_URL="https://github.com/espressif/esp-sr.git"
+echo "Updating 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
 
 # #
 # # CLONE/UPDATE ESP-DSP

From 03718e244d879336907d3276724b0722c217ace0 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Sat, 13 May 2023 03:34:05 +0300
Subject: [PATCH 35/42] Build ESP_SR only for ESP32-S3 for now

---
 tools/update-components.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/update-components.sh b/tools/update-components.sh
index 00e143bc1..1bceb844a 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -156,6 +156,10 @@ SR_REPO_URL="https://github.com/espressif/esp-sr.git"
 echo "Updating ESP-SR..."
 if [ ! -d "$AR_COMPS/esp-sr" ]; then
 	git clone $SR_REPO_URL "$AR_COMPS/esp-sr"
+	mv "$AR_COMPS/esp-sr/CMakeLists.txt" "$AR_COMPS/esp-sr/CMakeListsOld.txt"
+	echo "if(IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-sr/CMakeLists.txt"
+	cat "$AR_COMPS/esp-sr/CMakeListsOld.txt" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
+	echo "endif()" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
 else
 	git -C "$AR_COMPS/esp-sr" fetch && \
 	git -C "$AR_COMPS/esp-sr" pull --ff-only

From 94d73cb174124f1994708fd07a5a4599769c3d37 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Mon, 5 Jun 2023 12:02:45 +0300
Subject: [PATCH 36/42] [TinyUSB] Update esp32sx dcd and add dwc2 option

---
 components/arduino_tinyusb/CMakeLists.txt    |    3 +
 components/arduino_tinyusb/src/dcd_dwc2.c    | 1389 ++++++++++++++++++
 components/arduino_tinyusb/src/dcd_esp32sx.c |   14 +-
 3 files changed, 1403 insertions(+), 3 deletions(-)
 create mode 100644 components/arduino_tinyusb/src/dcd_dwc2.c

diff --git a/components/arduino_tinyusb/CMakeLists.txt b/components/arduino_tinyusb/CMakeLists.txt
index 97591440f..792b2a39f 100755
--- a/components/arduino_tinyusb/CMakeLists.txt
+++ b/components/arduino_tinyusb/CMakeLists.txt
@@ -20,8 +20,10 @@ if(CONFIG_TINYUSB_ENABLED)
   set(srcs
       # espressif:
       "${COMPONENT_DIR}/src/dcd_esp32sx.c"
+      #"${COMPONENT_DIR}/src/dcd_dwc2.c"
       # tusb:
       #"${COMPONENT_DIR}/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c"
+      #"{COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2/dcd_dwc2.c"
       "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c"
       "${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c"
@@ -40,6 +42,7 @@ if(CONFIG_TINYUSB_ENABLED)
       "${COMPONENT_DIR}/tinyusb/hw/bsp/"
       "${COMPONENT_DIR}/tinyusb/src/"
       "${COMPONENT_DIR}/tinyusb/src/device"
+      "${COMPONENT_DIR}/tinyusb/src/portable/synopsys/dwc2"
       )
 
   idf_component_get_property(FREERTOS_ORIG_INCLUDE_PATH freertos
diff --git a/components/arduino_tinyusb/src/dcd_dwc2.c b/components/arduino_tinyusb/src/dcd_dwc2.c
new file mode 100644
index 000000000..67653fda0
--- /dev/null
+++ b/components/arduino_tinyusb/src/dcd_dwc2.c
@@ -0,0 +1,1389 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2019 William D. Jones
+ * Copyright (c) 2019 Ha Thach (tinyusb.org)
+ * Copyright (c) 2020 Jan Duempelmann
+ * Copyright (c) 2020 Reinhard Panhuber
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * This file is part of the TinyUSB stack.
+ */
+
+#include "tusb_option.h"
+
+#if CFG_TUD_ENABLED && defined(TUP_USBIP_DWC2)
+
+#include "device/dcd.h"
+#include "dwc2_type.h"
+
+// Following symbols must be defined by port header
+// - _dwc2_controller[]: array of controllers
+// - DWC2_EP_MAX: largest EP counts of all controllers
+// - dwc2_phy_init/dwc2_phy_update: phy init called before and after core reset
+// - dwc2_dcd_int_enable/dwc2_dcd_int_disable
+// - dwc2_remote_wakeup_delay
+
+#if defined(TUP_USBIP_DWC2_STM32)
+  #include "dwc2_stm32.h"
+#elif TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+  #include "dwc2_esp32.h"
+#elif TU_CHECK_MCU(OPT_MCU_GD32VF103)
+  #include "dwc2_gd32.h"
+#elif TU_CHECK_MCU(OPT_MCU_BCM2711, OPT_MCU_BCM2835, OPT_MCU_BCM2837)
+  #include "dwc2_bcm.h"
+#elif TU_CHECK_MCU(OPT_MCU_EFM32GG)
+  #include "dwc2_efm32.h"
+#elif TU_CHECK_MCU(OPT_MCU_XMC4000)
+  #include "dwc2_xmc.h"
+#else
+  #error "Unsupported MCUs"
+#endif
+
+//--------------------------------------------------------------------+
+// MACRO TYPEDEF CONSTANT ENUM
+//--------------------------------------------------------------------+
+
+// DWC2 registers
+#define DWC2_REG(_port)       ((dwc2_regs_t*) _dwc2_controller[_port].reg_base)
+
+// Debug level for DWC2
+#define DWC2_DEBUG    2
+
+#ifndef dcache_clean
+#define dcache_clean(_addr, _size)
+#endif
+
+#ifndef dcache_invalidate
+#define dcache_invalidate(_addr, _size)
+#endif
+
+#ifndef dcache_clean_invalidate
+#define dcache_clean_invalidate(_addr, _size)
+#endif
+
+static TU_ATTR_ALIGNED(4) uint32_t _setup_packet[2];
+
+typedef struct {
+  uint8_t * buffer;
+  tu_fifo_t * ff;
+  uint16_t total_len;
+  uint16_t max_size;
+  uint8_t interval;
+} xfer_ctl_t;
+
+static xfer_ctl_t xfer_status[DWC2_EP_MAX][2];
+#define XFER_CTL_BASE(_ep, _dir) (&xfer_status[_ep][_dir])
+
+// EP0 transfers are limited to 1 packet - larger sizes has to be split
+static uint16_t ep0_pending[2];                   // Index determines direction as tusb_dir_t type
+
+// TX FIFO RAM allocation so far in words - RX FIFO size is readily available from dwc2->grxfsiz
+static uint16_t _allocated_fifo_words_tx;         // TX FIFO size in words (IN EPs)
+static bool     _out_ep_closed;                   // Flag to check if RX FIFO size needs an update (reduce its size)
+
+// SOF enabling flag - required for SOF to not get disabled in ISR when SOF was enabled by
+static bool _sof_en;
+
+// Calculate the RX FIFO size according to recommendations from reference manual
+static inline uint16_t calc_grxfsiz(uint16_t max_ep_size, uint8_t ep_count)
+{
+  return 15 + 2*(max_ep_size/4) + 2*ep_count;
+}
+
+static void update_grxfsiz(uint8_t rhport)
+{
+  dwc2_regs_t * dwc2     = DWC2_REG(rhport);
+  uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
+
+  // Determine largest EP size for RX FIFO
+  uint16_t max_epsize = 0;
+  for (uint8_t epnum = 0; epnum < ep_count; epnum++)
+  {
+    max_epsize = tu_max16(max_epsize, xfer_status[epnum][TUSB_DIR_OUT].max_size);
+  }
+
+  // Update size of RX FIFO
+  dwc2->grxfsiz = calc_grxfsiz(max_epsize, ep_count);
+}
+
+// Start of Bus Reset
+static void bus_reset(uint8_t rhport)
+{
+  dwc2_regs_t * dwc2     = DWC2_REG(rhport);
+  uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
+
+  tu_memclr(xfer_status, sizeof(xfer_status));
+  _out_ep_closed = false;
+
+  _sof_en = false;
+
+  // clear device address
+  dwc2->dcfg &= ~DCFG_DAD_Msk;
+
+  // 1. NAK for all OUT endpoints
+  for ( uint8_t n = 0; n < ep_count; n++ )
+  {
+    dwc2->epout[n].doepctl |= DOEPCTL_SNAK;
+  }
+
+  // 2. Set up interrupt mask
+  dwc2->daintmsk = TU_BIT(DAINTMSK_OEPM_Pos) | TU_BIT(DAINTMSK_IEPM_Pos);
+  dwc2->doepmsk  = DOEPMSK_STUPM | DOEPMSK_XFRCM;
+  dwc2->diepmsk  = DIEPMSK_TOM   | DIEPMSK_XFRCM;
+
+  // "USB Data FIFOs" section in reference manual
+  // Peripheral FIFO architecture
+  //
+  // The FIFO is split up in a lower part where the RX FIFO is located and an upper part where the TX FIFOs start.
+  // We do this to allow the RX FIFO to grow dynamically which is possible since the free space is located
+  // between the RX and TX FIFOs. This is required by ISO OUT EPs which need a bigger FIFO than the standard
+  // configuration done below.
+  //
+  // Dynamically FIFO sizes are of interest only for ISO EPs since all others are usually not opened and closed.
+  // All EPs other than ISO are opened as soon as the driver starts up i.e. when the host sends a
+  // configure interface command. Hence, all IN EPs other the ISO will be located at the top. IN ISO EPs are usually
+  // opened when the host sends an additional command: setInterface. At this point in time
+  // the ISO EP will be located next to the free space and can change its size. In case more IN EPs change its size
+  // an additional memory
+  //
+  // --------------- 320 or 1024 ( 1280 or 4096 bytes )
+  // | IN FIFO 0   |
+  // --------------- (320 or 1024) - 16
+  // | IN FIFO 1   |
+  // --------------- (320 or 1024) - 16 - x
+  // |   . . . .   |
+  // --------------- (320 or 1024) - 16 - x - y - ... - z
+  // | IN FIFO MAX |
+  // ---------------
+  // |    FREE     |
+  // --------------- GRXFSIZ
+  // | OUT FIFO    |
+  // | ( Shared )  |
+  // --------------- 0
+  //
+  // According to "FIFO RAM allocation" section in RM, FIFO RAM are allocated as follows (each word 32-bits):
+  // - Each EP IN needs at least max packet size, 16 words is sufficient for EP0 IN
+  //
+  // - All EP OUT shared a unique OUT FIFO which uses
+  //   - 13 for setup packets + control words (up to 3 setup packets).
+  //   - 1 for global NAK (not required/used here).
+  //   - Largest-EPsize / 4 + 1. ( FS: 64 bytes, HS: 512 bytes). Recommended is  "2 x (Largest-EPsize/4) + 1"
+  //   - 2 for each used OUT endpoint
+  //
+  //   Therefore GRXFSIZ = 13 + 1 + 1 + 2 x (Largest-EPsize/4) + 2 x EPOUTnum
+  //   - FullSpeed (64 Bytes ): GRXFSIZ = 15 + 2 x  16 + 2 x ep_count = 47  + 2 x ep_count
+  //   - Highspeed (512 bytes): GRXFSIZ = 15 + 2 x 128 + 2 x ep_count = 271 + 2 x ep_count
+  //
+  //   NOTE: Largest-EPsize & EPOUTnum is actual used endpoints in configuration. Since DCD has no knowledge
+  //   of the overall picture yet. We will use the worst scenario: largest possible + ep_count
+  //
+  //   For Isochronous, largest EP size can be 1023/1024 for FS/HS respectively. In addition if multiple ISO
+  //   are enabled at least "2 x (Largest-EPsize/4) + 1" are recommended.  Maybe provide a macro for application to
+  //   overwrite this.
+
+  // EP0 out max is 64
+  dwc2->grxfsiz = calc_grxfsiz(64, ep_count);
+
+  // Setup the control endpoint 0
+  _allocated_fifo_words_tx = 16;
+
+  // Control IN uses FIFO 0 with 64 bytes ( 16 32-bit word )
+  dwc2->dieptxf0 = (16 << DIEPTXF0_TX0FD_Pos) | (_dwc2_controller[rhport].ep_fifo_size/4 - _allocated_fifo_words_tx);
+
+  // Fixed control EP0 size to 64 bytes
+  dwc2->epin[0].diepctl &= ~(0x03 << DIEPCTL_MPSIZ_Pos);
+  xfer_status[0][TUSB_DIR_OUT].max_size = 64;
+  xfer_status[0][TUSB_DIR_IN ].max_size = 64;
+
+  dwc2->epout[0].doeptsiz |= (3 << DOEPTSIZ_STUPCNT_Pos);
+
+  dwc2->gintmsk |= GINTMSK_OEPINT | GINTMSK_IEPINT;
+}
+
+static void edpt_schedule_packets(uint8_t rhport, uint8_t const epnum, uint8_t const dir, uint16_t const num_packets, uint16_t total_bytes)
+{
+  (void) rhport;
+
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+
+  // EP0 is limited to one packet each xfer
+  // We use multiple transaction of xfer->max_size length to get a whole transfer done
+  if ( epnum == 0 )
+  {
+    xfer_ctl_t *const xfer = XFER_CTL_BASE(epnum, dir);
+    total_bytes = tu_min16(ep0_pending[dir], xfer->max_size);
+    ep0_pending[dir] -= total_bytes;
+  }
+
+  // IN and OUT endpoint xfers are interrupt-driven, we just schedule them here.
+  if ( dir == TUSB_DIR_IN )
+  {
+    dwc2_epin_t* epin = dwc2->epin;
+
+    // A full IN transfer (multiple packets, possibly) triggers XFRC.
+    epin[epnum].dieptsiz = (num_packets << DIEPTSIZ_PKTCNT_Pos) |
+                           ((total_bytes << DIEPTSIZ_XFRSIZ_Pos) & DIEPTSIZ_XFRSIZ_Msk);
+
+    epin[epnum].diepctl |= DIEPCTL_EPENA | DIEPCTL_CNAK;
+
+    // For ISO endpoint set correct odd/even bit for next frame.
+    if ( (epin[epnum].diepctl & DIEPCTL_EPTYP) == DIEPCTL_EPTYP_0 && (XFER_CTL_BASE(epnum, dir))->interval == 1 )
+    {
+      // Take odd/even bit from frame counter.
+      uint32_t const odd_frame_now = (dwc2->dsts & (1u << DSTS_FNSOF_Pos));
+      epin[epnum].diepctl |= (odd_frame_now ? DIEPCTL_SD0PID_SEVNFRM_Msk : DIEPCTL_SODDFRM_Msk);
+    }
+    // Enable fifo empty interrupt only if there are something to put in the fifo.
+    if ( total_bytes != 0 )
+    {
+      dwc2->diepempmsk |= (1 << epnum);
+    }
+  }
+  else
+  {
+    dwc2_epout_t* epout = dwc2->epout;
+
+    // A full OUT transfer (multiple packets, possibly) triggers XFRC.
+    epout[epnum].doeptsiz &= ~(DOEPTSIZ_PKTCNT_Msk | DOEPTSIZ_XFRSIZ);
+    epout[epnum].doeptsiz |= (num_packets << DOEPTSIZ_PKTCNT_Pos) |
+                             ((total_bytes << DOEPTSIZ_XFRSIZ_Pos) & DOEPTSIZ_XFRSIZ_Msk);
+
+    epout[epnum].doepctl |= DOEPCTL_EPENA | DOEPCTL_CNAK;
+    if ( (epout[epnum].doepctl & DOEPCTL_EPTYP) == DOEPCTL_EPTYP_0 &&
+         XFER_CTL_BASE(epnum, dir)->interval == 1 )
+    {
+      // Take odd/even bit from frame counter.
+      uint32_t const odd_frame_now = (dwc2->dsts & (1u << DSTS_FNSOF_Pos));
+      epout[epnum].doepctl |= (odd_frame_now ? DOEPCTL_SD0PID_SEVNFRM_Msk : DOEPCTL_SODDFRM_Msk);
+    }
+  }
+}
+
+/*------------------------------------------------------------------*/
+/* Controller API
+ *------------------------------------------------------------------*/
+#if CFG_TUSB_DEBUG >= DWC2_DEBUG
+void print_dwc2_info(dwc2_regs_t * dwc2)
+{
+  dwc2_ghwcfg2_t const * hw_cfg2 = &dwc2->ghwcfg2_bm;
+  dwc2_ghwcfg3_t const * hw_cfg3 = &dwc2->ghwcfg3_bm;
+  dwc2_ghwcfg4_t const * hw_cfg4 = &dwc2->ghwcfg4_bm;
+
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->gotgctl);
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->gusbcfg);
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->dcfg);
+  TU_LOG_HEX(DWC2_DEBUG, dwc2->guid);
+  TU_LOG_HEX(DWC2_DEBUG, dwc2->gsnpsid);
+  TU_LOG_HEX(DWC2_DEBUG, dwc2->ghwcfg1);
+
+  // HW configure 2
+  TU_LOG(DWC2_DEBUG, "\r\n");
+  TU_LOG_HEX(DWC2_DEBUG, dwc2->ghwcfg2);
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->op_mode                );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->arch                   );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->point2point            );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->hs_phy_type            );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->fs_phy_type            );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->num_dev_ep             );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->num_host_ch            );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->period_channel_support );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->enable_dynamic_fifo    );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->mul_cpu_int            );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->nperiod_tx_q_depth     );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->host_period_tx_q_depth );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->dev_token_q_depth      );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg2->otg_enable_ic_usb      );
+
+  // HW configure 3
+  TU_LOG(DWC2_DEBUG, "\r\n");
+  TU_LOG_HEX(DWC2_DEBUG, dwc2->ghwcfg3);
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->xfer_size_width          );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->packet_size_width        );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->otg_enable               );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->i2c_enable               );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->vendor_ctrl_itf          );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->optional_feature_removed );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->synch_reset              );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->otg_adp_support          );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->otg_enable_hsic          );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->battery_charger_support  );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->lpm_mode                 );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg3->total_fifo_size          );
+
+  // HW configure 4
+  TU_LOG(DWC2_DEBUG, "\r\n");
+  TU_LOG_HEX(DWC2_DEBUG, dwc2->ghwcfg4);
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->num_dev_period_in_ep      );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->power_optimized           );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->ahb_freq_min              );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->hibernation               );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->service_interval_mode     );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->ipg_isoc_en               );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->acg_enable                );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->utmi_phy_data_width       );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->dev_ctrl_ep_num           );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->iddg_filter_enabled       );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->vbus_valid_filter_enabled );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->a_valid_filter_enabled    );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->b_valid_filter_enabled    );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->dedicated_fifos           );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->num_dev_in_eps            );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->dma_desc_enable           );
+  TU_LOG_INT(DWC2_DEBUG, hw_cfg4->dma_dynamic               );
+}
+#endif
+
+static void reset_core(dwc2_regs_t * dwc2)
+{
+  // reset core
+  dwc2->grstctl |= GRSTCTL_CSRST;
+
+  // wait for reset bit is cleared
+  // TODO version 4.20a should wait for RESET DONE mask
+  while (dwc2->grstctl & GRSTCTL_CSRST) { }
+
+  // wait for AHB master IDLE
+  while ( !(dwc2->grstctl & GRSTCTL_AHBIDL) ) { }
+
+  // wait for device mode ?
+}
+
+static bool phy_hs_supported(dwc2_regs_t * dwc2)
+{
+  // note: esp32 incorrect report its hs_phy_type as utmi
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+  return false;
+#else
+  return TUD_OPT_HIGH_SPEED && dwc2->ghwcfg2_bm.hs_phy_type != HS_PHY_TYPE_NONE;
+#endif
+}
+
+static void phy_fs_init(dwc2_regs_t * dwc2)
+{
+  TU_LOG(DWC2_DEBUG, "Fullspeed PHY init\r\n");
+
+  // Select FS PHY
+  dwc2->gusbcfg |= GUSBCFG_PHYSEL;
+
+  // MCU specific PHY init before reset
+  dwc2_phy_init(dwc2, HS_PHY_TYPE_NONE);
+
+  // Reset core after selecting PHY
+  reset_core(dwc2);
+
+  // USB turnaround time is critical for certification where long cables and 5-Hubs are used.
+  // So if you need the AHB to run at less than 30 MHz, and if USB turnaround time is not critical,
+  // these bits can be programmed to a larger value. Default is 5
+  dwc2->gusbcfg = (dwc2->gusbcfg & ~GUSBCFG_TRDT_Msk) | (5u << GUSBCFG_TRDT_Pos);
+
+  // MCU specific PHY update post reset
+  dwc2_phy_update(dwc2, HS_PHY_TYPE_NONE);
+
+  // set max speed
+  dwc2->dcfg = (dwc2->dcfg & ~DCFG_DSPD_Msk) | (DCFG_DSPD_FS << DCFG_DSPD_Pos);
+}
+
+static void phy_hs_init(dwc2_regs_t * dwc2)
+{
+  uint32_t gusbcfg = dwc2->gusbcfg;
+
+  // De-select FS PHY
+  gusbcfg &= ~GUSBCFG_PHYSEL;
+
+  if (dwc2->ghwcfg2_bm.hs_phy_type == HS_PHY_TYPE_ULPI)
+  {
+    TU_LOG(DWC2_DEBUG, "Highspeed ULPI PHY init\r\n");
+
+    // Select ULPI
+    gusbcfg |= GUSBCFG_ULPI_UTMI_SEL;
+
+    // ULPI 8-bit interface, single data rate
+    gusbcfg &= ~(GUSBCFG_PHYIF16 | GUSBCFG_DDRSEL);
+
+    // default internal VBUS Indicator and Drive
+    gusbcfg &= ~(GUSBCFG_ULPIEVBUSD | GUSBCFG_ULPIEVBUSI);
+
+    // Disable FS/LS ULPI
+    gusbcfg &= ~(GUSBCFG_ULPIFSLS | GUSBCFG_ULPICSM);
+  }else
+  {
+    TU_LOG(DWC2_DEBUG, "Highspeed UTMI+ PHY init\r\n");
+
+    // Select UTMI+ with 8-bit interface
+    gusbcfg &= ~(GUSBCFG_ULPI_UTMI_SEL | GUSBCFG_PHYIF16);
+
+    // Set 16-bit interface if supported
+    if (dwc2->ghwcfg4_bm.utmi_phy_data_width) gusbcfg |= GUSBCFG_PHYIF16;
+  }
+
+  // Apply config
+  dwc2->gusbcfg = gusbcfg;
+
+  // mcu specific phy init
+  dwc2_phy_init(dwc2, dwc2->ghwcfg2_bm.hs_phy_type);
+
+  // Reset core after selecting PHY
+  reset_core(dwc2);
+
+  // Set turn-around, must after core reset otherwise it will be clear
+  // - 9 if using 8-bit PHY interface
+  // - 5 if using 16-bit PHY interface
+  gusbcfg &= ~GUSBCFG_TRDT_Msk;
+  gusbcfg |= (dwc2->ghwcfg4_bm.utmi_phy_data_width ? 5u : 9u) << GUSBCFG_TRDT_Pos;
+  dwc2->gusbcfg = gusbcfg;
+
+  // MCU specific PHY update post reset
+  dwc2_phy_update(dwc2, dwc2->ghwcfg2_bm.hs_phy_type);
+
+  // Set max speed
+  uint32_t dcfg = dwc2->dcfg;
+  dcfg &= ~DCFG_DSPD_Msk;
+  dcfg |= DCFG_DSPD_HS << DCFG_DSPD_Pos;
+
+  // XCVRDLY: transceiver delay between xcvr_sel and txvalid during device chirp is required
+  // when using with some PHYs such as USB334x (USB3341, USB3343, USB3346, USB3347)
+  if (dwc2->ghwcfg2_bm.hs_phy_type == HS_PHY_TYPE_ULPI) dcfg |= DCFG_XCVRDLY;
+
+  dwc2->dcfg = dcfg;
+}
+
+static bool check_dwc2(dwc2_regs_t * dwc2)
+{
+#if CFG_TUSB_DEBUG >= DWC2_DEBUG
+  print_dwc2_info(dwc2);
+#endif
+
+  // For some reasons: GD32VF103 snpsid and all hwcfg register are always zero (skip it)
+  (void) dwc2;
+#if !TU_CHECK_MCU(OPT_MCU_GD32VF103)
+  uint32_t const gsnpsid = dwc2->gsnpsid & GSNPSID_ID_MASK;
+  TU_ASSERT(gsnpsid == DWC2_OTG_ID || gsnpsid == DWC2_FS_IOT_ID || gsnpsid == DWC2_HS_IOT_ID);
+#endif
+
+  return true;
+}
+
+void dcd_init (uint8_t rhport)
+{
+  // Programming model begins in the last section of the chapter on the USB
+  // peripheral in each Reference Manual.
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+
+  // Check Synopsys ID register, failed if controller clock/power is not enabled
+  TU_VERIFY(check_dwc2(dwc2), );
+
+  dcd_disconnect(rhport);
+
+  // max number of endpoints & total_fifo_size are:
+  // hw_cfg2->num_dev_ep, hw_cfg2->total_fifo_size
+
+  if( phy_hs_supported(dwc2) )
+  {
+    // Highspeed
+    phy_hs_init(dwc2);
+  }else
+  {
+    // core does not support highspeed or hs-phy is not present
+    phy_fs_init(dwc2);
+  }
+
+  // Restart PHY clock
+  dwc2->pcgctl &= ~(PCGCTL_STOPPCLK | PCGCTL_GATEHCLK | PCGCTL_PWRCLMP | PCGCTL_RSTPDWNMODULE);
+
+	/* Set HS/FS Timeout Calibration to 7 (max available value).
+	 * The number of PHY clocks that the application programs in
+	 * this field is added to the high/full speed interpacket timeout
+	 * duration in the core to account for any additional delays
+	 * introduced by the PHY. This can be required, because the delay
+	 * introduced by the PHY in generating the linestate condition
+	 * can vary from one PHY to another.
+	 */
+  dwc2->gusbcfg |= (7ul << GUSBCFG_TOCAL_Pos);
+
+  // Force device mode
+  dwc2->gusbcfg = (dwc2->gusbcfg & ~GUSBCFG_FHMOD) | GUSBCFG_FDMOD;
+
+  // Clear A override, force B Valid
+  dwc2->gotgctl = (dwc2->gotgctl & ~GOTGCTL_AVALOEN) | GOTGCTL_BVALOEN | GOTGCTL_BVALOVAL;
+
+  // If USB host misbehaves during status portion of control xfer
+  // (non zero-length packet), send STALL back and discard.
+  dwc2->dcfg |= DCFG_NZLSOHSK;
+
+  // Clear all interrupts
+  uint32_t int_mask = dwc2->gintsts;
+  dwc2->gintsts |= int_mask;
+  int_mask = dwc2->gotgint;
+  dwc2->gotgint |= int_mask;
+
+  // Required as part of core initialization.
+  // TODO: How should mode mismatch be handled? It will cause
+  // the core to stop working/require reset.
+  dwc2->gintmsk = GINTMSK_OTGINT   | GINTMSK_MMISM  | GINTMSK_RXFLVLM  |
+                  GINTMSK_USBSUSPM | GINTMSK_USBRST | GINTMSK_ENUMDNEM | GINTMSK_WUIM;
+
+  // Enable global interrupt
+  dwc2->gahbcfg |= GAHBCFG_GINT;
+
+  // make sure we are in device mode
+//  TU_ASSERT(!(dwc2->gintsts & GINTSTS_CMOD), );
+
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->gotgctl);
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->gusbcfg);
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->dcfg);
+//  TU_LOG_HEX(DWC2_DEBUG, dwc2->gahbcfg);
+
+  dcd_connect(rhport);
+}
+
+void dcd_int_enable (uint8_t rhport)
+{
+  dwc2_dcd_int_enable(rhport);
+}
+
+void dcd_int_disable (uint8_t rhport)
+{
+  dwc2_dcd_int_disable(rhport);
+}
+
+void dcd_set_address (uint8_t rhport, uint8_t dev_addr)
+{
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+  dwc2->dcfg = (dwc2->dcfg & ~DCFG_DAD_Msk) | (dev_addr << DCFG_DAD_Pos);
+
+  // Response with status after changing device address
+  dcd_edpt_xfer(rhport, tu_edpt_addr(0, TUSB_DIR_IN), NULL, 0);
+}
+
+void dcd_remote_wakeup(uint8_t rhport)
+{
+  (void) rhport;
+
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+
+  // set remote wakeup
+  dwc2->dctl |= DCTL_RWUSIG;
+
+  // enable SOF to detect bus resume
+  dwc2->gintsts = GINTSTS_SOF;
+  dwc2->gintmsk |= GINTMSK_SOFM;
+
+  // Per specs: remote wakeup signal bit must be clear within 1-15ms
+  dwc2_remote_wakeup_delay();
+
+  dwc2->dctl &= ~DCTL_RWUSIG;
+}
+
+void dcd_connect(uint8_t rhport)
+{
+  (void) rhport;
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+  dwc2->dctl &= ~DCTL_SDIS;
+}
+
+void dcd_disconnect(uint8_t rhport)
+{
+  (void) rhport;
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+  dwc2->dctl |= DCTL_SDIS;
+}
+
+// Be advised: audio, video and possibly other iso-ep classes use dcd_sof_enable() to enable/disable its corresponding ISR on purpose!
+void dcd_sof_enable(uint8_t rhport, bool en)
+{
+  (void) rhport;
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+
+  _sof_en = en;
+
+  if (en)
+  {
+    dwc2->gintsts = GINTSTS_SOF;
+    dwc2->gintmsk |= GINTMSK_SOFM;
+  }
+  else
+  {
+    dwc2->gintmsk &= ~GINTMSK_SOFM;
+  }
+}
+
+/*------------------------------------------------------------------*/
+/* DCD Endpoint port
+ *------------------------------------------------------------------*/
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+// Keep count of how many FIFOs are in use
+static uint8_t _allocated_fifos = 1; //FIFO0 is always in use
+
+// Will either return an unused FIFO number, or 0 if all are used.
+static uint8_t get_free_fifo(void)
+{
+  if (_allocated_fifos < 5) return _allocated_fifos++;
+  return 0;
+}
+#endif
+
+bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * desc_edpt)
+{
+  (void) rhport;
+
+  dwc2_regs_t * dwc2     = DWC2_REG(rhport);
+  uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
+
+  uint8_t const epnum = tu_edpt_number(desc_edpt->bEndpointAddress);
+  uint8_t const dir   = tu_edpt_dir(desc_edpt->bEndpointAddress);
+
+  TU_ASSERT(epnum < ep_count);
+
+  xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
+  xfer->max_size = tu_edpt_packet_size(desc_edpt);
+  xfer->interval = desc_edpt->bInterval;
+
+  uint16_t const fifo_size = tu_div_ceil(xfer->max_size, 4);
+
+  if(dir == TUSB_DIR_OUT)
+  {
+    // Calculate required size of RX FIFO
+    uint16_t const sz = calc_grxfsiz(4*fifo_size, ep_count);
+
+    // If size_rx needs to be extended check if possible and if so enlarge it
+    if (dwc2->grxfsiz < sz)
+    {
+      TU_ASSERT(sz + _allocated_fifo_words_tx <= _dwc2_controller[rhport].ep_fifo_size/4);
+
+      // Enlarge RX FIFO
+      dwc2->grxfsiz = sz;
+    }
+
+    dwc2->epout[epnum].doepctl |= (1 << DOEPCTL_USBAEP_Pos) |
+                                  (desc_edpt->bmAttributes.xfer << DOEPCTL_EPTYP_Pos) |
+                                  (desc_edpt->bmAttributes.xfer != TUSB_XFER_ISOCHRONOUS ? DOEPCTL_SD0PID_SEVNFRM : 0) |
+                                  (xfer->max_size << DOEPCTL_MPSIZ_Pos);
+
+    dwc2->daintmsk |= TU_BIT(DAINTMSK_OEPM_Pos + epnum);
+  }
+  else
+  {
+    // "USB Data FIFOs" section in reference manual
+    // Peripheral FIFO architecture
+    //
+    // --------------- 320 or 1024 ( 1280 or 4096 bytes )
+    // | IN FIFO 0   |
+    // --------------- (320 or 1024) - 16
+    // | IN FIFO 1   |
+    // --------------- (320 or 1024) - 16 - x
+    // |   . . . .   |
+    // --------------- (320 or 1024) - 16 - x - y - ... - z
+    // | IN FIFO MAX |
+    // ---------------
+    // |    FREE     |
+    // --------------- GRXFSIZ
+    // | OUT FIFO    |
+    // | ( Shared )  |
+    // --------------- 0
+    //
+    // In FIFO is allocated by following rules:
+    // - IN EP 1 gets FIFO 1, IN EP "n" gets FIFO "n".
+
+    uint8_t fifo_num = epnum;
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+    // Special Case for EP5, which is used by CDC but not actually called by the driver
+    // we can give it a fake FIFO
+    if (epnum == 5) {
+      fifo_num = epnum;
+    } else {
+      fifo_num = get_free_fifo();
+    }
+    TU_ASSERT(fifo_num != 0);
+#endif
+    // Check if free space is available
+    TU_ASSERT(_allocated_fifo_words_tx + fifo_size + dwc2->grxfsiz <= _dwc2_controller[rhport].ep_fifo_size/4);
+
+    _allocated_fifo_words_tx += fifo_size;
+
+    TU_LOG(DWC2_DEBUG, "    Allocated %u bytes at offset %lu", fifo_size*4, _dwc2_controller[rhport].ep_fifo_size-_allocated_fifo_words_tx*4);
+
+    // DIEPTXF starts at FIFO #1.
+    // Both TXFD and TXSA are in unit of 32-bit words.
+    dwc2->dieptxf[epnum - 1] = (fifo_size << DIEPTXF_INEPTXFD_Pos) | (_dwc2_controller[rhport].ep_fifo_size/4 - _allocated_fifo_words_tx);
+
+    dwc2->epin[epnum].diepctl |= (1 << DIEPCTL_USBAEP_Pos) |
+                                 (fifo_num << DIEPCTL_TXFNUM_Pos) |
+                                 (desc_edpt->bmAttributes.xfer << DIEPCTL_EPTYP_Pos) |
+                                 (desc_edpt->bmAttributes.xfer != TUSB_XFER_ISOCHRONOUS ? DIEPCTL_SD0PID_SEVNFRM : 0) |
+                                 (xfer->max_size << DIEPCTL_MPSIZ_Pos);
+
+    dwc2->daintmsk |= (1 << (DAINTMSK_IEPM_Pos + epnum));
+  }
+
+  return true;
+}
+
+// Close all non-control endpoints, cancel all pending transfers if any.
+void dcd_edpt_close_all (uint8_t rhport)
+{
+  dwc2_regs_t * dwc2     = DWC2_REG(rhport);
+  uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
+
+  // Disable non-control interrupt
+  dwc2->daintmsk = (1 << DAINTMSK_OEPM_Pos) | (1 << DAINTMSK_IEPM_Pos);
+
+  for(uint8_t n = 1; n < ep_count; n++)
+  {
+    // disable OUT endpoint
+    dwc2->epout[n].doepctl = 0;
+    xfer_status[n][TUSB_DIR_OUT].max_size = 0;
+
+    // disable IN endpoint
+    dwc2->epin[n].diepctl = 0;
+    xfer_status[n][TUSB_DIR_IN].max_size = 0;
+  }
+
+  // reset allocated fifo IN
+  _allocated_fifo_words_tx = 16;
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+  _allocated_fifos = 1;
+#endif
+}
+
+bool dcd_edpt_xfer (uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t total_bytes)
+{
+  uint8_t const epnum = tu_edpt_number(ep_addr);
+  uint8_t const dir   = tu_edpt_dir(ep_addr);
+
+  xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
+  xfer->buffer      = buffer;
+  xfer->ff          = NULL;
+  xfer->total_len   = total_bytes;
+
+  // EP0 can only handle one packet
+  if(epnum == 0)
+  {
+    ep0_pending[dir] = total_bytes;
+
+    // Schedule the first transaction for EP0 transfer
+    edpt_schedule_packets(rhport, epnum, dir, 1, ep0_pending[dir]);
+  }
+  else
+  {
+    uint16_t num_packets = (total_bytes / xfer->max_size);
+    uint16_t const short_packet_size = total_bytes % xfer->max_size;
+
+    // Zero-size packet is special case.
+    if ( (short_packet_size > 0) || (total_bytes == 0) ) num_packets++;
+
+    // Schedule packets to be sent within interrupt
+    edpt_schedule_packets(rhport, epnum, dir, num_packets, total_bytes);
+  }
+
+  return true;
+}
+
+// The number of bytes has to be given explicitly to allow more flexible control of how many
+// bytes should be written and second to keep the return value free to give back a boolean
+// success message. If total_bytes is too big, the FIFO will copy only what is available
+// into the USB buffer!
+bool dcd_edpt_xfer_fifo (uint8_t rhport, uint8_t ep_addr, tu_fifo_t * ff, uint16_t total_bytes)
+{
+  // USB buffers always work in bytes so to avoid unnecessary divisions we demand item_size = 1
+  TU_ASSERT(ff->item_size == 1);
+
+  uint8_t const epnum = tu_edpt_number(ep_addr);
+  uint8_t const dir   = tu_edpt_dir(ep_addr);
+
+  xfer_ctl_t * xfer = XFER_CTL_BASE(epnum, dir);
+  xfer->buffer      = NULL;
+  xfer->ff          = ff;
+  xfer->total_len   = total_bytes;
+
+  uint16_t num_packets = (total_bytes / xfer->max_size);
+  uint16_t const short_packet_size = total_bytes % xfer->max_size;
+
+  // Zero-size packet is special case.
+  if ( short_packet_size > 0 || (total_bytes == 0) ) num_packets++;
+
+  // Schedule packets to be sent within interrupt
+  edpt_schedule_packets(rhport, epnum, dir, num_packets, total_bytes);
+
+  return true;
+}
+
+static void dcd_edpt_disable (uint8_t rhport, uint8_t ep_addr, bool stall)
+{
+  (void) rhport;
+
+  dwc2_regs_t *dwc2 = DWC2_REG(rhport);
+
+  uint8_t const epnum = tu_edpt_number(ep_addr);
+  uint8_t const dir   = tu_edpt_dir(ep_addr);
+
+  if ( dir == TUSB_DIR_IN )
+  {
+    dwc2_epin_t* epin = dwc2->epin;
+
+    // Only disable currently enabled non-control endpoint
+    if ( (epnum == 0) || !(epin[epnum].diepctl & DIEPCTL_EPENA) )
+    {
+      epin[epnum].diepctl |= DIEPCTL_SNAK | (stall ? DIEPCTL_STALL : 0);
+    }
+    else
+    {
+      // Stop transmitting packets and NAK IN xfers.
+      epin[epnum].diepctl |= DIEPCTL_SNAK;
+      while ( (epin[epnum].diepint & DIEPINT_INEPNE) == 0 ) {}
+
+      // Disable the endpoint.
+      epin[epnum].diepctl |= DIEPCTL_EPDIS | (stall ? DIEPCTL_STALL : 0);
+      while ( (epin[epnum].diepint & DIEPINT_EPDISD_Msk) == 0 ) {}
+
+      epin[epnum].diepint = DIEPINT_EPDISD;
+    }
+
+    // Flush the FIFO, and wait until we have confirmed it cleared.
+    dwc2->grstctl = ((epnum << GRSTCTL_TXFNUM_Pos) | GRSTCTL_TXFFLSH);
+    while ( (dwc2->grstctl & GRSTCTL_TXFFLSH_Msk) != 0 ) {}
+  }
+  else
+  {
+    dwc2_epout_t* epout = dwc2->epout;
+
+    // Only disable currently enabled non-control endpoint
+    if ( (epnum == 0) || !(epout[epnum].doepctl & DOEPCTL_EPENA) )
+    {
+      epout[epnum].doepctl |= stall ? DOEPCTL_STALL : 0;
+    }
+    else
+    {
+      // Asserting GONAK is required to STALL an OUT endpoint.
+      // Simpler to use polling here, we don't use the "B"OUTNAKEFF interrupt
+      // anyway, and it can't be cleared by user code. If this while loop never
+      // finishes, we have bigger problems than just the stack.
+      dwc2->dctl |= DCTL_SGONAK;
+      while ( (dwc2->gintsts & GINTSTS_BOUTNAKEFF_Msk) == 0 ) {}
+
+      // Ditto here- disable the endpoint.
+      epout[epnum].doepctl |= DOEPCTL_EPDIS | (stall ? DOEPCTL_STALL : 0);
+      while ( (epout[epnum].doepint & DOEPINT_EPDISD_Msk) == 0 ) {}
+
+      epout[epnum].doepint = DOEPINT_EPDISD;
+
+      // Allow other OUT endpoints to keep receiving.
+      dwc2->dctl |= DCTL_CGONAK;
+    }
+  }
+}
+
+/**
+ * Close an endpoint.
+ */
+void dcd_edpt_close (uint8_t rhport, uint8_t ep_addr)
+{
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+
+  uint8_t const epnum = tu_edpt_number(ep_addr);
+  uint8_t const dir   = tu_edpt_dir(ep_addr);
+
+  dcd_edpt_disable(rhport, ep_addr, false);
+
+  // Update max_size
+  xfer_status[epnum][dir].max_size = 0;  // max_size = 0 marks a disabled EP - required for changing FIFO allocation
+
+  if (dir == TUSB_DIR_IN)
+  {
+    uint16_t const fifo_size = (dwc2->dieptxf[epnum - 1] & DIEPTXF_INEPTXFD_Msk) >> DIEPTXF_INEPTXFD_Pos;
+    uint16_t const fifo_start = (dwc2->dieptxf[epnum - 1] & DIEPTXF_INEPTXSA_Msk) >> DIEPTXF_INEPTXSA_Pos;
+
+    // For now only the last opened endpoint can be closed without fuss.
+    TU_ASSERT(fifo_start == _dwc2_controller[rhport].ep_fifo_size/4 - _allocated_fifo_words_tx,);
+    _allocated_fifo_words_tx -= fifo_size;
+  }
+  else
+  {
+    _out_ep_closed = true;     // Set flag such that RX FIFO gets reduced in size once RX FIFO is empty
+  }
+}
+
+void dcd_edpt_stall (uint8_t rhport, uint8_t ep_addr)
+{
+  dcd_edpt_disable(rhport, ep_addr, true);
+}
+
+void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr)
+{
+  (void) rhport;
+
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+
+  uint8_t const epnum = tu_edpt_number(ep_addr);
+  uint8_t const dir   = tu_edpt_dir(ep_addr);
+
+  // Clear stall and reset data toggle
+  if ( dir == TUSB_DIR_IN )
+  {
+    dwc2->epin[epnum].diepctl &= ~DIEPCTL_STALL;
+    dwc2->epin[epnum].diepctl |= DIEPCTL_SD0PID_SEVNFRM;
+  }
+  else
+  {
+    dwc2->epout[epnum].doepctl &= ~DOEPCTL_STALL;
+    dwc2->epout[epnum].doepctl |= DOEPCTL_SD0PID_SEVNFRM;
+  }
+}
+
+/*------------------------------------------------------------------*/
+
+// Read a single data packet from receive FIFO
+static void read_fifo_packet(uint8_t rhport, uint8_t * dst, uint16_t len)
+{
+  (void) rhport;
+
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+  volatile const uint32_t * rx_fifo = dwc2->fifo[0];
+
+  // Reading full available 32 bit words from fifo
+  uint16_t full_words = len >> 2;
+  while(full_words--)
+  {
+    tu_unaligned_write32(dst, *rx_fifo);
+    dst += 4;
+  }
+
+  // Read the remaining 1-3 bytes from fifo
+  uint8_t const bytes_rem = len & 0x03;
+  if ( bytes_rem != 0 )
+  {
+    uint32_t const tmp = *rx_fifo;
+    dst[0] = tu_u32_byte0(tmp);
+    if ( bytes_rem > 1 ) dst[1] = tu_u32_byte1(tmp);
+    if ( bytes_rem > 2 ) dst[2] = tu_u32_byte2(tmp);
+  }
+}
+
+// Write a single data packet to EPIN FIFO
+static void write_fifo_packet(uint8_t rhport, uint8_t fifo_num, uint8_t const * src, uint16_t len)
+{
+  (void) rhport;
+
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+  volatile uint32_t * tx_fifo = dwc2->fifo[fifo_num];
+
+  // Pushing full available 32 bit words to fifo
+  uint16_t full_words = len >> 2;
+  while(full_words--)
+  {
+    *tx_fifo = tu_unaligned_read32(src);
+    src += 4;
+  }
+
+  // Write the remaining 1-3 bytes into fifo
+  uint8_t const bytes_rem = len & 0x03;
+  if ( bytes_rem )
+  {
+    uint32_t tmp_word = src[0];
+    if ( bytes_rem > 1 ) tmp_word |= (src[1] << 8);
+    if ( bytes_rem > 2 ) tmp_word |= (src[2] << 16);
+
+    *tx_fifo = tmp_word;
+  }
+}
+
+static void handle_rxflvl_irq(uint8_t rhport)
+{
+  dwc2_regs_t * dwc2 = DWC2_REG(rhport);
+  volatile uint32_t const * rx_fifo = dwc2->fifo[0];
+
+  // Pop control word off FIFO
+  uint32_t const ctl_word = dwc2->grxstsp;
+  uint8_t  const pktsts   = (ctl_word & GRXSTSP_PKTSTS_Msk ) >> GRXSTSP_PKTSTS_Pos;
+  uint8_t  const epnum    = (ctl_word & GRXSTSP_EPNUM_Msk  ) >> GRXSTSP_EPNUM_Pos;
+  uint16_t const bcnt     = (ctl_word & GRXSTSP_BCNT_Msk   ) >> GRXSTSP_BCNT_Pos;
+
+  dwc2_epout_t* epout = &dwc2->epout[epnum];
+
+//#if CFG_TUSB_DEBUG >= DWC2_DEBUG
+//  const char * pktsts_str[] =
+//  {
+//    "ASSERT", "Global NAK (ISR)", "Out Data Received", "Out Transfer Complete (ISR)",
+//    "Setup Complete (ISR)", "ASSERT", "Setup Data Received"
+//  };
+//  TU_LOG_LOCATION();
+//  TU_LOG(DWC2_DEBUG, "  EP %02X, Byte Count %u, %s\r\n", epnum, bcnt, pktsts_str[pktsts]);
+//  TU_LOG(DWC2_DEBUG, "  daint = %08lX, doepint = %04X\r\n", (unsigned long) dwc2->daint, (unsigned int) epout->doepint);
+//#endif
+
+  switch ( pktsts )
+  {
+    // Global OUT NAK: do nothing
+    case GRXSTS_PKTSTS_GLOBALOUTNAK: break;
+
+    case GRXSTS_PKTSTS_SETUPRX:
+      // Setup packet received
+
+      // We can receive up to three setup packets in succession, but
+      // only the last one is valid.
+      _setup_packet[0] = (*rx_fifo);
+      _setup_packet[1] = (*rx_fifo);
+    break;
+
+    case GRXSTS_PKTSTS_SETUPDONE:
+      // Setup packet done (Interrupt)
+      epout->doeptsiz |= (3 << DOEPTSIZ_STUPCNT_Pos);
+    break;
+
+    case GRXSTS_PKTSTS_OUTRX:
+    {
+      // Out packet received
+      xfer_ctl_t *xfer = XFER_CTL_BASE(epnum, TUSB_DIR_OUT);
+
+      // Read packet off RxFIFO
+      if ( xfer->ff )
+      {
+        // Ring buffer
+        tu_fifo_write_n_const_addr_full_words(xfer->ff, (const void*) (uintptr_t) rx_fifo, bcnt);
+      }
+      else
+      {
+        // Linear buffer
+        read_fifo_packet(rhport, xfer->buffer, bcnt);
+
+        // Increment pointer to xfer data
+        xfer->buffer += bcnt;
+      }
+
+      // Truncate transfer length in case of short packet
+      if ( bcnt < xfer->max_size )
+      {
+        xfer->total_len -= (epout->doeptsiz & DOEPTSIZ_XFRSIZ_Msk) >> DOEPTSIZ_XFRSIZ_Pos;
+        if ( epnum == 0 )
+        {
+          xfer->total_len -= ep0_pending[TUSB_DIR_OUT];
+          ep0_pending[TUSB_DIR_OUT] = 0;
+        }
+      }
+    }
+    break;
+
+    // Out packet done (Interrupt)
+    case GRXSTS_PKTSTS_OUTDONE:
+        // Occurred on STM32L47 with dwc2 version 3.10a but not found on other version like 2.80a or 3.30a
+        // May (or not) be 3.10a specific feature/bug or depending on MCU configuration
+        // XFRC complete is additionally generated when
+        // - setup packet is received
+        // - complete the data stage of control write is complete
+        if ((epnum == 0) && (bcnt == 0) && (dwc2->gsnpsid >= DWC2_CORE_REV_3_00a))
+        {
+          uint32_t doepint = epout->doepint;
+
+          if (doepint & (DOEPINT_STPKTRX | DOEPINT_OTEPSPR))
+          {
+            // skip this "no-data" transfer complete event
+            // Note: STPKTRX will be clear later by setup received handler
+            uint32_t clear_flags = DOEPINT_XFRC;
+
+            if (doepint & DOEPINT_OTEPSPR) clear_flags |= DOEPINT_OTEPSPR;
+
+            epout->doepint = clear_flags;
+
+            // TU_LOG(DWC2_DEBUG, "  FIX extra transfer complete on setup/data compete\r\n");
+          }
+        }
+    break;
+
+    default:    // Invalid
+      TU_BREAKPOINT();
+    break;
+  }
+}
+
+static void handle_epout_irq (uint8_t rhport)
+{
+  dwc2_regs_t * dwc2     = DWC2_REG(rhport);
+  uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
+
+  // DAINT for a given EP clears when DOEPINTx is cleared.
+  // OEPINT will be cleared when DAINT's out bits are cleared.
+  for ( uint8_t n = 0; n < ep_count; n++ )
+  {
+    if ( dwc2->daint & TU_BIT(DAINT_OEPINT_Pos + n) )
+    {
+      dwc2_epout_t* epout = &dwc2->epout[n];
+
+      uint32_t const doepint = epout->doepint;
+
+      // SETUP packet Setup Phase done.
+      if ( doepint & DOEPINT_STUP )
+      {
+        uint32_t clear_flag = DOEPINT_STUP;
+
+        // STPKTRX is only available for version from 3_00a
+        if ((doepint & DOEPINT_STPKTRX) && (dwc2->gsnpsid >= DWC2_CORE_REV_3_00a))
+        {
+          clear_flag |= DOEPINT_STPKTRX;
+        }
+
+        epout->doepint = clear_flag;
+        dcd_event_setup_received(rhport, (uint8_t*) _setup_packet, true);
+      }
+
+      // OUT XFER complete
+      if ( epout->doepint & DOEPINT_XFRC )
+      {
+        epout->doepint = DOEPINT_XFRC;
+
+        xfer_ctl_t *xfer = XFER_CTL_BASE(n, TUSB_DIR_OUT);
+
+        // EP0 can only handle one packet
+        if ( (n == 0) && ep0_pending[TUSB_DIR_OUT] )
+        {
+          // Schedule another packet to be received.
+          edpt_schedule_packets(rhport, n, TUSB_DIR_OUT, 1, ep0_pending[TUSB_DIR_OUT]);
+        }
+        else
+        {
+          dcd_event_xfer_complete(rhport, n, xfer->total_len, XFER_RESULT_SUCCESS, true);
+        }
+      }
+    }
+  }
+}
+
+static void handle_epin_irq (uint8_t rhport)
+{
+  dwc2_regs_t * dwc2     = DWC2_REG(rhport);
+  uint8_t const ep_count = _dwc2_controller[rhport].ep_count;
+  dwc2_epin_t* epin      = dwc2->epin;
+
+  // DAINT for a given EP clears when DIEPINTx is cleared.
+  // IEPINT will be cleared when DAINT's out bits are cleared.
+  for ( uint8_t n = 0; n < ep_count; n++ )
+  {
+    if ( dwc2->daint & TU_BIT(DAINT_IEPINT_Pos + n) )
+    {
+      // IN XFER complete (entire xfer).
+      xfer_ctl_t *xfer = XFER_CTL_BASE(n, TUSB_DIR_IN);
+
+      if ( epin[n].diepint & DIEPINT_XFRC )
+      {
+        epin[n].diepint = DIEPINT_XFRC;
+
+        // EP0 can only handle one packet
+        if ( (n == 0) && ep0_pending[TUSB_DIR_IN] )
+        {
+          // Schedule another packet to be transmitted.
+          edpt_schedule_packets(rhport, n, TUSB_DIR_IN, 1, ep0_pending[TUSB_DIR_IN]);
+        }
+        else
+        {
+          dcd_event_xfer_complete(rhport, n | TUSB_DIR_IN_MASK, xfer->total_len, XFER_RESULT_SUCCESS, true);
+        }
+      }
+
+      // XFER FIFO empty
+      if ( (epin[n].diepint & DIEPINT_TXFE) && (dwc2->diepempmsk & (1 << n)) )
+      {
+        // diepint's TXFE bit is read-only, software cannot clear it.
+        // It will only be cleared by hardware when written bytes is more than
+        // - 64 bytes or
+        // - Half of TX FIFO size (configured by DIEPTXF)
+
+        uint16_t remaining_packets = (epin[n].dieptsiz & DIEPTSIZ_PKTCNT_Msk) >> DIEPTSIZ_PKTCNT_Pos;
+
+        // Process every single packet (only whole packets can be written to fifo)
+        for ( uint16_t i = 0; i < remaining_packets; i++ )
+        {
+          uint16_t const remaining_bytes = (epin[n].dieptsiz & DIEPTSIZ_XFRSIZ_Msk) >> DIEPTSIZ_XFRSIZ_Pos;
+
+          // Packet can not be larger than ep max size
+          uint16_t const packet_size = tu_min16(remaining_bytes, xfer->max_size);
+
+          // It's only possible to write full packets into FIFO. Therefore DTXFSTS register of current
+          // EP has to be checked if the buffer can take another WHOLE packet
+          if ( packet_size > ((epin[n].dtxfsts & DTXFSTS_INEPTFSAV_Msk) << 2) ) break;
+
+          // Push packet to Tx-FIFO
+          if ( xfer->ff )
+          {
+            volatile uint32_t *tx_fifo = dwc2->fifo[n];
+            tu_fifo_read_n_const_addr_full_words(xfer->ff, (void*) (uintptr_t) tx_fifo, packet_size);
+          }
+          else
+          {
+            write_fifo_packet(rhport, n, xfer->buffer, packet_size);
+
+            // Increment pointer to xfer data
+            xfer->buffer += packet_size;
+          }
+        }
+
+        // Turn off TXFE if all bytes are written.
+        if ( ((epin[n].dieptsiz & DIEPTSIZ_XFRSIZ_Msk) >> DIEPTSIZ_XFRSIZ_Pos) == 0 )
+        {
+          dwc2->diepempmsk &= ~(1 << n);
+        }
+      }
+    }
+  }
+}
+
+void dcd_int_handler(uint8_t rhport)
+{
+  dwc2_regs_t *dwc2 = DWC2_REG(rhport);
+
+  uint32_t const int_mask = dwc2->gintmsk;
+  uint32_t const int_status = dwc2->gintsts & int_mask;
+
+  if(int_status & GINTSTS_USBRST)
+  {
+    // USBRST is start of reset.
+    dwc2->gintsts = GINTSTS_USBRST;
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+    _allocated_fifos = 1;
+#endif
+    bus_reset(rhport);
+  }
+
+  if(int_status & GINTSTS_ENUMDNE)
+  {
+    // ENUMDNE is the end of reset where speed of the link is detected
+
+    dwc2->gintsts = GINTSTS_ENUMDNE;
+
+    tusb_speed_t speed;
+    switch ((dwc2->dsts & DSTS_ENUMSPD_Msk) >> DSTS_ENUMSPD_Pos)
+    {
+      case DSTS_ENUMSPD_HS:
+        speed = TUSB_SPEED_HIGH;
+      break;
+
+      case DSTS_ENUMSPD_LS:
+        speed = TUSB_SPEED_LOW;
+      break;
+
+      case DSTS_ENUMSPD_FS_HSPHY:
+      case DSTS_ENUMSPD_FS:
+      default:
+        speed = TUSB_SPEED_FULL;
+      break;
+    }
+
+    dcd_event_bus_reset(rhport, speed, true);
+  }
+
+  if(int_status & GINTSTS_USBSUSP)
+  {
+    dwc2->gintsts = GINTSTS_USBSUSP;
+    //dcd_event_bus_signal(rhport, DCD_EVENT_SUSPEND, true);
+    dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true);
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+    _allocated_fifos = 1;
+#endif
+  }
+
+  if(int_status & GINTSTS_WKUINT)
+  {
+    dwc2->gintsts = GINTSTS_WKUINT;
+    dcd_event_bus_signal(rhport, DCD_EVENT_RESUME, true);
+  }
+
+  // TODO check GINTSTS_DISCINT for disconnect detection
+  // if(int_status & GINTSTS_DISCINT)
+
+  if(int_status & GINTSTS_OTGINT)
+  {
+    // OTG INT bit is read-only
+    uint32_t const otg_int = dwc2->gotgint;
+
+    if (otg_int & GOTGINT_SEDET)
+    {
+      dcd_event_bus_signal(rhport, DCD_EVENT_UNPLUGGED, true);
+#if TU_CHECK_MCU(OPT_MCU_ESP32S2, OPT_MCU_ESP32S3)
+      _allocated_fifos = 1;
+#endif
+    }
+
+    dwc2->gotgint = otg_int;
+  }
+
+  if(int_status & GINTSTS_SOF)
+  {
+    dwc2->gotgint = GINTSTS_SOF;
+
+    if (_sof_en)
+    {
+      uint32_t frame = (dwc2->dsts & (DSTS_FNSOF)) >> 8;
+      dcd_event_sof(rhport, frame, true);
+    }
+    else
+    {
+      // Disable SOF interrupt if SOF was not explicitly enabled. SOF was used for remote wakeup detection
+      dwc2->gintmsk &= ~GINTMSK_SOFM;
+    }
+
+    dcd_event_bus_signal(rhport, DCD_EVENT_SOF, true);
+  }
+
+  // RxFIFO non-empty interrupt handling.
+  if(int_status & GINTSTS_RXFLVL)
+  {
+    // RXFLVL bit is read-only
+
+    // Mask out RXFLVL while reading data from FIFO
+    dwc2->gintmsk &= ~GINTMSK_RXFLVLM;
+
+    // Loop until all available packets were handled
+    do
+    {
+      handle_rxflvl_irq(rhport);
+    } while(dwc2->gotgint & GINTSTS_RXFLVL);
+
+    // Manage RX FIFO size
+    if (_out_ep_closed)
+    {
+      update_grxfsiz(rhport);
+
+      // Disable flag
+      _out_ep_closed = false;
+    }
+
+    dwc2->gintmsk |= GINTMSK_RXFLVLM;
+  }
+
+  // OUT endpoint interrupt handling.
+  if(int_status & GINTSTS_OEPINT)
+  {
+    // OEPINT is read-only, clear using DOEPINTn
+    handle_epout_irq(rhport);
+  }
+
+  // IN endpoint interrupt handling.
+  if(int_status & GINTSTS_IEPINT)
+  {
+    // IEPINT bit read-only, clear using DIEPINTn
+    handle_epin_irq(rhport);
+  }
+
+  //  // Check for Incomplete isochronous IN transfer
+  //  if(int_status & GINTSTS_IISOIXFR) {
+  //    printf("      IISOIXFR!\r\n");
+  ////    TU_LOG(DWC2_DEBUG, "      IISOIXFR!\r\n");
+  //  }
+}
+
+#endif
diff --git a/components/arduino_tinyusb/src/dcd_esp32sx.c b/components/arduino_tinyusb/src/dcd_esp32sx.c
index 29fbe99cb..cfccf95ae 100755
--- a/components/arduino_tinyusb/src/dcd_esp32sx.c
+++ b/components/arduino_tinyusb/src/dcd_esp32sx.c
@@ -482,7 +482,8 @@ void dcd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
     } else {
       // Stop transmitting packets and NAK IN xfers.
       in_ep[epnum].diepctl |= USB_DI_SNAK1_M;
-      while ((in_ep[epnum].diepint & USB_DI_SNAK1_M) == 0) ;
+      // while ((in_ep[epnum].diepint & USB_DI_SNAK1_M) == 0) ;
+      while ((in_ep[epnum].diepint & USB_D_INEPNAKEFF1_M) == 0) ;
 
       // Disable the endpoint. Note that both SNAK and STALL are set here.
       in_ep[epnum].diepctl |= (USB_DI_SNAK1_M | USB_D_STALL1_M | USB_D_EPDIS1_M);
@@ -492,9 +493,16 @@ void dcd_edpt_stall(uint8_t rhport, uint8_t ep_addr)
 
     // Flush the FIFO, and wait until we have confirmed it cleared.
     uint8_t const fifo_num = ((in_ep[epnum].diepctl >> USB_D_TXFNUM1_S) & USB_D_TXFNUM1_V);
-    USB0.grstctl |= (fifo_num << USB_TXFNUM_S);
-    USB0.grstctl |= USB_TXFFLSH_M;
+    // USB0.grstctl |= (fifo_num << USB_TXFNUM_S);
+    // USB0.grstctl |= USB_TXFFLSH_M;
+    // while ((USB0.grstctl & USB_TXFFLSH_M) != 0) ;
+    uint32_t rstctl_last = USB0.grstctl;
+    uint32_t rstctl = USB_TXFFLSH_M;
+    rstctl |= (fifo_num << USB_TXFNUM_S);
+    USB0.grstctl = rstctl;
     while ((USB0.grstctl & USB_TXFFLSH_M) != 0) ;
+    USB0.grstctl = rstctl_last;
+    // TODO: Clear grstctl::fifo_num after fifo flsh
   } else {
     // Only disable currently enabled non-control endpoint
     if ((epnum == 0) || !(out_ep[epnum].doepctl & USB_EPENA0_M)) {

From acd3dbecca0d343d41a3f3b0a6c507692c383b82 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Mon, 5 Jun 2023 17:09:34 +0300
Subject: [PATCH 37/42] Workaround for recent change in ESP-Insights

---
 tools/update-components.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/update-components.sh b/tools/update-components.sh
index 1bceb844a..c5f57dccb 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -108,6 +108,9 @@ else
     git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
 fi
 if [ $? -ne 0 ]; then exit 1; fi
+if [ -d "$AR_COMPS/esp-rainmaker/components/esp-insights/components/cbor" ]; then
+	mv "$AR_COMPS/esp-rainmaker/components/esp-insights/components/cbor" "$AR_COMPS/esp-rainmaker/components/esp-insights/components/cbor2"
+fi
 
 #
 # CLONE/UPDATE ESP-INSIGHTS
@@ -122,6 +125,9 @@ else
     git -C "$AR_COMPS/esp-insights" submodule update --init --recursive
 fi
 if [ $? -ne 0 ]; then exit 1; fi
+if [ -d "$AR_COMPS/esp-insights/components/cbor" ]; then
+	mv "$AR_COMPS/esp-insights/components/cbor" "$AR_COMPS/esp-insights/components/cbor2"
+fi
 
 #
 # CLONE/UPDATE ESP-LITTLEFS

From 830a5562c87b011454afde623370b99a7cd478bc Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 20 Jun 2023 11:15:50 +0200
Subject: [PATCH 38/42] Add initial support for ESP32-C6

---
 CMakeLists.txt             |  2 +-
 configs/builds.json        | 16 +++++++++++++++-
 configs/defconfig.esp32c6  |  4 ++++
 tools/update-components.sh |  6 ++++++
 4 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 configs/defconfig.esp32c6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5cc989c62..76813460b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
-set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components)
+set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components ${RMAKER_PATH}/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(arduino-lib-builder)
diff --git a/configs/builds.json b/configs/builds.json
index 3a5dd67c9..8d4d05e38 100644
--- a/configs/builds.json
+++ b/configs/builds.json
@@ -4,7 +4,7 @@
 			"file":"libspi_flash.a",
 			"src":"build/esp-idf/spi_flash/libspi_flash.a",
 			"out":"lib/libspi_flash.a",
-			"targets":["esp32","esp32c3","esp32s2","esp32s3"]
+			"targets":["esp32","esp32c3","esp32s2","esp32s3","esp32c6"]
 		},
 		{
 			"file":"libesp_psram.a",
@@ -44,6 +44,20 @@
 		}
 	],
 	"targets":[
+		{
+			"target": "esp32c6",
+			"features":[],
+			"idf_libs":["qio","80m"],
+			"bootloaders":[
+				["qio","80m"],
+				["dio","80m"],
+				["qio","40m"],
+				["dio","40m"]
+			],
+			"mem_variants":[
+				["dio","80m"]
+			]
+		},
 		{
 			"target": "esp32s3",
 			"features":["esp_sr"],
diff --git a/configs/defconfig.esp32c6 b/configs/defconfig.esp32c6
new file mode 100644
index 000000000..ced594733
--- /dev/null
+++ b/configs/defconfig.esp32c6
@@ -0,0 +1,4 @@
+CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_RTC_CLK_CAL_CYCLES=576
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
diff --git a/tools/update-components.sh b/tools/update-components.sh
index c5f57dccb..09e51dbf2 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -85,6 +85,11 @@ if [ $? -ne 0 ]; then exit 1; fi
 echo "Updating ESP-DL..."
 if [ ! -d "$AR_COMPS/esp-dl" ]; then
 	git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
+	mv "$AR_COMPS/esp-dl/CMakeLists.txt" "$AR_COMPS/esp-dl/CMakeListsOld.txt"
+	echo "idf_build_get_property(target IDF_TARGET)" > "$AR_COMPS/esp-dl/CMakeLists.txt"
+	echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
+	cat "$AR_COMPS/esp-dl/CMakeListsOld.txt" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
+	echo "endif()" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
 else
 	git -C "$AR_COMPS/esp-dl" fetch && \
 	git -C "$AR_COMPS/esp-dl" pull --ff-only
@@ -166,6 +171,7 @@ if [ ! -d "$AR_COMPS/esp-sr" ]; then
 	echo "if(IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-sr/CMakeLists.txt"
 	cat "$AR_COMPS/esp-sr/CMakeListsOld.txt" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
 	echo "endif()" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
+	echo "  - esp32c6" >> "$AR_COMPS/esp-sr/idf_component.yml"
 else
 	git -C "$AR_COMPS/esp-sr" fetch && \
 	git -C "$AR_COMPS/esp-sr" pull --ff-only

From 3b978f95adf8f7c4b34967ac1367021d2400c409 Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 20 Jun 2023 11:31:58 +0200
Subject: [PATCH 39/42] Run build tests on ESP32-C6

---
 .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 0d62c8d5e..26d699680 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c3]
+        target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6]
       fail-fast: false
     steps:
     - uses: actions/checkout@v2

From 31d4f9d932a3476e1987084a1a9e3969d8bda69d Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Tue, 20 Jun 2023 14:38:04 +0200
Subject: [PATCH 40/42] Remove -mlongcalls for non-xtensa chips

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

diff --git a/tools/copy-libs.sh b/tools/copy-libs.sh
index fad66279e..cd0742dec 100755
--- a/tools/copy-libs.sh
+++ b/tools/copy-libs.sh
@@ -166,7 +166,7 @@ else
 	if [ "$IDF_TARGET" = "esp32" ]; then
 		flags="-Wno-frame-address $flags"
 	fi
-	if [ "$IDF_TARGET" != "esp32c3" ]; then
+	if [ "$IS_XTENSA" = "y" ]; then
 		flags="-mlongcalls $flags"
 	fi
 	str="$flags $libs $paths"

From 2f71f35d317afab1153bce2b291805a3f49ef1fd Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Fri, 30 Jun 2023 13:32:53 +0300
Subject: [PATCH 41/42] Temp fix for ESP-Insights on C6

---
 CMakeLists.txt                   |   2 +-
 tools/get_projbuild_gitconfig.py | 124 +++++++++++++++++++++++++++++++
 tools/update-components.sh       |  22 +-----
 3 files changed, 128 insertions(+), 20 deletions(-)
 create mode 100644 tools/get_projbuild_gitconfig.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76813460b..0e2270bd1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.5)
 
 set(RMAKER_PATH ${CMAKE_SOURCE_DIR}/components/esp-rainmaker)
-set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${CMAKE_SOURCE_DIR}/components/esp-insights/components ${RMAKER_PATH}/components)
+set(EXTRA_COMPONENT_DIRS ${RMAKER_PATH}/components/esp-insights/components ${RMAKER_PATH}/components)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(arduino-lib-builder)
diff --git a/tools/get_projbuild_gitconfig.py b/tools/get_projbuild_gitconfig.py
new file mode 100644
index 000000000..305bb117c
--- /dev/null
+++ b/tools/get_projbuild_gitconfig.py
@@ -0,0 +1,124 @@
+# This file is expected to be present in ${COMPONENT_DIR}
+# accessed from components/esp_insights/CMakeLists.txt
+# Used in:
+# 1. Project ESP Insights build package tar file
+
+#from __future__ import unicode_literals
+import os
+import sys
+import json
+import subprocess
+from builtins import range, str
+from io import open
+
+# Input project directory from CMakeLists.txt
+PROJ_DIR=sys.argv[1]
+# Input project name
+PROJ_NAME=sys.argv[2]
+# Input project version
+PROJ_VER=sys.argv[3]
+# Input custom config filename from CMakeLists.txt
+FILENAME=sys.argv[4]
+# Input IDF_PATH from CMakeLists.txt
+IDF_PATH=sys.argv[5]
+# Input target
+TARGET=sys.argv[6]
+
+NEWLINE = "\n"
+
+CONFIG = {}
+
+# Set Config
+
+# Set current directory i.e Set ${COMPONENT_DIR} as current directory
+CURR_DIR = os.getcwd()
+
+def _change_dir(dirname):
+    # Change directory
+    os.chdir(dirname)
+
+
+def _set_submodule_cfg(submodules, repo_name):
+    # Set config for submodules
+    CFG_TITLE = "submodules"
+    NAME_STR = "name"
+    VERSION_STR = "version"
+    CONFIG[repo_name][CFG_TITLE] = []
+    
+    if submodules:
+        # Get the submodule name and version
+        submodules_list = submodules.strip().split(NEWLINE)
+        for i in range(0, len(submodules_list), 2):
+            name = submodules_list[i].split('\'')[1]
+            version = submodules_list[i+1]
+            submodule_json = { NAME_STR: name, VERSION_STR: version }
+            CONFIG[repo_name][CFG_TITLE].append(submodule_json)
+
+
+def run_cmd(command, get_basename=False):
+    try:
+        resp = subprocess.check_output(command, shell=True).strip().decode('utf-8')
+        if get_basename:
+            resp = os.path.basename(resp)
+        return resp
+    except subprocess.CalledProcessError:
+        raise Exception("ERROR: Please check command : {}".format(command))
+
+def set_cfg(config_name):
+    # Set config for ESP-IDF Repo
+    if config_name  == "esp-idf":
+        # Get repo name (for IDF repo)
+        REPO_CMD='git rev-parse --show-toplevel'
+        repo_name = run_cmd(REPO_CMD, get_basename=True)
+        CONFIG[repo_name] = {}
+
+        # Get commit HEAD
+        GITHEAD_STR = "HEAD"
+        HEAD='git describe --always --tags --dirty'
+        head_ver = run_cmd(HEAD)
+        CONFIG[repo_name][GITHEAD_STR] = head_ver
+
+        # Get submodule latest refs
+        SUBMODULE = 'git submodule foreach git describe --always --tags --dirty'
+        submodules = run_cmd(SUBMODULE)
+        _set_submodule_cfg(submodules, repo_name)
+    elif config_name == "toolchain":
+        # Set config for Toolchain Version
+        arch_target = "xtensa-" + TARGET
+        if TARGET == "esp32c3" or TARGET == "esp32c2" or TARGET == "esp32h2" or TARGET == "esp32c6":
+            arch_target = "riscv32-esp"
+        # Get toolchain version
+        TOOLCHAIN_STR = "toolchain"
+        TOOLCHAIN = arch_target + '-elf-gcc --version'
+        toolchain = run_cmd(TOOLCHAIN)
+        CONFIG[TOOLCHAIN_STR] = toolchain.strip().split(NEWLINE)[0]
+
+# Set project details - name and version
+def set_project_details():
+    # Set project name and version
+    CONFIG['project'] = {}
+    CONFIG['project']['name'] = PROJ_NAME
+    CONFIG['project']['version'] = PROJ_VER
+
+try:
+    with open(FILENAME, "w+", encoding="utf-8") as output_file:
+        # ESP-IDF REPO CONFIG
+        # Change to ESP-IDF Directory
+        _change_dir(IDF_PATH)
+        set_cfg("esp-idf")
+
+        # Change back to ${COMPONENT_DIR}
+        _change_dir(CURR_DIR)
+
+        # Set project name and version
+        set_project_details()
+
+        # GET TOOLCHAIN VERSION
+        set_cfg("toolchain")
+
+        output_file.write(str(json.dumps(CONFIG, indent=4, sort_keys=True)))
+
+except Exception as e:
+    # Remove config file created if error occurs
+    os.system("rm " + FILENAME)
+    sys.exit(e)
\ No newline at end of file
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 09e51dbf2..615ebe465 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -113,25 +113,9 @@ else
     git -C "$AR_COMPS/esp-rainmaker" submodule update --init --recursive
 fi
 if [ $? -ne 0 ]; then exit 1; fi
-if [ -d "$AR_COMPS/esp-rainmaker/components/esp-insights/components/cbor" ]; then
-	mv "$AR_COMPS/esp-rainmaker/components/esp-insights/components/cbor" "$AR_COMPS/esp-rainmaker/components/esp-insights/components/cbor2"
-fi
-
-#
-# CLONE/UPDATE ESP-INSIGHTS
-#
-echo "Updating ESP-Insights..."
-if [ ! -d "$AR_COMPS/esp-insights" ]; then
-    git clone $INSIGHTS_REPO_URL "$AR_COMPS/esp-insights" && \
-    git -C "$AR_COMPS/esp-insights" submodule update --init --recursive
-else
-	git -C "$AR_COMPS/esp-insights" fetch && \
-	git -C "$AR_COMPS/esp-insights" pull --ff-only && \
-    git -C "$AR_COMPS/esp-insights" submodule update --init --recursive
-fi
-if [ $? -ne 0 ]; then exit 1; fi
-if [ -d "$AR_COMPS/esp-insights/components/cbor" ]; then
-	mv "$AR_COMPS/esp-insights/components/cbor" "$AR_COMPS/esp-insights/components/cbor2"
+if [ -f "$AR_COMPS/esp-rainmaker/components/esp-insights/components/esp_insights/scripts/get_projbuild_gitconfig.py" ] && [ `cat "$AR_COMPS/esp-rainmaker/components/esp-insights/components/esp_insights/scripts/get_projbuild_gitconfig.py" | grep esp32c6 | wc -l` == "0" ]; then
+	echo "Overwriting 'get_projbuild_gitconfig.py'"
+	cp -f "tools/get_projbuild_gitconfig.py" "$AR_COMPS/esp-rainmaker/components/esp-insights/components/esp_insights/scripts/get_projbuild_gitconfig.py"
 fi
 
 #

From 9c02025fea16976652f6010d3f548a3b852da4ff Mon Sep 17 00:00:00 2001
From: me-no-dev <hristo@espressif.com>
Date: Sat, 1 Jul 2023 11:47:56 +0300
Subject: [PATCH 42/42] Add support for ESP32H2

---
 .github/workflows/push.yml |  2 +-
 configs/builds.json        | 16 +++++++++++-
 configs/defconfig.16m      |  1 +
 configs/defconfig.64m      |  1 +
 configs/defconfig.esp32h2  |  4 +++
 main/Kconfig.projbuild     |  3 +++
 tools/update-components.sh | 53 ++++++++++++++------------------------
 7 files changed, 45 insertions(+), 35 deletions(-)
 create mode 100644 configs/defconfig.16m
 create mode 100644 configs/defconfig.64m
 create mode 100644 configs/defconfig.esp32h2

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index 26d699680..7dd16f495 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6]
+        target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2]
       fail-fast: false
     steps:
     - uses: actions/checkout@v2
diff --git a/configs/builds.json b/configs/builds.json
index 8d4d05e38..de986a5bc 100644
--- a/configs/builds.json
+++ b/configs/builds.json
@@ -4,7 +4,7 @@
 			"file":"libspi_flash.a",
 			"src":"build/esp-idf/spi_flash/libspi_flash.a",
 			"out":"lib/libspi_flash.a",
-			"targets":["esp32","esp32c3","esp32s2","esp32s3","esp32c6"]
+			"targets":["esp32","esp32c3","esp32s2","esp32s3","esp32c6","esp32h2"]
 		},
 		{
 			"file":"libesp_psram.a",
@@ -44,6 +44,20 @@
 		}
 	],
 	"targets":[
+		{
+			"target": "esp32h2",
+			"features":[],
+			"idf_libs":["qio","64m"],
+			"bootloaders":[
+				["qio","64m"],
+				["dio","64m"],
+				["qio","16m"],
+				["dio","16m"]
+			],
+			"mem_variants":[
+				["dio","64m"]
+			]
+		},
 		{
 			"target": "esp32c6",
 			"features":[],
diff --git a/configs/defconfig.16m b/configs/defconfig.16m
new file mode 100644
index 000000000..b7916fbce
--- /dev/null
+++ b/configs/defconfig.16m
@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHFREQ_16M=y
\ No newline at end of file
diff --git a/configs/defconfig.64m b/configs/defconfig.64m
new file mode 100644
index 000000000..c33173f13
--- /dev/null
+++ b/configs/defconfig.64m
@@ -0,0 +1 @@
+CONFIG_ESPTOOLPY_FLASHFREQ_64M=y
\ No newline at end of file
diff --git a/configs/defconfig.esp32h2 b/configs/defconfig.esp32h2
new file mode 100644
index 000000000..ced594733
--- /dev/null
+++ b/configs/defconfig.esp32h2
@@ -0,0 +1,4 @@
+CONFIG_BT_BLE_BLUFI_ENABLE=y
+CONFIG_RTC_CLK_CAL_CYCLES=576
+# CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0 is not set
+CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
index 8e6ddef14..a5832f914 100644
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@@ -10,9 +10,12 @@ config LIB_BUILDER_FLASHFREQ
     string
     default "120m" if ESPTOOLPY_FLASHFREQ_120M
     default "80m" if ESPTOOLPY_FLASHFREQ_80M
+    default "64m" if ESPTOOLPY_FLASHFREQ_64M
     default "40m" if ESPTOOLPY_FLASHFREQ_40M
+    default "32m" if ESPTOOLPY_FLASHFREQ_32M
     default "26m" if ESPTOOLPY_FLASHFREQ_26M
     default "20m" if ESPTOOLPY_FLASHFREQ_20M
+    default "16m" if ESPTOOLPY_FLASHFREQ_16M
 
 config LIB_BUILDER_COMPILE
     bool
diff --git a/tools/update-components.sh b/tools/update-components.sh
index 615ebe465..763ecef40 100755
--- a/tools/update-components.sh
+++ b/tools/update-components.sh
@@ -87,7 +87,7 @@ if [ ! -d "$AR_COMPS/esp-dl" ]; then
 	git clone $DL_REPO_URL "$AR_COMPS/esp-dl"
 	mv "$AR_COMPS/esp-dl/CMakeLists.txt" "$AR_COMPS/esp-dl/CMakeListsOld.txt"
 	echo "idf_build_get_property(target IDF_TARGET)" > "$AR_COMPS/esp-dl/CMakeLists.txt"
-	echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
+	echo "if(NOT \${IDF_TARGET} STREQUAL \"esp32c6\" AND NOT \${IDF_TARGET} STREQUAL \"esp32h2\")" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
 	cat "$AR_COMPS/esp-dl/CMakeListsOld.txt" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
 	echo "endif()" >> "$AR_COMPS/esp-dl/CMakeLists.txt"
 else
@@ -100,6 +100,25 @@ if [ -f "$AR_COMPS/esp-dl/idf_component.yml" ]; then
 	rm -rf "$AR_COMPS/esp-dl/idf_component.yml"
 fi
 
+#
+# CLONE/UPDATE ESP-SR
+#
+SR_REPO_URL="https://github.com/espressif/esp-sr.git"
+echo "Updating ESP-SR..."
+if [ ! -d "$AR_COMPS/esp-sr" ]; then
+	git clone $SR_REPO_URL "$AR_COMPS/esp-sr"
+	mv "$AR_COMPS/esp-sr/CMakeLists.txt" "$AR_COMPS/esp-sr/CMakeListsOld.txt"
+	echo "if(IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-sr/CMakeLists.txt"
+	cat "$AR_COMPS/esp-sr/CMakeListsOld.txt" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
+	echo "endif()" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
+	echo "  - esp32c6" >> "$AR_COMPS/esp-sr/idf_component.yml"
+	echo "  - esp32h2" >> "$AR_COMPS/esp-sr/idf_component.yml"
+else
+	git -C "$AR_COMPS/esp-sr" fetch && \
+	git -C "$AR_COMPS/esp-sr" pull --ff-only
+fi
+if [ $? -ne 0 ]; then exit 1; fi
+
 #
 # CLONE/UPDATE ESP-RAINMAKER
 #
@@ -143,35 +162,3 @@ else
 	git -C "$AR_COMPS/arduino_tinyusb/tinyusb" pull --ff-only
 fi
 if [ $? -ne 0 ]; then exit 1; fi
-
-#
-# CLONE/UPDATE ESP-SR
-#
-SR_REPO_URL="https://github.com/espressif/esp-sr.git"
-echo "Updating ESP-SR..."
-if [ ! -d "$AR_COMPS/esp-sr" ]; then
-	git clone $SR_REPO_URL "$AR_COMPS/esp-sr"
-	mv "$AR_COMPS/esp-sr/CMakeLists.txt" "$AR_COMPS/esp-sr/CMakeListsOld.txt"
-	echo "if(IDF_TARGET STREQUAL \"esp32s3\")" > "$AR_COMPS/esp-sr/CMakeLists.txt"
-	cat "$AR_COMPS/esp-sr/CMakeListsOld.txt" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
-	echo "endif()" >> "$AR_COMPS/esp-sr/CMakeLists.txt"
-	echo "  - esp32c6" >> "$AR_COMPS/esp-sr/idf_component.yml"
-else
-	git -C "$AR_COMPS/esp-sr" fetch && \
-	git -C "$AR_COMPS/esp-sr" pull --ff-only
-fi
-if [ $? -ne 0 ]; then exit 1; fi
-
-# #
-# # CLONE/UPDATE ESP-DSP
-# #
-# DSP_REPO_URL="https://github.com/espressif/esp-dsp.git"
-# echo "Updating ESP-DSP..."
-# if [ ! -d "$AR_COMPS/espressif__esp-dsp" ]; then
-# 	git clone $DSP_REPO_URL "$AR_COMPS/espressif__esp-dsp"
-# else
-# 	git -C "$AR_COMPS/espressif__esp-dsp" fetch && \
-# 	git -C "$AR_COMPS/espressif__esp-dsp" pull --ff-only
-# fi
-# if [ $? -ne 0 ]; then exit 1; fi
-