diff --git a/.github/scripts/on-release.sh b/.github/scripts/on-release.sh
index dafbf3d6a1c..275c74f8ea5 100755
--- a/.github/scripts/on-release.sh
+++ b/.github/scripts/on-release.sh
@@ -342,12 +342,14 @@ jq_arg=".packages[0].platforms[0].version = \"$RELEASE_TAG\" | \
 echo "Generating $PACKAGE_JSON_DEV ..."
 cat "$PACKAGE_JSON_TEMPLATE" | jq "$jq_arg" > "$OUTPUT_DIR/$PACKAGE_JSON_DEV"
 # On MacOS the sed command won't skip the first match. Use gsed instead.
-sed '0,/github\.com\/espressif\//!s|github\.com/espressif/|dl.espressif.cn/github_assets/espressif/|g' "$OUTPUT_DIR/$PACKAGE_JSON_DEV" > "$OUTPUT_DIR/$PACKAGE_JSON_DEV_CN"
+sed '0,/github\.com\//!s|github\.com/|dl.espressif.cn/github_assets/|g' "$OUTPUT_DIR/$PACKAGE_JSON_DEV" > "$OUTPUT_DIR/$PACKAGE_JSON_DEV_CN"
+python "$SCRIPTS_DIR/release_append_cn.py" "$OUTPUT_DIR/$PACKAGE_JSON_DEV_CN"
 if [ "$RELEASE_PRE" == "false" ]; then
     echo "Generating $PACKAGE_JSON_REL ..."
     cat "$PACKAGE_JSON_TEMPLATE" | jq "$jq_arg" > "$OUTPUT_DIR/$PACKAGE_JSON_REL"
     # On MacOS the sed command won't skip the first match. Use gsed instead.
-    sed '0,/github\.com\/espressif\//!s|github\.com/espressif/|dl.espressif.cn/github_assets/espressif/|g' "$OUTPUT_DIR/$PACKAGE_JSON_REL" > "$OUTPUT_DIR/$PACKAGE_JSON_REL_CN"
+    sed '0,/github\.com\//!s|github\.com/|dl.espressif.cn/github_assets/|g' "$OUTPUT_DIR/$PACKAGE_JSON_REL" > "$OUTPUT_DIR/$PACKAGE_JSON_REL_CN"
+    python "$SCRIPTS_DIR/release_append_cn.py" "$OUTPUT_DIR/$PACKAGE_JSON_REL_CN"
 fi
 
 # Figure out the last release or pre-release
@@ -456,14 +458,14 @@ echo "Uploading $PACKAGE_JSON_DEV ..."
 echo "Download URL: $(git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV")"
 echo "Pages URL: $(git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV")"
 echo "Download CN URL: $(git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_DEV_CN")"
-echo "Pages CN URL: $(git_safe_upload_to_pages "$PACKAGE_JSON_DEV" "$OUTPUT_DIR/$PACKAGE_JSON_DEV_CN")"
+echo "Pages CN URL: $(git_safe_upload_to_pages "$PACKAGE_JSON_DEV_CN" "$OUTPUT_DIR/$PACKAGE_JSON_DEV_CN")"
 echo
 if [ "$RELEASE_PRE" == "false" ]; then
     echo "Uploading $PACKAGE_JSON_REL ..."
     echo "Download URL: $(git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_REL")"
     echo "Pages URL: $(git_safe_upload_to_pages "$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL")"
     echo "Download CN URL: $(git_safe_upload_asset "$OUTPUT_DIR/$PACKAGE_JSON_REL_CN")"
-    echo "Pages CN URL: $(git_safe_upload_to_pages "$PACKAGE_JSON_REL" "$OUTPUT_DIR/$PACKAGE_JSON_REL_CN")"
+    echo "Pages CN URL: $(git_safe_upload_to_pages "$PACKAGE_JSON_REL_CN" "$OUTPUT_DIR/$PACKAGE_JSON_REL_CN")"
     echo
 fi
 
diff --git a/.github/scripts/release_append_cn.py b/.github/scripts/release_append_cn.py
new file mode 100755
index 00000000000..b29fe0c31ba
--- /dev/null
+++ b/.github/scripts/release_append_cn.py
@@ -0,0 +1,56 @@
+
+#!/usr/bin/env python3
+
+# Arduino IDE provides by default a package file for the ESP32. This causes version conflicts
+# when the user tries to use the JSON file with the Chinese mirrors.
+#
+# The downside is that the Arduino IDE will always warn the user that updates are available as it
+# will consider the version from the Chinese mirrors as a pre-release version.
+#
+# This script is used to append "-cn" to all versions in the package_esp32_index_cn.json file so that
+# the user can select the Chinese mirrors without conflicts.
+#
+# If Arduino ever stops providing the package_esp32_index.json file by default,
+# this script can be removed and the tags reverted.
+
+import json
+
+def append_cn_to_versions(obj):
+    if isinstance(obj, dict):
+        # dfu-util comes from arduino.cc and not from the Chinese mirrors, so we skip it
+        if obj.get("name") == "dfu-util":
+            return
+
+        for key, value in obj.items():
+            if key == "version" and isinstance(value, str):
+                if not value.endswith("-cn"):
+                    obj[key] = value + "-cn"
+            else:
+                append_cn_to_versions(value)
+
+    elif isinstance(obj, list):
+        for item in obj:
+            append_cn_to_versions(item)
+
+def process_json_file(input_path, output_path=None):
+    with open(input_path, "r", encoding="utf-8") as f:
+        data = json.load(f)
+
+    append_cn_to_versions(data)
+
+    if output_path is None:
+        output_path = input_path
+
+    with open(output_path, "w", encoding="utf-8") as f:
+        json.dump(data, f, indent=2)
+
+    print(f"Updated JSON written to {output_path}")
+
+if __name__ == "__main__":
+    import sys
+    if len(sys.argv) < 2:
+        print("Usage: python release_append_cn.py input.json [output.json]")
+    else:
+        input_file = sys.argv[1]
+        output_file = sys.argv[2] if len(sys.argv) > 2 else None
+        process_json_file(input_file, output_file)
diff --git a/.github/workflows/publishsizes.yml b/.github/workflows/publishsizes.yml
index 69c18cf1835..8ff591e052b 100644
--- a/.github/workflows/publishsizes.yml
+++ b/.github/workflows/publishsizes.yml
@@ -44,16 +44,17 @@ jobs:
           gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
           do
             IFS=$'\t' read name url <<< "$artifact"
-            gh api $url > "$name.zip"
-            unzip -j "$name.zip" -d "temp_$name"
-            if [[ "$name" == "pr_number" ]]; then
-              mv "temp_$name"/* sizes-report
-            elif [[ "$name" == "pr_cli"* ]]; then
-              mv "temp_$name"/* sizes-report/pr
-            else
-              mv "temp_$name"/* sizes-report
+            # Only process pr_number and pr_cli_compile artifacts
+            if [[ "$name" == "pr_number" || "$name" =~ ^pr_cli_compile_[0-9]+$ ]]; then
+              gh api $url > "$name.zip"
+              unzip -o -j "$name.zip" -d "temp_$name"
+              if [[ "$name" == "pr_number" ]]; then
+                mv "temp_$name"/* sizes-report
+              elif [[ "$name" =~ ^pr_cli_compile_[0-9]+$ ]]; then
+                mv "temp_$name"/* sizes-report/pr
+              fi
+              rm -r "temp_$name"
             fi
-            rm -r "temp_$name"
           done
           echo "Contents of parent directory:"
           ls -R ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d53d612962d..e8f44ac5ee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,6 +165,7 @@ set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
 set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
 
 set(ARDUINO_LIBRARY_OpenThread_SRCS
+  libraries/OpenThread/src/OThread.cpp
   libraries/OpenThread/src/OThreadCLI.cpp
   libraries/OpenThread/src/OThreadCLI_Util.cpp)
 
diff --git a/boards.txt b/boards.txt
index 7e86af52a4f..15a75eaad8b 100644
--- a/boards.txt
+++ b/boards.txt
@@ -282,6 +282,15 @@ esp32p4.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
 esp32p4.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
 esp32p4.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
 esp32p4.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
+esp32p4.menu.PartitionScheme.app5M_fat24M_32MB=32M Flash (4.8MB APP/22MB FATFS)
+esp32p4.menu.PartitionScheme.app5M_fat24M_32MB.build.partitions=large_fat_32MB
+esp32p4.menu.PartitionScheme.app5M_fat24M_32MB.upload.maximum_size=4718592
+esp32p4.menu.PartitionScheme.app5M_little24M_32MB=32M Flash (4.8MB APP/22MB LittleFS)
+esp32p4.menu.PartitionScheme.app5M_little24M_32MB.build.partitions=large_littlefs_32MB
+esp32p4.menu.PartitionScheme.app5M_little24M_32MB.upload.maximum_size=4718592
+esp32p4.menu.PartitionScheme.app13M_data7M_32MB=32M Flash (13MB APP/6.75MB SPIFFS)
+esp32p4.menu.PartitionScheme.app13M_data7M_32MB.build.partitions=default_32MB
+esp32p4.menu.PartitionScheme.app13M_data7M_32MB.upload.maximum_size=13107200
 esp32p4.menu.PartitionScheme.custom=Custom
 esp32p4.menu.PartitionScheme.custom.build.partitions=
 esp32p4.menu.PartitionScheme.custom.upload.maximum_size=16777216
@@ -314,6 +323,8 @@ esp32p4.menu.FlashSize.2M.build.flash_size=2MB
 esp32p4.menu.FlashSize.2M.build.partitions=minimal
 esp32p4.menu.FlashSize.16M=16MB (128Mb)
 esp32p4.menu.FlashSize.16M.build.flash_size=16MB
+esp32p4.menu.FlashSize.32M=32MB (256Mb)
+esp32p4.menu.FlashSize.32M.build.flash_size=32MB
 
 esp32p4.menu.UploadSpeed.921600=921600
 esp32p4.menu.UploadSpeed.921600.upload.speed=921600
@@ -31513,16 +31524,16 @@ wifiduino32c3.build.target=esp
 wifiduino32c3.build.mcu=esp32c3
 wifiduino32c3.build.core=esp32
 wifiduino32c3.build.variant=wifiduinov2
-wifiduino32c3.build.board=WiFiduinoV2
+wifiduino32c3.build.board=WIFIDUINOV2
 wifiduino32c3.build.bootloader_addr=0x0
 
 wifiduino32c3.build.cdc_on_boot=0
 wifiduino32c3.build.f_cpu=160000000L
 wifiduino32c3.build.flash_size=4MB
 wifiduino32c3.build.flash_freq=80m
-wifiduino32c3.build.flash_mode=qio
-wifiduino32c3.build.boot=qio
-wifiduino32c3.build.partitions=default
+wifiduino32c3.build.flash_mode=dio
+wifiduino32c3.build.boot=dio
+wifiduino32c3.build.partitions=no_ota
 wifiduino32c3.build.defines=
 
 wifiduino32c3.menu.CDCOnBoot.default=Disabled
@@ -31530,6 +31541,9 @@ wifiduino32c3.menu.CDCOnBoot.default.build.cdc_on_boot=0
 wifiduino32c3.menu.CDCOnBoot.cdc=Enabled
 wifiduino32c3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
 
+wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
+wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
 wifiduino32c3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
 wifiduino32c3.menu.PartitionScheme.default.build.partitions=default
 wifiduino32c3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -31539,9 +31553,6 @@ wifiduino32c3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
 wifiduino32c3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
 wifiduino32c3.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
 wifiduino32c3.menu.PartitionScheme.minimal.build.partitions=minimal
-wifiduino32c3.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
-wifiduino32c3.menu.PartitionScheme.no_ota.build.partitions=no_ota
-wifiduino32c3.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
 wifiduino32c3.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
 wifiduino32c3.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
 wifiduino32c3.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
@@ -31584,12 +31595,12 @@ wifiduino32c3.menu.CPUFreq.20.build.f_cpu=20000000L
 wifiduino32c3.menu.CPUFreq.10=10MHz
 wifiduino32c3.menu.CPUFreq.10.build.f_cpu=10000000L
 
-wifiduino32c3.menu.FlashMode.qio=QIO
-wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
-wifiduino32c3.menu.FlashMode.qio.build.boot=qio
 wifiduino32c3.menu.FlashMode.dio=DIO
 wifiduino32c3.menu.FlashMode.dio.build.flash_mode=dio
 wifiduino32c3.menu.FlashMode.dio.build.boot=dio
+wifiduino32c3.menu.FlashMode.qio=QIO
+wifiduino32c3.menu.FlashMode.qio.build.flash_mode=dio
+wifiduino32c3.menu.FlashMode.qio.build.boot=qio
 
 wifiduino32c3.menu.FlashFreq.80=80MHz
 wifiduino32c3.menu.FlashFreq.80.build.flash_freq=80m
@@ -31665,34 +31676,34 @@ wifiduino32s3.build.target=esp32s3
 wifiduino32s3.build.mcu=esp32s3
 wifiduino32s3.build.core=esp32
 wifiduino32s3.build.variant=wifiduino32s3
-wifiduino32s3.build.board=WiFiduino32S3
+wifiduino32s3.build.board=WIFIDUINO32S3
 
 wifiduino32s3.build.usb_mode=1
 wifiduino32s3.build.cdc_on_boot=0
 wifiduino32s3.build.msc_on_boot=0
 wifiduino32s3.build.dfu_on_boot=0
 wifiduino32s3.build.f_cpu=240000000L
-wifiduino32s3.build.flash_size=4MB
+wifiduino32s3.build.flash_size=16MB
 wifiduino32s3.build.flash_freq=80m
 wifiduino32s3.build.flash_mode=dio
 wifiduino32s3.build.boot=qio
 wifiduino32s3.build.boot_freq=80m
-wifiduino32s3.build.partitions=default
+wifiduino32s3.build.partitions=app3M_fat9M_16MB
 wifiduino32s3.build.defines=
 wifiduino32s3.build.loop_core=
 wifiduino32s3.build.event_core=
-wifiduino32s3.build.psram_type=qspi
+wifiduino32s3.build.psram_type=opi
 wifiduino32s3.build.memory_type={build.boot}_{build.psram_type}
 
+wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
+wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
 wifiduino32s3.menu.PSRAM.disabled=Disabled
 wifiduino32s3.menu.PSRAM.disabled.build.defines=
 wifiduino32s3.menu.PSRAM.disabled.build.psram_type=qspi
 wifiduino32s3.menu.PSRAM.enabled=QSPI PSRAM
 wifiduino32s3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
 wifiduino32s3.menu.PSRAM.enabled.build.psram_type=qspi
-wifiduino32s3.menu.PSRAM.opi=OPI PSRAM
-wifiduino32s3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
-wifiduino32s3.menu.PSRAM.opi.build.psram_type=opi
 
 wifiduino32s3.menu.FlashMode.qio=QIO 80MHz
 wifiduino32s3.menu.FlashMode.qio.build.flash_mode=dio
@@ -31715,12 +31726,10 @@ wifiduino32s3.menu.FlashMode.opi.build.boot=opi
 wifiduino32s3.menu.FlashMode.opi.build.boot_freq=80m
 wifiduino32s3.menu.FlashMode.opi.build.flash_freq=80m
 
-wifiduino32s3.menu.FlashSize.4M=4MB (32Mb)
-wifiduino32s3.menu.FlashSize.4M.build.flash_size=4MB
-wifiduino32s3.menu.FlashSize.8M=8MB (64Mb)
-wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB
 wifiduino32s3.menu.FlashSize.16M=16MB (128Mb)
 wifiduino32s3.menu.FlashSize.16M.build.flash_size=16MB
+wifiduino32s3.menu.FlashSize.8M=8MB (64Mb)
+wifiduino32s3.menu.FlashSize.8M.build.flash_size=8MB
 #wifiduino32s3.menu.FlashSize.32M=32MB (256Mb)
 #wifiduino32s3.menu.FlashSize.32M.build.flash_size=32MB
 
@@ -31761,6 +31770,9 @@ wifiduino32s3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
 wifiduino32s3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
 wifiduino32s3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
 
+wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
+wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
+wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 wifiduino32s3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
 wifiduino32s3.menu.PartitionScheme.default.build.partitions=default
 wifiduino32s3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -31791,9 +31803,6 @@ wifiduino32s3.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
 wifiduino32s3.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
 wifiduino32s3.menu.PartitionScheme.fatflash.build.partitions=ffat
 wifiduino32s3.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
-wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
-wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
-wifiduino32s3.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
 wifiduino32s3.menu.PartitionScheme.rainmaker=RainMaker 4MB
 wifiduino32s3.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
 wifiduino32s3.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
@@ -41589,11 +41598,6 @@ Geekble_ESP32C3.build.boot=qio
 Geekble_ESP32C3.build.partitions=default
 Geekble_ESP32C3.build.defines=
 
-Geekble_ESP32C3.menu.CDCOnBoot.default=Enabled
-Geekble_ESP32C3.menu.CDCOnBoot.default.build.cdc_on_boot=1
-Geekble_ESP32C3.menu.CDCOnBoot.cdc=Disabled
-Geekble_ESP32C3.menu.CDCOnBoot.cdc.build.cdc_on_boot=0
-
 Geekble_ESP32C3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
 Geekble_ESP32C3.menu.PartitionScheme.default.build.partitions=default
 Geekble_ESP32C3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
@@ -41614,39 +41618,6 @@ Geekble_ESP32C3.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
 Geekble_ESP32C3.menu.PartitionScheme.huge_app.build.partitions=huge_app
 Geekble_ESP32C3.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
 
-Geekble_ESP32C3.menu.CPUFreq.160=160MHz (WiFi) (Default)
-Geekble_ESP32C3.menu.CPUFreq.160.build.f_cpu=160000000L
-Geekble_ESP32C3.menu.CPUFreq.80=80MHz (WiFi)
-Geekble_ESP32C3.menu.CPUFreq.80.build.f_cpu=80000000L
-Geekble_ESP32C3.menu.CPUFreq.40=40MHz
-Geekble_ESP32C3.menu.CPUFreq.40.build.f_cpu=40000000L
-Geekble_ESP32C3.menu.CPUFreq.20=20MHz
-Geekble_ESP32C3.menu.CPUFreq.20.build.f_cpu=20000000L
-Geekble_ESP32C3.menu.CPUFreq.10=10MHz
-Geekble_ESP32C3.menu.CPUFreq.10.build.f_cpu=10000000L
-
-Geekble_ESP32C3.menu.FlashMode.qio=QIO (Default)
-Geekble_ESP32C3.menu.FlashMode.qio.build.flash_mode=dio
-Geekble_ESP32C3.menu.FlashMode.qio.build.boot=qio
-Geekble_ESP32C3.menu.FlashMode.dio=DIO
-Geekble_ESP32C3.menu.FlashMode.dio.build.flash_mode=dio
-Geekble_ESP32C3.menu.FlashMode.dio.build.boot=dio
-Geekble_ESP32C3.menu.FlashMode.qout=QOUT
-Geekble_ESP32C3.menu.FlashMode.qout.build.flash_mode=dout
-Geekble_ESP32C3.menu.FlashMode.qout.build.boot=qout
-Geekble_ESP32C3.menu.FlashMode.dout=DOUT
-Geekble_ESP32C3.menu.FlashMode.dout.build.flash_mode=dout
-
-Geekble_ESP32C3.menu.FlashFreq.80=80MHz (Default)
-Geekble_ESP32C3.menu.FlashFreq.80.build.flash_freq=80m
-Geekble_ESP32C3.menu.FlashFreq.40=40MHz
-Geekble_ESP32C3.menu.FlashFreq.40.build.flash_freq=40m
-
-Geekble_ESP32C3.menu.FlashSize.4M=4MB (Default)
-Geekble_ESP32C3.menu.FlashSize.4M.build.flash_size=4MB
-Geekble_ESP32C3.menu.FlashSize.2M=2MB
-Geekble_ESP32C3.menu.FlashSize.2M.build.flash_size=2MB
-
 Geekble_ESP32C3.menu.UploadSpeed.921600=921600 (Default)
 Geekble_ESP32C3.menu.UploadSpeed.921600.upload.speed=921600
 Geekble_ESP32C3.menu.UploadSpeed.115200=115200
diff --git a/cores/esp32/esp32-hal-ledc.c b/cores/esp32/esp32-hal-ledc.c
index 039fa1312f1..18b722f80a2 100644
--- a/cores/esp32/esp32-hal-ledc.c
+++ b/cores/esp32/esp32-hal-ledc.c
@@ -22,6 +22,9 @@
 #include "soc/gpio_sig_map.h"
 #include "esp_rom_gpio.h"
 #include "hal/ledc_ll.h"
+#if SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED
+#include <math.h>
+#endif
 
 #ifdef SOC_LEDC_SUPPORT_HS_MODE
 #define LEDC_CHANNELS (SOC_LEDC_CHANNEL_NUM << 1)
@@ -45,6 +48,93 @@ typedef struct {
 
 ledc_periph_t ledc_handle = {0};
 
+// Helper function to find a timer with matching frequency and resolution
+static bool find_matching_timer(uint8_t speed_mode, uint32_t freq, uint8_t resolution, uint8_t *timer_num) {
+  log_d("Searching for timer with freq=%u, resolution=%u", freq, resolution);
+  // Check all channels to find one with matching frequency and resolution
+  for (uint8_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
+    if (!perimanPinIsValid(i)) {
+      continue;
+    }
+    peripheral_bus_type_t type = perimanGetPinBusType(i);
+    if (type == ESP32_BUS_TYPE_LEDC) {
+      ledc_channel_handle_t *bus = (ledc_channel_handle_t *)perimanGetPinBus(i, ESP32_BUS_TYPE_LEDC);
+      if (bus != NULL && (bus->channel / SOC_LEDC_CHANNEL_NUM) == speed_mode && bus->freq_hz == freq && bus->channel_resolution == resolution) {
+        log_d("Found matching timer %u for freq=%u, resolution=%u", bus->timer_num, freq, resolution);
+        *timer_num = bus->timer_num;
+        return true;
+      }
+    }
+  }
+  log_d("No matching timer found for freq=%u, resolution=%u", freq, resolution);
+  return false;
+}
+
+// Helper function to find an unused timer
+static bool find_free_timer(uint8_t speed_mode, uint8_t *timer_num) {
+  // Check which timers are in use
+  uint8_t used_timers = 0;
+  for (uint8_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
+    if (!perimanPinIsValid(i)) {
+      continue;
+    }
+    peripheral_bus_type_t type = perimanGetPinBusType(i);
+    if (type == ESP32_BUS_TYPE_LEDC) {
+      ledc_channel_handle_t *bus = (ledc_channel_handle_t *)perimanGetPinBus(i, ESP32_BUS_TYPE_LEDC);
+      if (bus != NULL && (bus->channel / SOC_LEDC_CHANNEL_NUM) == speed_mode) {
+        log_d("Timer %u is in use by channel %u", bus->timer_num, bus->channel);
+        used_timers |= (1 << bus->timer_num);
+      }
+    }
+  }
+
+  // Find first unused timer
+  for (uint8_t i = 0; i < SOC_LEDC_TIMER_NUM; i++) {
+    if (!(used_timers & (1 << i))) {
+      log_d("Found free timer %u", i);
+      *timer_num = i;
+      return true;
+    }
+  }
+  log_e("No free timers available");
+  return false;
+}
+
+// Helper function to remove a channel from a timer and clear timer if no channels are using it
+static void remove_channel_from_timer(uint8_t speed_mode, uint8_t timer_num, uint8_t channel) {
+  log_d("Removing channel %u from timer %u in speed_mode %u", channel, timer_num, speed_mode);
+
+  // Check if any other channels are using this timer
+  bool timer_in_use = false;
+  for (uint8_t i = 0; i < SOC_GPIO_PIN_COUNT; i++) {
+    if (!perimanPinIsValid(i)) {
+      continue;
+    }
+    peripheral_bus_type_t type = perimanGetPinBusType(i);
+    if (type == ESP32_BUS_TYPE_LEDC) {
+      ledc_channel_handle_t *bus = (ledc_channel_handle_t *)perimanGetPinBus(i, ESP32_BUS_TYPE_LEDC);
+      if (bus != NULL && (bus->channel / SOC_LEDC_CHANNEL_NUM) == speed_mode && bus->timer_num == timer_num && bus->channel != channel) {
+        log_d("Timer %u is still in use by channel %u", timer_num, bus->channel);
+        timer_in_use = true;
+        break;
+      }
+    }
+  }
+
+  if (!timer_in_use) {
+    log_d("No other channels using timer %u, deconfiguring timer", timer_num);
+    // Stop the timer
+    ledc_timer_pause(speed_mode, timer_num);
+    // Deconfigure the timer
+    ledc_timer_config_t ledc_timer;
+    memset((void *)&ledc_timer, 0, sizeof(ledc_timer_config_t));
+    ledc_timer.speed_mode = speed_mode;
+    ledc_timer.timer_num = timer_num;
+    ledc_timer.deconfigure = true;
+    ledc_timer_config(&ledc_timer);
+  }
+}
+
 static bool fade_initialized = false;
 
 static ledc_clk_cfg_t clock_source = LEDC_DEFAULT_CLK;
@@ -81,6 +171,8 @@ static bool ledcDetachBus(void *bus) {
   }
   pinMatrixOutDetach(handle->pin, false, false);
   if (!channel_found) {
+    uint8_t group = (handle->channel / SOC_LEDC_CHANNEL_NUM);
+    remove_channel_from_timer(group, handle->timer_num, handle->channel % SOC_LEDC_CHANNEL_NUM);
     ledc_handle.used_channels &= ~(1UL << handle->channel);
   }
   free(handle);
@@ -117,34 +209,45 @@ bool ledcAttachChannel(uint8_t pin, uint32_t freq, uint8_t resolution, uint8_t c
     return false;
   }
 
-  uint8_t group = (channel / 8), timer = ((channel / 2) % 4);
+  uint8_t group = (channel / SOC_LEDC_CHANNEL_NUM);
+  uint8_t timer = 0;
   bool channel_used = ledc_handle.used_channels & (1UL << channel);
+
   if (channel_used) {
     log_i("Channel %u is already set up, given frequency and resolution will be ignored", channel);
-    if (ledc_set_pin(pin, group, channel % 8) != ESP_OK) {
+    if (ledc_set_pin(pin, group, channel % SOC_LEDC_CHANNEL_NUM) != ESP_OK) {
       log_e("Attaching pin to already used channel failed!");
       return false;
     }
   } else {
-    ledc_timer_config_t ledc_timer;
-    memset((void *)&ledc_timer, 0, sizeof(ledc_timer_config_t));
-    ledc_timer.speed_mode = group;
-    ledc_timer.timer_num = timer;
-    ledc_timer.duty_resolution = resolution;
-    ledc_timer.freq_hz = freq;
-    ledc_timer.clk_cfg = clock_source;
+    // Find a timer with matching frequency and resolution, or a free timer
+    if (!find_matching_timer(group, freq, resolution, &timer)) {
+      if (!find_free_timer(group, &timer)) {
+        log_w("No free timers available for speed mode %u", group);
+        return false;
+      }
 
-    if (ledc_timer_config(&ledc_timer) != ESP_OK) {
-      log_e("ledc setup failed!");
-      return false;
+      // Configure the timer if we're using a new one
+      ledc_timer_config_t ledc_timer;
+      memset((void *)&ledc_timer, 0, sizeof(ledc_timer_config_t));
+      ledc_timer.speed_mode = group;
+      ledc_timer.timer_num = timer;
+      ledc_timer.duty_resolution = resolution;
+      ledc_timer.freq_hz = freq;
+      ledc_timer.clk_cfg = clock_source;
+
+      if (ledc_timer_config(&ledc_timer) != ESP_OK) {
+        log_e("ledc setup failed!");
+        return false;
+      }
     }
 
-    uint32_t duty = ledc_get_duty(group, (channel % 8));
+    uint32_t duty = ledc_get_duty(group, (channel % SOC_LEDC_CHANNEL_NUM));
 
     ledc_channel_config_t ledc_channel;
     memset((void *)&ledc_channel, 0, sizeof(ledc_channel_config_t));
     ledc_channel.speed_mode = group;
-    ledc_channel.channel = (channel % 8);
+    ledc_channel.channel = (channel % SOC_LEDC_CHANNEL_NUM);
     ledc_channel.timer_sel = timer;
     ledc_channel.intr_type = LEDC_INTR_DISABLE;
     ledc_channel.gpio_num = pin;
@@ -157,6 +260,8 @@ bool ledcAttachChannel(uint8_t pin, uint32_t freq, uint8_t resolution, uint8_t c
   ledc_channel_handle_t *handle = (ledc_channel_handle_t *)malloc(sizeof(ledc_channel_handle_t));
   handle->pin = pin;
   handle->channel = channel;
+  handle->timer_num = timer;
+  handle->freq_hz = freq;
 #ifndef SOC_LEDC_SUPPORT_FADE_STOP
   handle->lock = NULL;
 #endif
@@ -172,7 +277,7 @@ bool ledcAttachChannel(uint8_t pin, uint32_t freq, uint8_t resolution, uint8_t c
     ledc_handle.used_channels |= 1UL << channel;
   }
 
-  if (!perimanSetPinBus(pin, ESP32_BUS_TYPE_LEDC, (void *)handle, group, channel)) {
+  if (!perimanSetPinBus(pin, ESP32_BUS_TYPE_LEDC, (void *)handle, channel, timer)) {
     ledcDetachBus((void *)handle);
     return false;
   }
@@ -189,14 +294,40 @@ bool ledcAttach(uint8_t pin, uint32_t freq, uint8_t resolution) {
   }
   uint8_t channel = __builtin_ctz(free_channel);  // Convert the free_channel bit to channel number
 
-  return ledcAttachChannel(pin, freq, resolution, channel);
+  // Try the first available channel
+  if (ledcAttachChannel(pin, freq, resolution, channel)) {
+    return true;
+  }
+
+#ifdef SOC_LEDC_SUPPORT_HS_MODE
+  // If first attempt failed and HS mode is supported, try to find a free channel in group 1
+  if ((channel / SOC_LEDC_CHANNEL_NUM) == 0) {  // First attempt was in group 0
+    log_d("LEDC: Group 0 channel %u failed, trying to find a free channel in group 1", channel);
+    // Find free channels specifically in group 1
+    uint32_t group1_mask = ((1UL << SOC_LEDC_CHANNEL_NUM) - 1) << SOC_LEDC_CHANNEL_NUM;
+    int group1_free_channel = (~ledc_handle.used_channels) & group1_mask;
+    if (group1_free_channel != 0) {
+      uint8_t group1_channel = __builtin_ctz(group1_free_channel);
+      if (ledcAttachChannel(pin, freq, resolution, group1_channel)) {
+        return true;
+      }
+    }
+  }
+#endif
+
+  log_e(
+    "No free timers available for freq=%u, resolution=%u. To attach a new channel, use the same frequency and resolution as an already attached channel to "
+    "share its timer.",
+    freq, resolution
+  );
+  return false;
 }
 
 bool ledcWrite(uint8_t pin, uint32_t duty) {
   ledc_channel_handle_t *bus = (ledc_channel_handle_t *)perimanGetPinBus(pin, ESP32_BUS_TYPE_LEDC);
   if (bus != NULL) {
 
-    uint8_t group = (bus->channel / 8), channel = (bus->channel % 8);
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM), channel = (bus->channel % SOC_LEDC_CHANNEL_NUM);
 
     //Fixing if all bits in resolution is set = LEDC FULL ON
     uint32_t max_duty = (1 << bus->channel_resolution) - 1;
@@ -205,8 +336,14 @@ bool ledcWrite(uint8_t pin, uint32_t duty) {
       duty = max_duty + 1;
     }
 
-    ledc_set_duty(group, channel, duty);
-    ledc_update_duty(group, channel);
+    if (ledc_set_duty(group, channel, duty) != ESP_OK) {
+      log_e("ledc_set_duty failed");
+      return false;
+    }
+    if (ledc_update_duty(group, channel) != ESP_OK) {
+      log_e("ledc_update_duty failed");
+      return false;
+    }
 
     return true;
   }
@@ -219,7 +356,11 @@ bool ledcWriteChannel(uint8_t channel, uint32_t duty) {
     log_e("Channel %u is not available (maximum %u) or not used!", channel, LEDC_CHANNELS);
     return false;
   }
-  uint8_t group = (channel / 8), timer = ((channel / 2) % 4);
+  uint8_t group = (channel / SOC_LEDC_CHANNEL_NUM);
+  ledc_timer_t timer;
+
+  // Get the actual timer being used by this channel
+  ledc_ll_get_channel_timer(LEDC_LL_GET_HW(), group, (channel % SOC_LEDC_CHANNEL_NUM), &timer);
 
   //Fixing if all bits in resolution is set = LEDC FULL ON
   uint32_t resolution = 0;
@@ -231,8 +372,14 @@ bool ledcWriteChannel(uint8_t channel, uint32_t duty) {
     duty = max_duty + 1;
   }
 
-  ledc_set_duty(group, channel, duty);
-  ledc_update_duty(group, channel);
+  if (ledc_set_duty(group, channel, duty) != ESP_OK) {
+    log_e("ledc_set_duty failed");
+    return false;
+  }
+  if (ledc_update_duty(group, channel) != ESP_OK) {
+    log_e("ledc_update_duty failed");
+    return false;
+  }
 
   return true;
 }
@@ -241,7 +388,7 @@ uint32_t ledcRead(uint8_t pin) {
   ledc_channel_handle_t *bus = (ledc_channel_handle_t *)perimanGetPinBus(pin, ESP32_BUS_TYPE_LEDC);
   if (bus != NULL) {
 
-    uint8_t group = (bus->channel / 8), channel = (bus->channel % 8);
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM), channel = (bus->channel % SOC_LEDC_CHANNEL_NUM);
     return ledc_get_duty(group, channel);
   }
   return 0;
@@ -253,8 +400,8 @@ uint32_t ledcReadFreq(uint8_t pin) {
     if (!ledcRead(pin)) {
       return 0;
     }
-    uint8_t group = (bus->channel / 8), timer = ((bus->channel / 2) % 4);
-    return ledc_get_freq(group, timer);
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM);
+    return ledc_get_freq(group, bus->timer_num);
   }
   return 0;
 }
@@ -268,12 +415,12 @@ uint32_t ledcWriteTone(uint8_t pin, uint32_t freq) {
       return 0;
     }
 
-    uint8_t group = (bus->channel / 8), timer = ((bus->channel / 2) % 4);
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM);
 
     ledc_timer_config_t ledc_timer;
     memset((void *)&ledc_timer, 0, sizeof(ledc_timer_config_t));
     ledc_timer.speed_mode = group;
-    ledc_timer.timer_num = timer;
+    ledc_timer.timer_num = bus->timer_num;
     ledc_timer.duty_resolution = 10;
     ledc_timer.freq_hz = freq;
     ledc_timer.clk_cfg = clock_source;
@@ -284,7 +431,7 @@ uint32_t ledcWriteTone(uint8_t pin, uint32_t freq) {
     }
     bus->channel_resolution = 10;
 
-    uint32_t res_freq = ledc_get_freq(group, timer);
+    uint32_t res_freq = ledc_get_freq(group, bus->timer_num);
     ledcWrite(pin, 0x1FF);
     return res_freq;
   }
@@ -325,12 +472,12 @@ uint32_t ledcChangeFrequency(uint8_t pin, uint32_t freq, uint8_t resolution) {
       log_e("LEDC pin %u - resolution is zero or it is too big (maximum %u)", pin, LEDC_MAX_BIT_WIDTH);
       return 0;
     }
-    uint8_t group = (bus->channel / 8), timer = ((bus->channel / 2) % 4);
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM);
 
     ledc_timer_config_t ledc_timer;
     memset((void *)&ledc_timer, 0, sizeof(ledc_timer_config_t));
     ledc_timer.speed_mode = group;
-    ledc_timer.timer_num = timer;
+    ledc_timer.timer_num = bus->timer_num;
     ledc_timer.duty_resolution = resolution;
     ledc_timer.freq_hz = freq;
     ledc_timer.clk_cfg = clock_source;
@@ -340,7 +487,7 @@ uint32_t ledcChangeFrequency(uint8_t pin, uint32_t freq, uint8_t resolution) {
       return 0;
     }
     bus->channel_resolution = resolution;
-    return ledc_get_freq(group, timer);
+    return ledc_get_freq(group, bus->timer_num);
   }
   return 0;
 }
@@ -351,12 +498,14 @@ bool ledcOutputInvert(uint8_t pin, bool out_invert) {
     gpio_set_level(pin, out_invert);
 
 #ifdef CONFIG_IDF_TARGET_ESP32P4
-    esp_rom_gpio_connect_out_signal(pin, LEDC_LS_SIG_OUT_PAD_OUT0_IDX + ((bus->channel) % 8), out_invert, 0);
+    esp_rom_gpio_connect_out_signal(pin, LEDC_LS_SIG_OUT_PAD_OUT0_IDX + ((bus->channel) % SOC_LEDC_CHANNEL_NUM), out_invert, 0);
 #else
 #ifdef SOC_LEDC_SUPPORT_HS_MODE
-    esp_rom_gpio_connect_out_signal(pin, ((bus->channel / 8 == 0) ? LEDC_HS_SIG_OUT0_IDX : LEDC_LS_SIG_OUT0_IDX) + ((bus->channel) % 8), out_invert, 0);
+    esp_rom_gpio_connect_out_signal(
+      pin, ((bus->channel / SOC_LEDC_CHANNEL_NUM == 0) ? LEDC_HS_SIG_OUT0_IDX : LEDC_LS_SIG_OUT0_IDX) + ((bus->channel) % SOC_LEDC_CHANNEL_NUM), out_invert, 0
+    );
 #else
-    esp_rom_gpio_connect_out_signal(pin, LEDC_LS_SIG_OUT0_IDX + ((bus->channel) % 8), out_invert, 0);
+    esp_rom_gpio_connect_out_signal(pin, LEDC_LS_SIG_OUT0_IDX + ((bus->channel) % SOC_LEDC_CHANNEL_NUM), out_invert, 0);
 #endif
 #endif  // ifdef CONFIG_IDF_TARGET_ESP32P4
     return true;
@@ -403,7 +552,7 @@ static bool ledcFadeConfig(uint8_t pin, uint32_t start_duty, uint32_t target_dut
     }
 #endif
 #endif
-    uint8_t group = (bus->channel / 8), channel = (bus->channel % 8);
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM), channel = (bus->channel % SOC_LEDC_CHANNEL_NUM);
 
     // Initialize fade service.
     if (!fade_initialized) {
@@ -460,6 +609,161 @@ bool ledcFadeWithInterruptArg(uint8_t pin, uint32_t start_duty, uint32_t target_
   return ledcFadeConfig(pin, start_duty, target_duty, max_fade_time_ms, userFunc, arg);
 }
 
+#ifdef SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED
+// Default gamma factor for gamma correction (common value for LEDs)
+static float ledcGammaFactor = 2.8;
+// Gamma correction LUT support
+static const float *ledcGammaLUT = NULL;
+static uint16_t ledcGammaLUTSize = 0;
+// Global variable to store current resolution for gamma callback
+static uint8_t ledcGammaResolution = 13;
+
+bool ledcSetGammaTable(const float *gamma_table, uint16_t size) {
+  if (gamma_table == NULL || size == 0) {
+    log_e("Invalid gamma table or size");
+    return false;
+  }
+  ledcGammaLUT = gamma_table;
+  ledcGammaLUTSize = size;
+  log_i("Custom gamma LUT set with %u entries", size);
+  return true;
+}
+
+void ledcClearGammaTable(void) {
+  ledcGammaLUT = NULL;
+  ledcGammaLUTSize = 0;
+  log_i("Gamma LUT cleared, using mathematical calculation");
+}
+
+void ledcSetGammaFactor(float factor) {
+  ledcGammaFactor = factor;
+}
+
+// Gamma correction calculator function
+static uint32_t ledcGammaCorrection(uint32_t duty) {
+  if (duty == 0) {
+    return 0;
+  }
+
+  uint32_t max_duty = (1U << ledcGammaResolution) - 1;
+  if (duty >= (1U << ledcGammaResolution)) {
+    return max_duty;
+  }
+
+  // Use LUT if provided, otherwise use mathematical calculation
+  if (ledcGammaLUT != NULL && ledcGammaLUTSize > 0) {
+    // LUT-based gamma correction
+    uint32_t lut_index = (duty * (ledcGammaLUTSize - 1)) / max_duty;
+    if (lut_index >= ledcGammaLUTSize) {
+      lut_index = ledcGammaLUTSize - 1;
+    }
+
+    float corrected_normalized = ledcGammaLUT[lut_index];
+    return (uint32_t)(corrected_normalized * max_duty);
+  } else {
+    // Mathematical gamma correction
+    double normalized = (double)duty / (1U << ledcGammaResolution);
+    double corrected = pow(normalized, ledcGammaFactor);
+    return (uint32_t)(corrected * (1U << ledcGammaResolution));
+  }
+}
+
+static bool ledcFadeGammaConfig(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms, void (*userFunc)(void *), void *arg) {
+  ledc_channel_handle_t *bus = (ledc_channel_handle_t *)perimanGetPinBus(pin, ESP32_BUS_TYPE_LEDC);
+  if (bus != NULL) {
+
+#ifndef SOC_LEDC_SUPPORT_FADE_STOP
+#if !CONFIG_DISABLE_HAL_LOCKS
+    if (bus->lock == NULL) {
+      bus->lock = xSemaphoreCreateBinary();
+      if (bus->lock == NULL) {
+        log_e("xSemaphoreCreateBinary failed");
+        return false;
+      }
+      xSemaphoreGive(bus->lock);
+    }
+    //acquire lock
+    if (xSemaphoreTake(bus->lock, 0) != pdTRUE) {
+      log_e("LEDC Fade is still running on pin %u! SoC does not support stopping fade.", pin);
+      return false;
+    }
+#endif
+#endif
+    uint8_t group = (bus->channel / SOC_LEDC_CHANNEL_NUM), channel = (bus->channel % SOC_LEDC_CHANNEL_NUM);
+
+    // Initialize fade service.
+    if (!fade_initialized) {
+      ledc_fade_func_install(0);
+      fade_initialized = true;
+    }
+
+    bus->fn = (voidFuncPtr)userFunc;
+    bus->arg = arg;
+
+    ledc_cbs_t callbacks = {.fade_cb = ledcFnWrapper};
+    ledc_cb_register(group, channel, &callbacks, (void *)bus);
+
+    // Prepare gamma curve fade parameters
+    ledc_fade_param_config_t fade_params[SOC_LEDC_GAMMA_CURVE_FADE_RANGE_MAX];
+    uint32_t actual_fade_ranges = 0;
+
+    // Use a moderate number of linear segments for smooth gamma curve
+    const uint32_t linear_fade_segments = 12;
+
+    // Set the global resolution for gamma correction
+    ledcGammaResolution = bus->channel_resolution;
+
+    // Fill multi-fade parameter list using ESP-IDF API
+    esp_err_t err = ledc_fill_multi_fade_param_list(
+      group, channel, start_duty, target_duty, linear_fade_segments, max_fade_time_ms, ledcGammaCorrection, SOC_LEDC_GAMMA_CURVE_FADE_RANGE_MAX, fade_params,
+      &actual_fade_ranges
+    );
+
+    if (err != ESP_OK) {
+      log_e("ledc_fill_multi_fade_param_list failed: %s", esp_err_to_name(err));
+      return false;
+    }
+
+    // Apply the gamma-corrected start duty
+    uint32_t gamma_start_duty = ledcGammaCorrection(start_duty);
+
+    // Set multi-fade parameters
+    err = ledc_set_multi_fade(group, channel, gamma_start_duty, fade_params, actual_fade_ranges);
+    if (err != ESP_OK) {
+      log_e("ledc_set_multi_fade failed: %s", esp_err_to_name(err));
+      return false;
+    }
+
+    // Start the gamma curve fade
+    err = ledc_fade_start(group, channel, LEDC_FADE_NO_WAIT);
+    if (err != ESP_OK) {
+      log_e("ledc_fade_start failed: %s", esp_err_to_name(err));
+      return false;
+    }
+
+    log_d("Gamma curve fade started on pin %u: %u -> %u over %dms", pin, start_duty, target_duty, max_fade_time_ms);
+
+  } else {
+    log_e("Pin %u is not attached to LEDC. Call ledcAttach first!", pin);
+    return false;
+  }
+  return true;
+}
+
+bool ledcFadeGamma(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms) {
+  return ledcFadeGammaConfig(pin, start_duty, target_duty, max_fade_time_ms, NULL, NULL);
+}
+
+bool ledcFadeGammaWithInterrupt(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms, voidFuncPtr userFunc) {
+  return ledcFadeGammaConfig(pin, start_duty, target_duty, max_fade_time_ms, (voidFuncPtrArg)userFunc, NULL);
+}
+
+bool ledcFadeGammaWithInterruptArg(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms, void (*userFunc)(void *), void *arg) {
+  return ledcFadeGammaConfig(pin, start_duty, target_duty, max_fade_time_ms, userFunc, arg);
+}
+
+#endif /* SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED */
+
 static uint8_t analog_resolution = 8;
 static int analog_frequency = 1000;
 void analogWrite(uint8_t pin, int value) {
diff --git a/cores/esp32/esp32-hal-ledc.h b/cores/esp32/esp32-hal-ledc.h
index 5b44aaad452..1663b884a3f 100644
--- a/cores/esp32/esp32-hal-ledc.h
+++ b/cores/esp32/esp32-hal-ledc.h
@@ -51,6 +51,8 @@ typedef struct {
   uint8_t pin;                 // Pin assigned to channel
   uint8_t channel;             // Channel number
   uint8_t channel_resolution;  // Resolution of channel
+  uint8_t timer_num;           // Timer number used by this channel
+  uint32_t freq_hz;            // Frequency configured for this channel
   voidFuncPtr fn;
   void *arg;
 #ifndef SOC_LEDC_SUPPORT_FADE_STOP
@@ -230,6 +232,85 @@ bool ledcFadeWithInterrupt(uint8_t pin, uint32_t start_duty, uint32_t target_dut
  */
 bool ledcFadeWithInterruptArg(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms, void (*userFunc)(void *), void *arg);
 
+//Gamma Curve Fade functions - only available on supported chips
+#ifdef SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED
+
+/**
+ * @brief Set a custom gamma correction lookup table for gamma curve fading.
+ *        The LUT should contain normalized values (0.0 to 1.0) representing
+ *        the gamma-corrected brightness curve.
+ *
+ * @param gamma_table Pointer to array of float values (0.0 to 1.0)
+ * @param size Number of entries in the lookup table
+ *
+ * @return true if gamma table was successfully set, false otherwise.
+ *
+ * @note The LUT array must remain valid for as long as gamma fading is used.
+ *       Larger tables provide smoother transitions but use more memory.
+ */
+bool ledcSetGammaTable(const float *gamma_table, uint16_t size);
+
+/**
+ * @brief Clear the current gamma correction lookup table.
+ *        After calling this, gamma correction will use mathematical
+ *        calculation with the default gamma factor (2.8).
+ */
+void ledcClearGammaTable(void);
+
+/**
+ * @brief Set the gamma factor for gamma correction.
+ *
+ * @param factor Gamma factor to use for gamma correction.
+ */
+void ledcSetGammaFactor(float factor);
+
+/**
+ * @brief Setup and start a gamma curve fade on a given LEDC pin.
+ *        Gamma correction makes LED brightness changes appear more gradual to human eyes.
+ *
+ * @param pin GPIO pin
+ * @param start_duty initial duty cycle of the fade
+ * @param target_duty target duty cycle of the fade
+ * @param max_fade_time_ms maximum fade time in milliseconds
+ *
+ * @return true if gamma fade was successfully set and started, false otherwise.
+ *
+ * @note This function is only available on ESP32 variants that support gamma curve fading.
+ */
+bool ledcFadeGamma(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms);
+
+/**
+ * @brief Setup and start a gamma curve fade on a given LEDC pin with a callback function.
+ *
+ * @param pin GPIO pin
+ * @param start_duty initial duty cycle of the fade
+ * @param target_duty target duty cycle of the fade
+ * @param max_fade_time_ms maximum fade time in milliseconds
+ * @param userFunc callback function to be called after fade is finished
+ *
+ * @return true if gamma fade was successfully set and started, false otherwise.
+ *
+ * @note This function is only available on ESP32 variants that support gamma curve fading.
+ */
+bool ledcFadeGammaWithInterrupt(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms, void (*userFunc)(void));
+
+/**
+ * @brief Setup and start a gamma curve fade on a given LEDC pin with a callback function and argument.
+ *
+ * @param pin GPIO pin
+ * @param start_duty initial duty cycle of the fade
+ * @param target_duty target duty cycle of the fade
+ * @param max_fade_time_ms maximum fade time in milliseconds
+ * @param userFunc callback function to be called after fade is finished
+ * @param arg argument to be passed to the callback function
+ *
+ * @return true if gamma fade was successfully set and started, false otherwise.
+ *
+ * @note This function is only available on ESP32 variants that support gamma curve fading.
+ */
+bool ledcFadeGammaWithInterruptArg(uint8_t pin, uint32_t start_duty, uint32_t target_duty, int max_fade_time_ms, void (*userFunc)(void *), void *arg);
+#endif  // SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cores/esp32/esp32-hal-misc.c b/cores/esp32/esp32-hal-misc.c
index 594acd38153..aadd08ceffc 100644
--- a/cores/esp32/esp32-hal-misc.c
+++ b/cores/esp32/esp32-hal-misc.c
@@ -25,7 +25,7 @@
 #include "esp_ota_ops.h"
 #endif  //CONFIG_APP_ROLLBACK_ENABLE
 #include "esp_private/startup_internal.h"
-#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED
+#if defined(CONFIG_BT_BLUEDROID_ENABLED) && SOC_BT_SUPPORTED && __has_include("esp_bt.h")
 #include "esp_bt.h"
 #endif  //CONFIG_BT_BLUEDROID_ENABLED
 #include <sys/time.h>
diff --git a/cores/esp32/esp32-hal-tinyusb.c b/cores/esp32/esp32-hal-tinyusb.c
index 0991e08d27f..30a827baa01 100644
--- a/cores/esp32/esp32-hal-tinyusb.c
+++ b/cores/esp32/esp32-hal-tinyusb.c
@@ -466,9 +466,6 @@ __attribute__((weak)) int32_t tud_msc_write10_cb(uint8_t lun, uint32_t lba, uint
 __attribute__((weak)) int32_t tud_msc_scsi_cb(uint8_t lun, uint8_t const scsi_cmd[16], void *buffer, uint16_t bufsize) {
   return -1;
 }
-__attribute__((weak)) bool tud_msc_is_writable_cb(uint8_t lun) {
-  return false;
-}
 #endif
 #if CFG_TUD_NCM
 __attribute__((weak)) bool tud_network_recv_cb(const uint8_t *src, uint16_t size) {
diff --git a/docs/en/installing.rst b/docs/en/installing.rst
index 35342020864..3ca0881c398 100644
--- a/docs/en/installing.rst
+++ b/docs/en/installing.rst
@@ -70,6 +70,8 @@ To start the installation process using the Boards Manager, follow these steps:
    :figclass: align-center
 
 -  Open Boards Manager from Tools > Board menu and install *esp32* platform (and do not forget to select your ESP32 board from Tools > Board menu after installation).
+   Users in China must select the package version with the "-cn" suffix and perform updates manually.
+   Automatic updates are not supported in this region, as they target the default package without the "-cn" suffix, resulting in download failures.
 
 .. figure:: ../_static/install_guide_boards_manager_esp32.png
    :align: center
diff --git a/libraries/AsyncUDP/src/AsyncUDP.cpp b/libraries/AsyncUDP/src/AsyncUDP.cpp
index f44cc839c97..cab9c951921 100644
--- a/libraries/AsyncUDP/src/AsyncUDP.cpp
+++ b/libraries/AsyncUDP/src/AsyncUDP.cpp
@@ -682,6 +682,8 @@ static esp_err_t joinMulticastGroup(const ip_addr_t *addr, bool join, tcpip_adap
 }
 
 bool AsyncUDP::listenMulticast(const ip_addr_t *addr, uint16_t port, uint8_t ttl, tcpip_adapter_if_t tcpip_if) {
+  ip_addr_t bind_addr;
+
   if (!ip_addr_ismulticast(addr)) {
     return false;
   }
@@ -690,7 +692,18 @@ bool AsyncUDP::listenMulticast(const ip_addr_t *addr, uint16_t port, uint8_t ttl
     return false;
   }
 
-  if (!listen(NULL, port)) {
+#if CONFIG_LWIP_IPV6
+  if (IP_IS_V6(addr)) {
+    IP_SET_TYPE(&bind_addr, IPADDR_TYPE_V6);
+    ip6_addr_set_any(&bind_addr.u_addr.ip6);
+  } else {
+#endif
+    IP_SET_TYPE(&bind_addr, IPADDR_TYPE_V4);
+    ip4_addr_set_any(&bind_addr.u_addr.ip4);
+#if CONFIG_LWIP_IPV6
+  }
+#endif
+  if (!listen(&bind_addr, port)) {
     return false;
   }
 
diff --git a/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/LEDCGammaFade.ino b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/LEDCGammaFade.ino
new file mode 100644
index 00000000000..4ca6c136ddf
--- /dev/null
+++ b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/LEDCGammaFade.ino
@@ -0,0 +1,111 @@
+/* LEDC Gamma Curve Fade Arduino Example
+
+   This example demonstrates gamma curve fading on ESP32 variants that support it.
+   Gamma correction makes LED brightness changes appear more gradual and natural
+   to human eyes compared to linear fading.
+
+   Two methods are supported:
+   1. Using a pre-computed Gamma Look-Up Table (LUT) for better performance
+   2. Using mathematical gamma correction with a gamma factor
+
+   Supported chips: ESP32-C6, ESP32-C5, ESP32-H2, ESP32-P4 and future chips with Gamma Fade support
+
+   Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
+*/
+
+// use 12 bit precision for LEDC timer
+#define LEDC_TIMER_12_BIT 12
+
+// use 5000 Hz as a LEDC base frequency
+#define LEDC_BASE_FREQ 5000
+
+// define starting duty, target duty and maximum fade time
+#define LEDC_START_DUTY  (0)
+#define LEDC_TARGET_DUTY (4095)
+#define LEDC_FADE_TIME   (2000)
+
+// gamma factor for mathematical calculation
+#define LEDC_GAMMA_FACTOR (2.6)
+
+// use gamma LUT for better performance instead of mathematical calculation (gamma factor)
+#define USE_GAMMA_LUT 1
+
+// fade LED pins
+const uint8_t ledPinR = 4;
+const uint8_t ledPinG = 5;
+const uint8_t ledPinB = 6;
+
+uint8_t fade_ended = 0;  // status of LED gamma fade
+bool fade_in = true;
+
+#ifdef USE_GAMMA_LUT
+// Custom Gamma LUT demonstration with 101 steps (Brightness 0 - 100% gamma correction look up table (gamma = 2.6))
+// Y = B ^ 2.6 - Pre-computed LUT to save runtime computation
+static const float ledcGammaLUT[101] = {
+  0.000000, 0.000006, 0.000038, 0.000110, 0.000232, 0.000414, 0.000666, 0.000994, 0.001406, 0.001910, 0.002512, 0.003218, 0.004035, 0.004969, 0.006025,
+  0.007208, 0.008525, 0.009981, 0.011580, 0.013328, 0.015229, 0.017289, 0.019512, 0.021902, 0.024465, 0.027205, 0.030125, 0.033231, 0.036527, 0.040016,
+  0.043703, 0.047593, 0.051688, 0.055993, 0.060513, 0.065249, 0.070208, 0.075392, 0.080805, 0.086451, 0.092333, 0.098455, 0.104821, 0.111434, 0.118298,
+  0.125416, 0.132792, 0.140428, 0.148329, 0.156498, 0.164938, 0.173653, 0.182645, 0.191919, 0.201476, 0.211321, 0.221457, 0.231886, 0.242612, 0.253639,
+  0.264968, 0.276603, 0.288548, 0.300805, 0.313378, 0.326268, 0.339480, 0.353016, 0.366879, 0.381073, 0.395599, 0.410461, 0.425662, 0.441204, 0.457091,
+  0.473325, 0.489909, 0.506846, 0.524138, 0.541789, 0.559801, 0.578177, 0.596920, 0.616032, 0.635515, 0.655374, 0.675610, 0.696226, 0.717224, 0.738608,
+  0.760380, 0.782542, 0.805097, 0.828048, 0.851398, 0.875148, 0.899301, 0.923861, 0.948829, 0.974208, 1.000000,
+};
+#endif
+
+void ARDUINO_ISR_ATTR LED_FADE_ISR() {
+  fade_ended += 1;
+}
+
+void setup() {
+  // Initialize serial communication at 115200 bits per second:
+  Serial.begin(115200);
+
+  // Setup timer with given frequency, resolution and attach it to a led pin with auto-selected channel
+  ledcAttach(ledPinR, LEDC_BASE_FREQ, LEDC_TIMER_12_BIT);
+  ledcAttach(ledPinG, LEDC_BASE_FREQ, LEDC_TIMER_12_BIT);
+  ledcAttach(ledPinB, LEDC_BASE_FREQ, LEDC_TIMER_12_BIT);
+
+#if USE_GAMMA_LUT  // Use default gamma LUT for better performance
+  ledcSetGammaTable(ledcGammaLUT, 101);
+#else  // Use mathematical gamma correction (default, more flexible)
+  ledcSetGammaFactor(LEDC_GAMMA_FACTOR);  // This is optional to set custom gamma factor (default is 2.8)
+#endif
+
+  // Setup and start gamma curve fade on led (duty from 0 to 4095)
+  ledcFadeGamma(ledPinR, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME);
+  ledcFadeGamma(ledPinG, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME);
+  ledcFadeGamma(ledPinB, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME);
+  Serial.println("LED Gamma Fade on started.");
+
+  // Wait for fade to end
+  delay(LEDC_FADE_TIME);
+
+  // Setup and start gamma curve fade off led and use ISR (duty from 4095 to 0)
+  ledcFadeGammaWithInterrupt(ledPinR, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+  ledcFadeGammaWithInterrupt(ledPinG, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+  ledcFadeGammaWithInterrupt(ledPinB, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+  Serial.println("LED Gamma Fade off started.");
+}
+
+void loop() {
+  // Check if fade_ended flag was set to true in ISR
+  if (fade_ended == 3) {
+    Serial.println("LED gamma fade ended");
+    fade_ended = 0;
+
+    // Check what gamma fade should be started next
+    if (fade_in) {
+      ledcFadeGammaWithInterrupt(ledPinR, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+      ledcFadeGammaWithInterrupt(ledPinG, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+      ledcFadeGammaWithInterrupt(ledPinB, LEDC_START_DUTY, LEDC_TARGET_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+      Serial.println("LED Gamma Fade in started.");
+      fade_in = false;
+    } else {
+      ledcFadeGammaWithInterrupt(ledPinR, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+      ledcFadeGammaWithInterrupt(ledPinG, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+      ledcFadeGammaWithInterrupt(ledPinB, LEDC_TARGET_DUTY, LEDC_START_DUTY, LEDC_FADE_TIME, LED_FADE_ISR);
+      Serial.println("LED Gamma Fade out started.");
+      fade_in = true;
+    }
+  }
+}
diff --git a/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.json b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.json
new file mode 100644
index 00000000000..a9d8603b7bf
--- /dev/null
+++ b/libraries/ESP32/examples/AnalogOut/LEDCGammaFade/ci.json
@@ -0,0 +1,5 @@
+{
+  "requires": [
+    "CONFIG_SOC_LEDC_GAMMA_CURVE_FADE_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/ESP_I2S/examples/Simple_tone/Simple_tone.ino b/libraries/ESP_I2S/examples/Simple_tone/Simple_tone.ino
index 935aa4bc50f..bba7d4f4d9d 100644
--- a/libraries/ESP_I2S/examples/Simple_tone/Simple_tone.ino
+++ b/libraries/ESP_I2S/examples/Simple_tone/Simple_tone.ino
@@ -24,10 +24,17 @@
  2nd September 2021
  Lucas Saavedra Vaz (lucasssvaz)
  22nd December 2023
+ anon
+ 10nd February 2025
  */
 
 #include <ESP_I2S.h>
 
+// The GPIO pins are not fixed, most other pins could be used for the I2S function.
+#define I2S_LRC  25
+#define I2S_BCLK 5
+#define I2S_DIN  26
+
 const int frequency = 440;    // frequency of square wave in Hz
 const int amplitude = 500;    // amplitude of square wave
 const int sampleRate = 8000;  // sample rate in Hz
@@ -36,10 +43,10 @@ i2s_data_bit_width_t bps = I2S_DATA_BIT_WIDTH_16BIT;
 i2s_mode_t mode = I2S_MODE_STD;
 i2s_slot_mode_t slot = I2S_SLOT_MODE_STEREO;
 
-const int halfWavelength = (sampleRate / frequency);  // half wavelength of square wave
+const unsigned int halfWavelength = sampleRate / frequency / 2;  // half wavelength of square wave
 
 int32_t sample = amplitude;  // current sample value
-int count = 0;
+unsigned int count = 0;
 
 I2SClass i2s;
 
@@ -47,6 +54,8 @@ void setup() {
   Serial.begin(115200);
   Serial.println("I2S simple tone");
 
+  i2s.setPins(I2S_BCLK, I2S_LRC, I2S_DIN);
+
   // start I2S at the sample rate with 16-bits per sample
   if (!i2s.begin(mode, sampleRate, bps, slot)) {
     Serial.println("Failed to initialize I2S!");
@@ -60,8 +69,13 @@ void loop() {
     sample = -1 * sample;
   }
 
-  i2s.write(sample);  // Right channel
-  i2s.write(sample);  // Left channel
+  // Left channel, the low 8 bits then high 8 bits
+  i2s.write(sample);
+  i2s.write(sample >> 8);
+
+  // Right channel, the low 8 bits then high 8 bits
+  i2s.write(sample);
+  i2s.write(sample >> 8);
 
   // increment the counter for the next sample
   count++;
diff --git a/libraries/OpenThread/README.md b/libraries/OpenThread/README.md
index cd9deb9ebf6..8d0386f34fb 100644
--- a/libraries/OpenThread/README.md
+++ b/libraries/OpenThread/README.md
@@ -1,9 +1,177 @@
 | Supported Targets | ESP32-C6 | ESP32-H2 |
 | ----------------- | -------- | -------- |
 
-# ESP32 Arduino OpenThreadCLI
+# General View
 
-The `OpenThreadCLI` class is an Arduino API for interacting with the OpenThread Command Line Interface (CLI). It allows you to manage and configure the Thread stack using a command-line interface.
+This Arduino OpenThread Library allows using ESP OpenThread implementation using CLI and/or Native OpenThread API.
+
+The Library implements 3 C++ Classes:
+- `OThread` Class for Native OpenThread API
+- `OThreadCLI` Class for CLI OpenThread API
+- `DataSet` Class for OpenThread dataset manipulation using Native `OThread` Class
+
+# ESP32 Arduino OpenThread Native
+
+The `OThread` class provides methods for managing the OpenThread instance and controlling the Thread network. It allows you to initialize, start, stop, and manage the Thread network using native OpenThread APIs.
+
+## Class Definition
+
+```cpp
+class OpenThread {
+  public:
+    static bool otStarted; // Indicates whether the OpenThread stack is running.
+
+    // Get the current Thread device role (e.g., Leader, Router, Child, etc.).
+    static ot_device_role_t otGetDeviceRole();
+
+    // Get the current Thread device role as a string.
+    static const char *otGetStringDeviceRole();
+
+    // Print network information (e.g., network name, channel, PAN ID) to the specified stream.
+    static void otPrintNetworkInformation(Stream &output);
+
+    OpenThread();
+    ~OpenThread();
+
+    // Returns true if the OpenThread stack is running.
+    operator bool() const;
+
+    // Initialize the OpenThread stack.
+    static void begin(bool OThreadAutoStart = true);
+
+    // Deinitialize the OpenThread stack.
+    static void end();
+
+    // Start the Thread network.
+    void start();
+
+    // Stop the Thread network.
+    void stop();
+
+    // Bring up the Thread network interface (equivalent to "ifconfig up").
+    void networkInterfaceUp();
+
+    // Bring down the Thread network interface (equivalent to "ifconfig down").
+    void networkInterfaceDown();
+
+    // Commit a dataset to the OpenThread instance.
+    void commitDataSet(const DataSet &dataset);
+
+private:
+    static otInstance *mInstance; // Pointer to the OpenThread instance.
+    DataSet mCurrentDataSet;      // Current dataset being used by the OpenThread instance.
+};
+
+extern OpenThread OThread;
+```
+## Class Overview
+
+The `OThread` class provides a simple and intuitive interface for managing the OpenThread stack and Thread network. It abstracts the complexity of the OpenThread APIs and provides Arduino-style methods for common operations.
+
+## Public Methods
+### Initialization and Deinitialization
+- `begin(bool OThreadAutoStart = true)`: Initializes the OpenThread stack. If `OThreadAutoStart` is `true`, the Thread network will start automatically using NVS data.
+- `end()`: Deinitializes the OpenThread stack and releases resources.
+### Thread Network Control
+- `start()`: Starts the Thread network. This is equivalent to the CLI command "thread start".
+- `stop()`: Stops the Thread network. This is equivalent to the CLI command "thread stop".
+### Network Interface Control
+- `networkInterfaceUp()`: Brings up the Thread network interface. This is equivalent to the CLI command "ifconfig up".
+- `networkInterfaceDown()`: Brings down the Thread network interface. This is equivalent to the CLI command "ifconfig down".
+### Dataset Management
+- `commitDataSet(const DataSet &dataset)`: Commits a dataset to the OpenThread instance. This is used to configure the Thread network with specific parameters (e.g., network name, channel, PAN ID).
+### Network Information
+- `otGetDeviceRole()`: Returns the current Thread device role as an `ot_device_role_t` enum (e.g., `OT_ROLE_LEADER`, `OT_ROLE_ROUTER`).
+- `otGetStringDeviceRole()`: Returns the current Thread device role as a string (e.g., "Leader", "Router").
+- `otPrintNetworkInformation(Stream &output)`: Prints the current network information (e.g., network name, channel, PAN ID) to the specified stream.
+
+## Key Features
+- **Initialization and Cleanup**: Easily initialize and deinitialize the OpenThread stack.
+- **Network Control**: Start and stop the Thread network with simple method calls.
+- **Dataset Management**: Configure the Thread network using the `DataSet` class and commit it to the OpenThread instance.
+- **Network Information**: Retrieve and print the current network information and device role.
+
+## Notes
+- The `OThread` class is designed to simplify the use of OpenThread APIs in Arduino sketches.
+- It works seamlessly with the DataSet class for managing Thread network configurations.
+- Ensure that the OpenThread stack is initialized (`OThread.begin()`) before calling other methods.
+
+This documentation provides a comprehensive overview of the `OThread` class, its methods, and example usage. It is designed to help developers quickly integrate OpenThread functionality into their Arduino projects.
+
+# DataSet Class
+
+The `DataSet` class provides a structured way to manage and configure Thread network datasets using native OpenThread APIs. It allows you to set and retrieve network parameters such as the network name, channel, PAN ID, and more. The `DataSet` class works seamlessly with the `OThread` class to apply these configurations to the OpenThread instance.
+
+## Class Definition
+
+```cpp
+class DataSet {
+public:
+    DataSet();
+    void clear();
+    void initNew();
+    const otOperationalDataset &getDataset() const;
+
+    // Setters
+    void setNetworkName(const char *name);
+    void setExtendedPanId(const uint8_t *extPanId);
+    void setNetworkKey(const uint8_t *key);
+    void setChannel(uint8_t channel);
+    void setPanId(uint16_t panId);
+
+    // Getters
+    const char *getNetworkName() const;
+    const uint8_t *getExtendedPanId() const;
+    const uint8_t *getNetworkKey() const;
+    uint8_t getChannel() const;
+    uint16_t getPanId() const;
+
+    // Apply the dataset to the OpenThread instance
+    void apply(otInstance *instance);
+
+private:
+    otOperationalDataset mDataset; // Internal representation of the dataset
+};
+```
+
+## Class Overview
+The  DataSet` class simplifies the management of Thread network datasets by providing intuitive methods for setting, retrieving, and applying network parameters. It abstracts the complexity of the OpenThread dataset APIs and provides Arduino-style methods for common operations.
+
+## Public Methods
+### Initialization
+- `DataSet()`: Constructor that initializes an empty dataset.
+- `void clear()`: Clears the dataset, resetting all fields to their default values.
+- `void initNew()`: Initializes a new dataset with default values (equivalent to the CLI command dataset init new).
+### Setters
+- `void setNetworkName(const char *name)`: Sets the network name.
+- `void setExtendedPanId(const uint8_t *extPanId)`: Sets the extended PAN ID.
+- `void setNetworkKey(const uint8_t *key)`: Sets the network key.
+- `void setChannel(uint8_t channel)`: Sets the channel.
+- `void setPanId(uint16_t panId)`: Sets the PAN ID.
+### Getters
+- `const char *getNetworkName() const`: Retrieves the network name.
+- `const uint8_t *getExtendedPanId() const`: Retrieves the extended PAN ID.
+- `const uint8_t *getNetworkKey() const`: Retrieves the network key.
+- `uint8_t getChannel() const`: Retrieves the channel.
+- `uint16_t getPanId() const`: Retrieves the PAN ID.
+### Dataset Application
+- `void apply(otInstance *instance)`: Applies the dataset to the specified OpenThread instance.
+
+## Key Features
+- **Dataset Initialization**: Easily initialize a new dataset with default values using initNew().
+- **Custom Configuration**: Set custom network parameters such as the network name, channel, and PAN ID using setter methods.
+- **Dataset Application**: Apply the configured dataset to the OpenThread instance using apply().
+
+** Notes
+- The `DataSet` class is designed to work seamlessly with the `OThread` class for managing Thread network configurations.
+- Ensure that the OpenThread stack is initialized (`OThread.begin()`) before applying a dataset.
+- The  initNew()``  method provides default values for the dataset, which can be customized using the setter methods.
+
+This documentation provides a comprehensive overview of the  `DataSet` class, its methods, and example usage. It is designed to help developers easily manage Thread network configurations in their Arduino projects.
+
+# OpenThreadCLI Class
+
+The `OpenThreadCLI` class is an Arduino API for interacting with the OpenThread Command Line Interface (CLI). It allows you to send commands to the OpenThread stack and receive responses. This class is designed to simplify the use of OpenThread CLI commands in Arduino sketches.
 
 There is one main class called `OpenThreadCLI` and a global object used to operate OpenThread CLI, called `OThreadCLI`.\
 Some [helper functions](helper_functions.md) were made available for working with the OpenThread CLI environment.
@@ -20,7 +188,7 @@ Below are the details of the class:
 class OpenThreadCLI : public Stream {
 private:
   static size_t setBuffer(QueueHandle_t &queue, size_t len);
-  bool otStarted = false;
+  static bool otCLIStarted = false;
 
 public:
   OpenThreadCLI();
@@ -59,14 +227,35 @@ extern OpenThreadCLI OThreadCLI;
 - You can customize the console behavior by adjusting parameters such as echoback and buffer sizes.
 
 ## Public Methods
+### Initialization and Deinitialization
+- `begin()`: Initializes the OpenThread stack (optional auto-start).
+- `end()`: Deinitializes the OpenThread stack and releases resources.
+### Console Management
 - `startConsole(Stream& otStream, bool echoback = true, const char* prompt = "ot> ")`: Starts the OpenThread console with the specified stream, echoback option, and prompt.
 - `stopConsole()`: Stops the OpenThread console.
 - `setPrompt(char* prompt)`: Changes the console prompt (set to NULL for an empty prompt).
 - `setEchoBack(bool echoback)`: Changes the console echoback option.
 - `setStream(Stream& otStream)`: Changes the console Stream object.
 - `onReceive(OnReceiveCb_t func)`: Sets a callback function to handle complete lines of output from the OT CLI.
-- `begin(bool OThreadAutoStart = true)`: Initializes the OpenThread stack (optional auto-start).
-- `end()`: Deinitializes the OpenThread stack.
+### Buffer Management
 - `setTxBufferSize(size_t tx_queue_len)`: Sets the transmit buffer size (default is 256 bytes).
 - `setRxBufferSize(size_t rx_queue_len)`: Sets the receive buffer size (default is 1024 bytes).
-- `write(uint8_t)`, `available()`, `read()`, `peek()`, `flush()`: Standard Stream methods implementation for OpenThread CLI object.
+### Stream Methods
+- `write(uint8_t)`: Writes a byte to the CLI.
+- `available()`: Returns the number of bytes available to read.
+- `read()`: Reads a byte from the CLI.
+- `peek()`: Returns the next byte without removing it from the buffer.
+- `flush()`: Flushes the CLI buffer.
+
+## Key Features
+- **Arduino Stream Compatibility**: Inherits from the Stream class, making it compatible with Arduino's standard I/O functions.
+- **Customizable Console**: Allows customization of the CLI prompt, echoback behavior, and buffer sizes.
+- **Callback Support**: Provides a callback mechanism to handle CLI responses asynchronously.
+- **Seamless Integration**: Designed to work seamlessly with the OThread and DataSet classes
+
+## Notes
+- The `OThreadCLI` class is designed to simplify the use of OpenThread CLI commands in Arduino sketches.
+- It works seamlessly with the `OThread` and `DataSet` classes for managing Thread networks.
+- Ensure that the OpenThread stack is initialized (`OThreadCLI.begin()`) before starting the CLI console.
+
+This documentation provides a comprehensive overview of the `OThreadCLI` class, its methods, and example usage. It is designed to help developers easily integrate OpenThread CLI functionality into their Arduino projects.
diff --git a/libraries/OpenThread/examples/COAP/coap_lamp/ci.json b/libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/COAP/coap_lamp/ci.json
rename to libraries/OpenThread/examples/CLI/COAP/coap_lamp/ci.json
diff --git a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino b/libraries/OpenThread/examples/CLI/COAP/coap_lamp/coap_lamp.ino
similarity index 95%
rename from libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino
rename to libraries/OpenThread/examples/CLI/COAP/coap_lamp/coap_lamp.ino
index 51483bb4c7c..bcaf8ae9793 100644
--- a/libraries/OpenThread/examples/COAP/coap_lamp/coap_lamp.ino
+++ b/libraries/OpenThread/examples/CLI/COAP/coap_lamp/coap_lamp.ino
@@ -75,18 +75,18 @@ bool otDeviceSetup(const char **otSetupCmds, uint8_t nCmds1, const char **otCoap
   Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role.");
   // wait for the expected Device Role to start
   uint8_t tries = 24;  // 24 x 2.5 sec = 1 min
-  while (tries && otGetDeviceRole() != expectedRole) {
+  while (tries && OThread.otGetDeviceRole() != expectedRole) {
     Serial.print(".");
     delay(2500);
     tries--;
   }
   Serial.println();
   if (!tries) {
-    log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole());
+    log_e("Sorry, Device Role failed by timeout! Current Role: %s.", OThread.otGetStringDeviceRole());
     rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
-  Serial.printf("Device is %s.\r\n", otGetStringDeviceRole());
+  Serial.printf("Device is %s.\r\n", OThread.otGetStringDeviceRole());
   for (i = 0; i < nCmds2; i++) {
     if (!otExecCommand(otCoapCmds[i * 2], otCoapCmds[i * 2 + 1])) {
       break;
@@ -151,7 +151,8 @@ void setup() {
   Serial.begin(115200);
   // LED starts RED, indicating not connected to Thread network.
   rgbLedWrite(RGB_BUILTIN, 64, 0, 0);
-  OThreadCLI.begin(false);     // No AutoStart is necessary
+  OThread.begin(false);  // No AutoStart is necessary
+  OThreadCLI.begin();
   OThreadCLI.setTimeout(250);  // waits 250ms for the OpenThread CLI response
   setupNode();
   // LED goes Green when all is ready and Red when failed.
diff --git a/libraries/OpenThread/examples/COAP/coap_switch/ci.json b/libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/COAP/coap_switch/ci.json
rename to libraries/OpenThread/examples/CLI/COAP/coap_switch/ci.json
diff --git a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino b/libraries/OpenThread/examples/CLI/COAP/coap_switch/coap_switch.ino
similarity index 95%
rename from libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino
rename to libraries/OpenThread/examples/CLI/COAP/coap_switch/coap_switch.ino
index aac5db0bc82..bacac47ddeb 100644
--- a/libraries/OpenThread/examples/COAP/coap_switch/coap_switch.ino
+++ b/libraries/OpenThread/examples/CLI/COAP/coap_switch/coap_switch.ino
@@ -69,18 +69,18 @@ bool otDeviceSetup(
   Serial.println("OpenThread started.\r\nWaiting for activating correct Device Role.");
   // wait for the expected Device Role to start
   uint8_t tries = 24;  // 24 x 2.5 sec = 1 min
-  while (tries && otGetDeviceRole() != expectedRole1 && otGetDeviceRole() != expectedRole2) {
+  while (tries && OThread.otGetDeviceRole() != expectedRole1 && OThread.otGetDeviceRole() != expectedRole2) {
     Serial.print(".");
     delay(2500);
     tries--;
   }
   Serial.println();
   if (!tries) {
-    log_e("Sorry, Device Role failed by timeout! Current Role: %s.", otGetStringDeviceRole());
+    log_e("Sorry, Device Role failed by timeout! Current Role: %s.", OThread.otGetStringDeviceRole());
     rgbLedWrite(RGB_BUILTIN, 255, 0, 0);  // RED ... failed!
     return false;
   }
-  Serial.printf("Device is %s.\r\n", otGetStringDeviceRole());
+  Serial.printf("Device is %s.\r\n", OThread.otGetStringDeviceRole());
   for (i = 0; i < nCmds2; i++) {
     if (!otExecCommand(otCoapCmds[i * 2], otCoapCmds[i * 2 + 1])) {
       break;
@@ -176,7 +176,8 @@ void setup() {
   Serial.begin(115200);
   // LED starts RED, indicating not connected to Thread network.
   rgbLedWrite(RGB_BUILTIN, 64, 0, 0);
-  OThreadCLI.begin(false);     // No AutoStart is necessary
+  OThread.begin(false);  // No AutoStart is necessary
+  OThreadCLI.begin();
   OThreadCLI.setTimeout(250);  // waits 250ms for the OpenThread CLI response
   setupNode();
   // LED goes and keeps Blue when all is ready and Red when failed.
diff --git a/libraries/OpenThread/examples/SimpleCLI/SimpleCLI.ino b/libraries/OpenThread/examples/CLI/SimpleCLI/SimpleCLI.ino
similarity index 89%
rename from libraries/OpenThread/examples/SimpleCLI/SimpleCLI.ino
rename to libraries/OpenThread/examples/CLI/SimpleCLI/SimpleCLI.ino
index feef800c0fa..dec3aaeb218 100644
--- a/libraries/OpenThread/examples/SimpleCLI/SimpleCLI.ino
+++ b/libraries/OpenThread/examples/CLI/SimpleCLI/SimpleCLI.ino
@@ -1,4 +1,4 @@
-// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -26,7 +26,8 @@
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin(false);  // No AutoStart - fresh start
+  OThread.begin(false);  // No AutoStart - fresh start
+  OThreadCLI.begin();
   Serial.println("OpenThread CLI started - type 'help' for a list of commands.");
   OThreadCLI.startConsole(Serial);
 }
diff --git a/libraries/OpenThread/examples/SimpleCLI/ci.json b/libraries/OpenThread/examples/CLI/SimpleCLI/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/SimpleCLI/ci.json
rename to libraries/OpenThread/examples/CLI/SimpleCLI/ci.json
diff --git a/libraries/OpenThread/examples/SimpleNode/SimpleNode.ino b/libraries/OpenThread/examples/CLI/SimpleNode/SimpleNode.ino
similarity index 82%
rename from libraries/OpenThread/examples/SimpleNode/SimpleNode.ino
rename to libraries/OpenThread/examples/CLI/SimpleNode/SimpleNode.ino
index 95bf7a2401a..d17b692cc74 100644
--- a/libraries/OpenThread/examples/SimpleNode/SimpleNode.ino
+++ b/libraries/OpenThread/examples/CLI/SimpleNode/SimpleNode.ino
@@ -1,4 +1,4 @@
-// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,12 +35,13 @@
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin();                 // AutoStart using Thread default settings
-  otPrintNetworkInformation(Serial);  // Print Current Thread Network Information
+  OThread.begin();  // AutoStart using Thread default settings
+  OThreadCLI.begin();
+  OThread.otPrintNetworkInformation(Serial);  // Print Current Thread Network Information
 }
 
 void loop() {
   Serial.print("Thread Node State: ");
-  Serial.println(otGetStringDeviceRole());
+  Serial.println(OThread.otGetStringDeviceRole());
   delay(5000);
 }
diff --git a/libraries/OpenThread/examples/SimpleNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleNode/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/SimpleNode/ci.json
rename to libraries/OpenThread/examples/CLI/SimpleNode/ci.json
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ExtendedRouterNode.ino b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ExtendedRouterNode.ino
similarity index 89%
rename from libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ExtendedRouterNode.ino
rename to libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ExtendedRouterNode.ino
index 4fc8a921584..40f046aeab5 100644
--- a/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ExtendedRouterNode.ino
+++ b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ExtendedRouterNode.ino
@@ -1,4 +1,4 @@
-// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,7 +22,8 @@ bool otStatus = true;
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin(false);  // No AutoStart - fresh start
+  OThread.begin(false);  // No AutoStart - fresh start
+  OThreadCLI.begin();
   Serial.println("Setting up OpenThread Node as Router/Child");
   Serial.println("Make sure the Leader Node is already running");
 
@@ -39,7 +40,7 @@ void setup() {
   }
   // wait for the node to enter in the router state
   uint32_t timeout = millis() + 90000;  // waits 90 seconds to
-  while (otGetDeviceRole() != OT_ROLE_CHILD && otGetDeviceRole() != OT_ROLE_ROUTER) {
+  while (OThread.otGetDeviceRole() != OT_ROLE_CHILD && OThread.otGetDeviceRole() != OT_ROLE_ROUTER) {
     Serial.print(".");
     if (millis() > timeout) {
       Serial.println("\r\n\t===> Timeout! Failed.");
@@ -70,7 +71,7 @@ void loop() {
   if (otStatus) {
     Serial.println("Thread NetworkInformation: ");
     Serial.println("---------------------------");
-    otPrintNetworkInformation(Serial);
+    OThread.otPrintNetworkInformation(Serial);
     Serial.println("---------------------------");
   } else {
     Serial.println("Some OpenThread operation has failed...");
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/SimpleThreadNetwork/ExtendedRouterNode/ci.json
rename to libraries/OpenThread/examples/CLI/SimpleThreadNetwork/ExtendedRouterNode/ci.json
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/LeaderNode.ino b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
similarity index 93%
rename from libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
rename to libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
index 7b709717692..a945a5c8f77 100644
--- a/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
+++ b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
@@ -1,4 +1,4 @@
-// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -35,7 +35,8 @@ otInstance *aInstance = NULL;
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin(false);  // No AutoStart - fresh start
+  OThread.begin(false);  // No AutoStart - fresh start
+  OThreadCLI.begin();
   Serial.println();
   Serial.println("Setting up OpenThread Node as Leader");
   aInstance = esp_openthread_get_instance();
@@ -51,11 +52,11 @@ void setup() {
 void loop() {
   Serial.println("=============================================");
   Serial.print("Thread Node State: ");
-  Serial.println(otGetStringDeviceRole());
+  Serial.println(OThread.otGetStringDeviceRole());
 
   // Native OpenThread API calls:
   // wait until the node become Child or Router
-  if (otGetDeviceRole() == OT_ROLE_LEADER) {
+  if (OThread.otGetDeviceRole() == OT_ROLE_LEADER) {
     // Network Name
     const char *networkName = otThreadGetNetworkName(aInstance);
     Serial.printf("Network Name: %s\r\n", networkName);
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/SimpleThreadNetwork/LeaderNode/ci.json
rename to libraries/OpenThread/examples/CLI/SimpleThreadNetwork/LeaderNode/ci.json
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/RouterNode.ino b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/RouterNode.ino
similarity index 92%
rename from libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/RouterNode.ino
rename to libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/RouterNode.ino
index 45475fa0c6a..f802bd7ef01 100644
--- a/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/RouterNode.ino
+++ b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/RouterNode.ino
@@ -1,4 +1,4 @@
-// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,7 +34,8 @@ otInstance *aInstance = NULL;
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin(false);  // No AutoStart - fresh start
+  OThread.begin(false);  // No AutoStart - fresh start
+  OThreadCLI.begin();
   Serial.println();
   Serial.println("Setting up OpenThread Node as Router/Child");
   Serial.println("Make sure the Leader Node is already running");
@@ -51,11 +52,11 @@ void setup() {
 void loop() {
   Serial.println("=============================================");
   Serial.print("Thread Node State: ");
-  Serial.println(otGetStringDeviceRole());
+  Serial.println(OThread.otGetStringDeviceRole());
 
   // Native OpenThread API calls:
   // wait until the node become Child or Router
-  if (otGetDeviceRole() == OT_ROLE_CHILD || otGetDeviceRole() == OT_ROLE_ROUTER) {
+  if (OThread.otGetDeviceRole() == OT_ROLE_CHILD || OThread.otGetDeviceRole() == OT_ROLE_ROUTER) {
     // Network Name
     const char *networkName = otThreadGetNetworkName(aInstance);
     Serial.printf("Network Name: %s\r\n", networkName);
diff --git a/libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json b/libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/SimpleThreadNetwork/RouterNode/ci.json
rename to libraries/OpenThread/examples/CLI/SimpleThreadNetwork/RouterNode/ci.json
diff --git a/libraries/OpenThread/examples/ThreadScan/ThreadScan.ino b/libraries/OpenThread/examples/CLI/ThreadScan/ThreadScan.ino
similarity index 89%
rename from libraries/OpenThread/examples/ThreadScan/ThreadScan.ino
rename to libraries/OpenThread/examples/CLI/ThreadScan/ThreadScan.ino
index 9d0074bb180..87c29339fb7 100644
--- a/libraries/OpenThread/examples/ThreadScan/ThreadScan.ino
+++ b/libraries/OpenThread/examples/CLI/ThreadScan/ThreadScan.ino
@@ -1,4 +1,4 @@
-// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2025 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -27,7 +27,8 @@
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin(true);      // For scanning, AutoStart must be active, any setup
+  OThread.begin(true);  // For scanning, AutoStart must be active, any setup
+  OThreadCLI.begin();
   OThreadCLI.setTimeout(100);  // Set a timeout for the CLI response
   Serial.println();
   Serial.println("This sketch will continuously scan the Thread Local Network and all devices IEEE 802.15.4 compatible");
@@ -41,7 +42,7 @@ void loop() {
     Serial.println("Scan Failed...");
   }
   delay(5000);
-  if (otGetDeviceRole() < OT_ROLE_CHILD) {
+  if (OThread.otGetDeviceRole() < OT_ROLE_CHILD) {
     Serial.println();
     Serial.println("This device has not started Thread yet, bypassing Discovery Scan");
     return;
diff --git a/libraries/OpenThread/examples/ThreadScan/ci.json b/libraries/OpenThread/examples/CLI/ThreadScan/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/ThreadScan/ci.json
rename to libraries/OpenThread/examples/CLI/ThreadScan/ci.json
diff --git a/libraries/OpenThread/examples/onReceive/ci.json b/libraries/OpenThread/examples/CLI/onReceive/ci.json
similarity index 100%
rename from libraries/OpenThread/examples/onReceive/ci.json
rename to libraries/OpenThread/examples/CLI/onReceive/ci.json
diff --git a/libraries/OpenThread/examples/onReceive/onReceive.ino b/libraries/OpenThread/examples/CLI/onReceive/onReceive.ino
similarity index 96%
rename from libraries/OpenThread/examples/onReceive/onReceive.ino
rename to libraries/OpenThread/examples/CLI/onReceive/onReceive.ino
index b37c2fc7931..f53cc33f5ec 100644
--- a/libraries/OpenThread/examples/onReceive/onReceive.ino
+++ b/libraries/OpenThread/examples/CLI/onReceive/onReceive.ino
@@ -39,7 +39,8 @@ void otReceivedLine() {
 
 void setup() {
   Serial.begin(115200);
-  OThreadCLI.begin();  // AutoStart
+  OThread.begin();  // AutoStart
+  OThreadCLI.begin();
   OThreadCLI.onReceive(otReceivedLine);
 }
 
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/LeaderNode.ino b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
new file mode 100644
index 00000000000..dfea9776838
--- /dev/null
+++ b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/LeaderNode.ino
@@ -0,0 +1,34 @@
+#include "OThread.h"
+
+OpenThread threadLeaderNode;
+DataSet dataset;
+
+void setup() {
+  Serial.begin(115200);
+
+  // Start OpenThread Stack - false for not using NVS dataset information
+  threadLeaderNode.begin(false);
+
+  // Create a new Thread Network Dataset for a Leader Node
+  dataset.initNew();
+  // Configure the dataset
+  dataset.setNetworkName("ESP_OpenThread");
+  uint8_t extPanId[OT_EXT_PAN_ID_SIZE] = {0xDE, 0xAD, 0x00, 0xBE, 0xEF, 0x00, 0xCA, 0xFE};
+  dataset.setExtendedPanId(extPanId);
+  uint8_t networkKey[OT_NETWORK_KEY_SIZE] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
+  dataset.setNetworkKey(networkKey);
+  dataset.setChannel(15);
+  dataset.setPanId(0x1234);
+
+  // Apply the dataset and start the network
+  threadLeaderNode.commitDataSet(dataset);
+  threadLeaderNode.networkInterfaceUp();
+  threadLeaderNode.start();
+}
+
+void loop() {
+  // Print network information every 5 seconds
+  Serial.println("==============================================");
+  threadLeaderNode.otPrintNetworkInformation(Serial);
+  delay(5000);
+}
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.json b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.json
new file mode 100644
index 00000000000..2ee6af3490e
--- /dev/null
+++ b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/LeaderNode/ci.json
@@ -0,0 +1,6 @@
+{
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/RouterNode.ino b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/RouterNode.ino
new file mode 100644
index 00000000000..5ffa535ad51
--- /dev/null
+++ b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/RouterNode.ino
@@ -0,0 +1,29 @@
+#include "OThread.h"
+
+OpenThread threadChildNode;
+DataSet dataset;
+
+void setup() {
+  Serial.begin(115200);
+
+  // Start OpenThread Stack - false for not using NVS dataset information
+  threadChildNode.begin(false);
+
+  // clear dataset
+  dataset.clear();
+  // Configure the dataset with the same Network Key of the Leader Node
+  uint8_t networkKey[OT_NETWORK_KEY_SIZE] = {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
+  dataset.setNetworkKey(networkKey);
+
+  // Apply the dataset and start the network
+  threadChildNode.commitDataSet(dataset);
+  threadChildNode.networkInterfaceUp();
+  threadChildNode.start();
+}
+
+void loop() {
+  // Print network information every 5 seconds
+  Serial.println("==============================================");
+  threadChildNode.otPrintNetworkInformation(Serial);
+  delay(5000);
+}
diff --git a/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.json b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.json
new file mode 100644
index 00000000000..2ee6af3490e
--- /dev/null
+++ b/libraries/OpenThread/examples/Native/SimpleThreadNetwork/RouterNode/ci.json
@@ -0,0 +1,6 @@
+{
+  "requires": [
+    "CONFIG_OPENTHREAD_ENABLED=y",
+    "CONFIG_SOC_IEEE802154_SUPPORTED=y"
+  ]
+}
diff --git a/libraries/OpenThread/keywords.txt b/libraries/OpenThread/keywords.txt
index d7193de188d..b62c2c23ddc 100644
--- a/libraries/OpenThread/keywords.txt
+++ b/libraries/OpenThread/keywords.txt
@@ -7,7 +7,10 @@
 #######################################
 
 OThreadCLI	KEYWORD1
+OThread	KEYWORD1
 OpenThreadCLI	KEYWORD1
+OpenThread	KEYWORD1
+DataSet	KEYWORD1
 ot_cmd_return_t	KEYWORD1
 ot_device_role_t	KEYWORD1
 
@@ -35,6 +38,27 @@ otGetRespCmd	KEYWORD2
 otExecCommand	KEYWORD2
 otPrintRespCLI	KEYWORD2
 otPrintNetworkInformation	KEYWORD2
+clear	KEYWORD2
+initNew	KEYWORD2
+getDataset	KEYWORD2
+setNetworkName	KEYWORD2
+getNetworkName	KEYWORD2
+setExtendedPanId	KEYWORD2
+getExtendedPanId	KEYWORD2
+setNetworkKey	KEYWORD2
+getNetworkKey	KEYWORD2
+setChannel	KEYWORD2
+getChannel	KEYWORD2
+setPanId	KEYWORD2
+getPanId	KEYWORD2
+apply	KEYWORD2
+otStarted	KEYWORD2
+otCLIStarted	KEYWORD2
+start	KEYWORD2
+stop	KEYWORD2
+networkInterfaceUp	KEYWORD2
+networkInterfaceDown	KEYWORD2
+commitDataSet	KEYWORD2
 
 #######################################
 # Constants (LITERAL1)
@@ -45,3 +69,5 @@ OT_ROLE_DETACHED	LITERAL1
 OT_ROLE_CHILD	LITERAL1
 OT_ROLE_ROUTER	LITERAL1
 OT_ROLE_LEADER	LITERAL1
+OT_EXT_PAN_ID_SIZE	LITERAL1
+OT_NETWORK_KEY_SIZE	LITERAL1
diff --git a/libraries/OpenThread/src/OThread.cpp b/libraries/OpenThread/src/OThread.cpp
new file mode 100644
index 00000000000..43d8ce02918
--- /dev/null
+++ b/libraries/OpenThread/src/OThread.cpp
@@ -0,0 +1,364 @@
+#include "OThread.h"
+#if SOC_IEEE802154_SUPPORTED
+#if CONFIG_OPENTHREAD_ENABLED
+
+#include "esp_err.h"
+#include "esp_event.h"
+#include "esp_netif.h"
+#include "esp_netif_types.h"
+#include "esp_vfs_eventfd.h"
+
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/semphr.h"
+#include "freertos/queue.h"
+
+#include "esp_netif_net_stack.h"
+#include "esp_openthread_netif_glue.h"
+#include "lwip/netif.h"
+
+static esp_openthread_platform_config_t ot_native_config;
+static esp_netif_t *openthread_netif = NULL;
+
+const char *otRoleString[] = {
+  "Disabled",  ///< The Thread stack is disabled.
+  "Detached",  ///< Not currently participating in a Thread network/partition.
+  "Child",     ///< The Thread Child role.
+  "Router",    ///< The Thread Router role.
+  "Leader",    ///< The Thread Leader role.
+  "Unknown",   ///< Unknown role, not initialized or not started.
+};
+
+static TaskHandle_t s_ot_task = NULL;
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+static struct netif *ot_lwip_netif = NULL;
+#endif
+
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
+  if (ot_lwip_netif && ot_lwip_netif == inp) {
+    return 0;
+  }
+  if (ip6_addr_isany_val(inp->ip6_addr[0].u_addr.ip6)) {
+    // We don't have an LL address -> eat this packet here, so it won't get accepted on input netif
+    pbuf_free(p);
+    return 1;
+  }
+  return 0;
+}
+#endif
+
+static void ot_task_worker(void *aContext) {
+  esp_vfs_eventfd_config_t eventfd_config = {
+    .max_fds = 3,
+  };
+  bool err = false;
+  if (ESP_OK != esp_event_loop_create_default()) {
+    log_e("Failed to create OpentThread event loop");
+    err = true;
+  }
+  if (!err && ESP_OK != esp_netif_init()) {
+    log_e("Failed to initialize OpentThread netif");
+    err = true;
+  }
+  if (!err && ESP_OK != esp_vfs_eventfd_register(&eventfd_config)) {
+    log_e("Failed to register OpentThread eventfd");
+    err = true;
+  }
+
+  // Initialize the OpenThread stack
+  if (!err && ESP_OK != esp_openthread_init(&ot_native_config)) {
+    log_e("Failed to initialize OpenThread stack");
+    err = true;
+  }
+  if (!err) {
+    // Initialize the esp_netif bindings
+    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_OPENTHREAD();
+    openthread_netif = esp_netif_new(&cfg);
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+    // Get LwIP Netif
+    if (openthread_netif != NULL) {
+      ot_lwip_netif = (struct netif *)esp_netif_get_netif_impl(openthread_netif);
+      if (ot_lwip_netif == NULL) {
+        log_e("Failed to get OpenThread LwIP netif");
+      }
+    }
+#endif
+  }
+  if (!err && openthread_netif == NULL) {
+    log_e("Failed to create OpenThread esp_netif");
+    err = true;
+  }
+  if (!err && ESP_OK != esp_netif_attach(openthread_netif, esp_openthread_netif_glue_init(&ot_native_config))) {
+    log_e("Failed to attach OpenThread esp_netif");
+    err = true;
+  }
+  if (!err && ESP_OK != esp_netif_set_default_netif(openthread_netif)) {
+    log_e("Failed to set default OpenThread esp_netif");
+    err = true;
+  }
+  if (!err) {
+    // only returns in case there is an OpenThread Stack failure...
+    esp_openthread_launch_mainloop();
+  }
+  // Clean up
+  esp_openthread_netif_glue_deinit();
+  esp_netif_destroy(openthread_netif);
+  esp_vfs_eventfd_unregister();
+  vTaskDelete(NULL);
+}
+
+// DataSet Implementation
+DataSet::DataSet() {
+  memset(&mDataset, 0, sizeof(mDataset));
+}
+
+void DataSet::clear() {
+  memset(&mDataset, 0, sizeof(mDataset));
+}
+
+void DataSet::initNew() {
+  otInstance *mInstance = esp_openthread_get_instance();
+  if (!mInstance) {
+    log_e("OpenThread not started. Please begin() it before initializing a new dataset.");
+    return;
+  }
+  clear();
+  otDatasetCreateNewNetwork(mInstance, &mDataset);
+}
+
+const otOperationalDataset &DataSet::getDataset() const {
+  return mDataset;
+}
+
+void DataSet::setNetworkName(const char *name) {
+  strncpy(mDataset.mNetworkName.m8, name, sizeof(mDataset.mNetworkName.m8));
+  mDataset.mComponents.mIsNetworkNamePresent = true;
+}
+
+void DataSet::setExtendedPanId(const uint8_t *extPanId) {
+  memcpy(mDataset.mExtendedPanId.m8, extPanId, OT_EXT_PAN_ID_SIZE);
+  mDataset.mComponents.mIsExtendedPanIdPresent = true;
+}
+
+void DataSet::setNetworkKey(const uint8_t *key) {
+  memcpy(mDataset.mNetworkKey.m8, key, OT_NETWORK_KEY_SIZE);
+  mDataset.mComponents.mIsNetworkKeyPresent = true;
+}
+
+void DataSet::setChannel(uint8_t channel) {
+  mDataset.mChannel = channel;
+  mDataset.mComponents.mIsChannelPresent = true;
+}
+
+void DataSet::setPanId(uint16_t panId) {
+  mDataset.mPanId = panId;
+  mDataset.mComponents.mIsPanIdPresent = true;
+}
+
+const char *DataSet::getNetworkName() const {
+  return mDataset.mNetworkName.m8;
+}
+
+const uint8_t *DataSet::getExtendedPanId() const {
+  return mDataset.mExtendedPanId.m8;
+}
+
+const uint8_t *DataSet::getNetworkKey() const {
+  return mDataset.mNetworkKey.m8;
+}
+
+uint8_t DataSet::getChannel() const {
+  return mDataset.mChannel;
+}
+
+uint16_t DataSet::getPanId() const {
+  return mDataset.mPanId;
+}
+
+void DataSet::apply(otInstance *instance) {
+  otDatasetSetActive(instance, &mDataset);
+}
+
+// OpenThread Implementation
+bool OpenThread::otStarted = false;
+
+otInstance *OpenThread::mInstance = nullptr;
+OpenThread::OpenThread() {}
+
+OpenThread::~OpenThread() {
+  end();
+}
+
+OpenThread::operator bool() const {
+  return otStarted;
+}
+
+void OpenThread::begin(bool OThreadAutoStart) {
+  if (otStarted) {
+    log_w("OpenThread already started");
+    return;
+  }
+
+  memset(&ot_native_config, 0, sizeof(esp_openthread_platform_config_t));
+  ot_native_config.radio_config.radio_mode = RADIO_MODE_NATIVE;
+  ot_native_config.host_config.host_connection_mode = HOST_CONNECTION_MODE_NONE;
+  ot_native_config.port_config.storage_partition_name = "nvs";
+  ot_native_config.port_config.netif_queue_size = 10;
+  ot_native_config.port_config.task_queue_size = 10;
+
+  // Initialize OpenThread stack
+  xTaskCreate(ot_task_worker, "ot_main_loop", 10240, NULL, 20, &s_ot_task);
+  if (s_ot_task == NULL) {
+    log_e("Error: Failed to create OpenThread task");
+    return;
+  }
+  log_d("OpenThread task created successfully");
+  // get the OpenThread instance that will be used for all operations
+  mInstance = esp_openthread_get_instance();
+  if (!mInstance) {
+    log_e("Error: Failed to initialize OpenThread instance");
+    end();
+    return;
+  }
+  // starts Thread with default dataset from NVS or from IDF default settings
+  if (OThreadAutoStart) {
+    otOperationalDatasetTlvs dataset;
+    otError error = otDatasetGetActiveTlvs(esp_openthread_get_instance(), &dataset);
+    //    error = OT_ERROR_FAILED; // teste para forçar NULL dataset
+    if (error != OT_ERROR_NONE) {
+      log_i("Failed to get active NVS dataset from OpenThread");
+    } else {
+      log_i("Got active NVS dataset from OpenThread");
+    }
+    esp_err_t err = esp_openthread_auto_start((error == OT_ERROR_NONE) ? &dataset : NULL);
+    if (err != ESP_OK) {
+      log_i("Failed to AUTO start OpenThread");
+    } else {
+      log_i("AUTO start OpenThread done");
+    }
+  }
+  otStarted = true;
+}
+
+void OpenThread::end() {
+  if (s_ot_task != NULL) {
+    vTaskDelete(s_ot_task);
+    s_ot_task = NULL;
+    // Clean up
+    esp_openthread_deinit();
+    esp_openthread_netif_glue_deinit();
+#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
+    ot_lwip_netif = NULL;
+#endif
+    esp_netif_destroy(openthread_netif);
+    esp_vfs_eventfd_unregister();
+  }
+  otStarted = false;
+}
+
+void OpenThread::start() {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return;
+  }
+  otThreadSetEnabled(mInstance, true);
+  log_d("Thread network started");
+}
+
+void OpenThread::stop() {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return;
+  }
+  otThreadSetEnabled(mInstance, false);
+  log_d("Thread network stopped");
+}
+
+void OpenThread::networkInterfaceUp() {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return;
+  }
+  // Enable the Thread interface (equivalent to CLI Command "ifconfig up")
+  otError error = otIp6SetEnabled(mInstance, true);
+  if (error != OT_ERROR_NONE) {
+    log_e("Error: Failed to enable Thread interface (error code: %d)\n", error);
+  }
+  log_d("OpenThread Network Interface is up");
+}
+
+void OpenThread::networkInterfaceDown() {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return;
+  }
+  // Disable the Thread interface (equivalent to CLI Command "ifconfig down")
+  otError error = otIp6SetEnabled(mInstance, false);
+  if (error != OT_ERROR_NONE) {
+    log_e("Error: Failed to disable Thread interface (error code: %d)\n", error);
+  }
+  log_d("OpenThread Network Interface is down");
+}
+
+void OpenThread::commitDataSet(const DataSet &dataset) {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return;
+  }
+  // Commit the dataset as the active dataset
+  otError error = otDatasetSetActive(mInstance, &(dataset.getDataset()));
+  if (error != OT_ERROR_NONE) {
+    log_e("Error: Failed to commit dataset (error code: %d)\n", error);
+    return;
+  }
+  log_d("Dataset committed successfully");
+}
+
+ot_device_role_t OpenThread::otGetDeviceRole() {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return OT_ROLE_DISABLED;
+  }
+  return (ot_device_role_t)otThreadGetDeviceRole(mInstance);
+}
+
+const char *OpenThread::otGetStringDeviceRole() {
+  return otRoleString[otGetDeviceRole()];
+}
+
+void OpenThread::otPrintNetworkInformation(Stream &output) {
+  if (!mInstance) {
+    log_w("Error: OpenThread instance not initialized");
+    return;
+  }
+
+  output.printf("Role: %s", otGetStringDeviceRole());
+  output.println();
+  output.printf("Network Name: %s", otThreadGetNetworkName(mInstance));
+  output.println();
+  output.printf("Channel: %d", otLinkGetChannel(mInstance));
+  output.println();
+  output.printf("PAN ID: 0x%04x", otLinkGetPanId(mInstance));
+  output.println();
+
+  const otExtendedPanId *extPanId = otThreadGetExtendedPanId(mInstance);
+  output.print("Extended PAN ID: ");
+  for (int i = 0; i < OT_EXT_PAN_ID_SIZE; i++) {
+    output.printf("%02x", extPanId->m8[i]);
+  }
+  output.println();
+
+  otNetworkKey networkKey;
+  otThreadGetNetworkKey(mInstance, &networkKey);
+  output.print("Network Key: ");
+  for (int i = 0; i < OT_NETWORK_KEY_SIZE; i++) {
+    output.printf("%02x", networkKey.m8[i]);
+  }
+  output.println();
+}
+
+OpenThread OThread;
+
+#endif /* CONFIG_OPENTHREAD_ENABLED */
+#endif /* SOC_IEEE802154_SUPPORTED */
diff --git a/libraries/OpenThread/src/OThread.h b/libraries/OpenThread/src/OThread.h
new file mode 100644
index 00000000000..359d581bb9d
--- /dev/null
+++ b/libraries/OpenThread/src/OThread.h
@@ -0,0 +1,107 @@
+// Copyright 2024 Espressif Systems (Shanghai) PTE LTD
+//
+// 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.
+
+#pragma once
+#include "soc/soc_caps.h"
+#include "sdkconfig.h"
+#if SOC_IEEE802154_SUPPORTED
+#if CONFIG_OPENTHREAD_ENABLED
+
+#include <openthread/thread.h>
+#include <openthread/link.h>
+#include <openthread/netdata.h>
+#include <openthread/ip6.h>
+#include <openthread/dataset_ftd.h>
+#include <esp_openthread.h>
+#include <Arduino.h>
+
+typedef enum {
+  OT_ROLE_DISABLED = 0,  ///< The Thread stack is disabled.
+  OT_ROLE_DETACHED = 1,  ///< Not currently participating in a Thread network/partition.
+  OT_ROLE_CHILD = 2,     ///< The Thread Child role.
+  OT_ROLE_ROUTER = 3,    ///< The Thread Router role.
+  OT_ROLE_LEADER = 4,    ///< The Thread Leader role.
+} ot_device_role_t;
+extern const char *otRoleString[];
+
+class DataSet {
+public:
+  DataSet();
+  void clear();
+  void initNew();
+  const otOperationalDataset &getDataset() const;
+
+  // Setters
+  void setNetworkName(const char *name);
+  void setExtendedPanId(const uint8_t *extPanId);
+  void setNetworkKey(const uint8_t *key);
+  void setChannel(uint8_t channel);
+  void setPanId(uint16_t panId);
+
+  // Getters
+  const char *getNetworkName() const;
+  const uint8_t *getExtendedPanId() const;
+  const uint8_t *getNetworkKey() const;
+  uint8_t getChannel() const;
+  uint16_t getPanId() const;
+
+  // Apply the dataset to the OpenThread instance
+  void apply(otInstance *instance);
+
+private:
+  otOperationalDataset mDataset;
+};
+
+class OpenThread {
+public:
+  static bool otStarted;
+  static ot_device_role_t otGetDeviceRole();
+  static const char *otGetStringDeviceRole();
+  static void otPrintNetworkInformation(Stream &output);
+
+  OpenThread();
+  ~OpenThread();
+  // returns true if OpenThread Stack is running
+  operator bool() const;
+
+  // Initialize OpenThread
+  static void begin(bool OThreadAutoStart = true);
+
+  // Initialize OpenThread
+  static void end();
+
+  // Start the Thread network
+  void start();
+
+  // Stop the Thread network
+  void stop();
+
+  // Start Thread Network Interface
+  void networkInterfaceUp();
+
+  // Stop Thread Network Interface
+  void networkInterfaceDown();
+
+  // Set the dataset
+  void commitDataSet(const DataSet &dataset);
+
+private:
+  static otInstance *mInstance;
+  DataSet mCurrentDataSet;
+};
+
+extern OpenThread OThread;
+
+#endif /* CONFIG_OPENTHREAD_ENABLED */
+#endif /* SOC_IEEE802154_SUPPORTED */
diff --git a/libraries/OpenThread/src/OThreadCLI.cpp b/libraries/OpenThread/src/OThreadCLI.cpp
index 85ba03563e8..2f0f97a0539 100644
--- a/libraries/OpenThread/src/OThreadCLI.cpp
+++ b/libraries/OpenThread/src/OThreadCLI.cpp
@@ -33,18 +33,12 @@
 #include "esp_netif_net_stack.h"
 #include "lwip/netif.h"
 
+bool OpenThreadCLI::otCLIStarted = false;
 static TaskHandle_t s_cli_task = NULL;
 static TaskHandle_t s_console_cli_task = NULL;
 static QueueHandle_t rx_queue = NULL;
 static QueueHandle_t tx_queue = NULL;
 
-static esp_openthread_platform_config_t ot_native_config;
-static TaskHandle_t s_ot_task = NULL;
-static esp_netif_t *openthread_netif = NULL;
-#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
-static struct netif *ot_lwip_netif = NULL;
-#endif
-
 #define OT_CLI_MAX_LINE_LENGTH 512
 
 typedef struct {
@@ -53,21 +47,7 @@ typedef struct {
   String prompt;
   OnReceiveCb_t responseCallBack;
 } ot_cli_console_t;
-static ot_cli_console_t otConsole = {NULL, false, (const char *)NULL, NULL};
-
-#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
-extern "C" int lwip_hook_ip6_input(struct pbuf *p, struct netif *inp) {
-  if (ot_lwip_netif && ot_lwip_netif == inp) {
-    return 0;
-  }
-  if (ip6_addr_isany_val(inp->ip6_addr[0].u_addr.ip6)) {
-    // We don't have an LL address -> eat this packet here, so it won't get accepted on input netif
-    pbuf_free(p);
-    return 1;
-  }
-  return 0;
-}
-#endif
+static ot_cli_console_t otConsole = {nullptr, false, (const char *)nullptr, nullptr};
 
 // process the CLI commands sent to the OpenThread stack
 static void ot_cli_loop(void *context) {
@@ -131,7 +111,7 @@ static int ot_cli_output_callback(void *context, const char *format, va_list arg
         }
         // if there is a user callback function in place, it shall have the priority
         // to process/consume the Stream data received from OpenThread CLI, which is available in its RX Buffer
-        if (otConsole.responseCallBack != NULL) {
+        if (otConsole.responseCallBack != nullptr) {
           otConsole.responseCallBack();
         }
       }
@@ -205,7 +185,7 @@ void OpenThreadCLI::setEchoBack(bool echoback) {
 }
 
 void OpenThreadCLI::setPrompt(char *prompt) {
-  otConsole.prompt = prompt;  // NULL will make the prompt not visible
+  otConsole.prompt = prompt;  // nullptr can make the prompt not visible
 }
 
 void OpenThreadCLI::setStream(Stream &otStream) {
@@ -213,12 +193,12 @@ void OpenThreadCLI::setStream(Stream &otStream) {
 }
 
 void OpenThreadCLI::onReceive(OnReceiveCb_t func) {
-  otConsole.responseCallBack = func;  // NULL will set it off
+  otConsole.responseCallBack = func;  // nullptr will set it off
 }
 
 // Stream object shall be already started and configured before calling this function
 void OpenThreadCLI::startConsole(Stream &otStream, bool echoback, const char *prompt) {
-  if (!otStarted) {
+  if (!otCLIStarted) {
     log_e("OpenThread CLI has not started. Please begin() it before starting the console.");
     return;
   }
@@ -226,7 +206,7 @@ void OpenThreadCLI::startConsole(Stream &otStream, bool echoback, const char *pr
   if (s_console_cli_task == NULL) {
     otConsole.cliStream = &otStream;
     otConsole.echoback = echoback;
-    otConsole.prompt = prompt;  // NULL will invalidate the String
+    otConsole.prompt = prompt;  // nullptr will invalidate the String
     // it will run in the same priority (1) as the Arduino setup()/loop() task
     xTaskCreate(ot_cli_console_worker, "ot_cli_console", 4096, &otConsole, 1, &s_console_cli_task);
   } else {
@@ -242,12 +222,6 @@ void OpenThreadCLI::stopConsole() {
 }
 
 OpenThreadCLI::OpenThreadCLI() {
-  memset(&ot_native_config, 0, sizeof(esp_openthread_platform_config_t));
-  ot_native_config.radio_config.radio_mode = RADIO_MODE_NATIVE;
-  ot_native_config.host_config.host_connection_mode = HOST_CONNECTION_MODE_NONE;
-  ot_native_config.port_config.storage_partition_name = "nvs";
-  ot_native_config.port_config.netif_queue_size = 10;
-  ot_native_config.port_config.task_queue_size = 10;
   //sTxString = "";
 }
 
@@ -256,79 +230,19 @@ OpenThreadCLI::~OpenThreadCLI() {
 }
 
 OpenThreadCLI::operator bool() const {
-  return otStarted;
+  return otCLIStarted;
 }
 
-static void ot_task_worker(void *aContext) {
-  esp_vfs_eventfd_config_t eventfd_config = {
-    .max_fds = 3,
-  };
-  bool err = false;
-  if (ESP_OK != esp_event_loop_create_default()) {
-    log_e("Failed to create OpentThread event loop");
-    err = true;
-  }
-  if (!err && ESP_OK != esp_netif_init()) {
-    log_e("Failed to initialize OpentThread netif");
-    err = true;
-  }
-  if (!err && ESP_OK != esp_vfs_eventfd_register(&eventfd_config)) {
-    log_e("Failed to register OpentThread eventfd");
-    err = true;
-  }
-
-  // Initialize the OpenThread stack
-  if (!err && ESP_OK != esp_openthread_init(&ot_native_config)) {
-    log_e("Failed to initialize OpenThread stack");
-    err = true;
-  }
-  if (!err) {
-    // Initialize the OpenThread cli
-    otCliInit(esp_openthread_get_instance(), ot_cli_output_callback, NULL);
-
-    // Initialize the esp_netif bindings
-    esp_netif_config_t cfg = ESP_NETIF_DEFAULT_OPENTHREAD();
-    openthread_netif = esp_netif_new(&cfg);
-#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
-    // Get LwIP Netif
-    if (openthread_netif != NULL) {
-      ot_lwip_netif = (struct netif *)esp_netif_get_netif_impl(openthread_netif);
-      if (ot_lwip_netif == NULL) {
-        log_e("Failed to get OpenThread LwIP netif");
-      }
-    }
-#endif
-  }
-  if (!err && openthread_netif == NULL) {
-    log_e("Failed to create OpenThread esp_netif");
-    err = true;
-  }
-  if (!err && ESP_OK != esp_netif_attach(openthread_netif, esp_openthread_netif_glue_init(&ot_native_config))) {
-    log_e("Failed to attach OpenThread esp_netif");
-    err = true;
-  }
-  if (!err && ESP_OK != esp_netif_set_default_netif(openthread_netif)) {
-    log_e("Failed to set default OpenThread esp_netif");
-    err = true;
-  }
-  if (!err) {
-    // only returns in case there is an OpenThread Stack failure...
-    esp_openthread_launch_mainloop();
-  }
-  // Clean up
-  esp_openthread_netif_glue_deinit();
-  esp_netif_destroy(openthread_netif);
-  esp_vfs_eventfd_unregister();
-  vTaskDelete(NULL);
-}
-
-void OpenThreadCLI::begin(bool OThreadAutoStart) {
-  if (otStarted) {
+void OpenThreadCLI::begin() {
+  if (otCLIStarted) {
     log_w("OpenThread CLI already started. Please end() it before starting again.");
     return;
   }
 
-  xTaskCreate(ot_task_worker, "ot_main_loop", 10240, NULL, 20, &s_ot_task);
+  if (!OpenThread::otStarted) {
+    log_w("OpenThread not started. Please begin() it before starting  CLI.");
+    return;
+  }
 
   //RX Buffer default has 1024 bytes if not preset
   if (rx_queue == NULL) {
@@ -342,55 +256,29 @@ void OpenThreadCLI::begin(bool OThreadAutoStart) {
       log_e("HW CDC RX Buffer error");
     }
   }
+
   xTaskCreate(ot_cli_loop, "ot_cli", 4096, xTaskGetCurrentTaskHandle(), 2, &s_cli_task);
+  // Initialize the OpenThread cli
+  otCliInit(esp_openthread_get_instance(), ot_cli_output_callback, NULL);
 
-  // starts Thread with default dataset from NVS or from IDF default settings
-  if (OThreadAutoStart) {
-    otOperationalDatasetTlvs dataset;
-    otError error = otDatasetGetActiveTlvs(esp_openthread_get_instance(), &dataset);
-    //    error = OT_ERROR_FAILED; // teste para forçar NULL dataset
-    if (error != OT_ERROR_NONE) {
-      log_i("Failed to get active NVS dataset from OpenThread");
-    } else {
-      log_i("Got active NVS dataset from OpenThread");
-    }
-    esp_err_t err = esp_openthread_auto_start((error == OT_ERROR_NONE) ? &dataset : NULL);
-    if (err != ESP_OK) {
-      log_i("Failed to AUTO start OpenThread");
-    } else {
-      log_i("AUTO start OpenThread done");
-    }
-  }
-  otStarted = true;
+  otCLIStarted = true;
   return;
 }
 
 void OpenThreadCLI::end() {
-  if (!otStarted) {
+  if (!otCLIStarted) {
     log_w("OpenThread CLI already stopped. Please begin() it before stopping again.");
     return;
   }
-  if (s_ot_task != NULL) {
-    vTaskDelete(s_ot_task);
-    // Clean up
-    esp_openthread_deinit();
-    esp_openthread_netif_glue_deinit();
-#if CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM
-    ot_lwip_netif = NULL;
-#endif
-    esp_netif_destroy(openthread_netif);
-    esp_vfs_eventfd_unregister();
-  }
   if (s_cli_task != NULL) {
     vTaskDelete(s_cli_task);
+    s_cli_task = NULL;
   }
-  if (s_console_cli_task != NULL) {
-    vTaskDelete(s_console_cli_task);
-  }
+  stopConsole();
   esp_event_loop_delete_default();
   setRxBufferSize(0);
   setTxBufferSize(0);
-  otStarted = false;
+  otCLIStarted = false;
 }
 
 size_t OpenThreadCLI::write(uint8_t c) {
diff --git a/libraries/OpenThread/src/OThreadCLI.h b/libraries/OpenThread/src/OThreadCLI.h
index bc8dc5d2b19..788edc2709b 100644
--- a/libraries/OpenThread/src/OThreadCLI.h
+++ b/libraries/OpenThread/src/OThreadCLI.h
@@ -21,7 +21,6 @@
 #include "esp_openthread.h"
 #include "esp_openthread_cli.h"
 #include "esp_openthread_lock.h"
-#include "esp_openthread_netif_glue.h"
 #include "esp_openthread_types.h"
 
 #include "openthread/cli.h"
@@ -31,13 +30,14 @@
 #include "openthread/dataset_ftd.h"
 
 #include "Arduino.h"
+#include "OThread.h"
 
 typedef std::function<void(void)> OnReceiveCb_t;
 
 class OpenThreadCLI : public Stream {
 private:
   static size_t setBuffer(QueueHandle_t &queue, size_t len);
-  bool otStarted = false;
+  static bool otCLIStarted;
 
 public:
   OpenThreadCLI();
@@ -53,7 +53,7 @@ class OpenThreadCLI : public Stream {
   void setStream(Stream &otStream);    // changes the console Stream object
   void onReceive(OnReceiveCb_t func);  // called on a complete line of output from OT CLI, as OT Response
 
-  void begin(bool OThreadAutoStart = true);
+  void begin();
   void end();
 
   // default size is 256 bytes
diff --git a/libraries/OpenThread/src/OThreadCLI_Util.cpp b/libraries/OpenThread/src/OThreadCLI_Util.cpp
index d21daa1effc..aad435107bb 100644
--- a/libraries/OpenThread/src/OThreadCLI_Util.cpp
+++ b/libraries/OpenThread/src/OThreadCLI_Util.cpp
@@ -19,26 +19,6 @@
 #include "OThreadCLI_Util.h"
 #include <StreamString.h>
 
-static const char *otRoleString[] = {
-  "Disabled",  ///< The Thread stack is disabled.
-  "Detached",  ///< Not currently participating in a Thread network/partition.
-  "Child",     ///< The Thread Child role.
-  "Router",    ///< The Thread Router role.
-  "Leader",    ///< The Thread Leader role.
-};
-
-ot_device_role_t otGetDeviceRole() {
-  if (!OThreadCLI) {
-    return OT_ROLE_DISABLED;
-  }
-  otInstance *instance = esp_openthread_get_instance();
-  return (ot_device_role_t)otThreadGetDeviceRole(instance);
-}
-
-const char *otGetStringDeviceRole() {
-  return otRoleString[otGetDeviceRole()];
-}
-
 bool otGetRespCmd(const char *cmd, char *resp, uint32_t respTimeout) {
   if (!OThreadCLI) {
     return false;
@@ -174,7 +154,7 @@ bool otPrintRespCLI(const char *cmd, Stream &output, uint32_t respTimeout) {
   return true;
 }
 
-void otPrintNetworkInformation(Stream &output) {
+void otCLIPrintNetworkInformation(Stream &output) {
   if (!OThreadCLI) {
     return;
   }
diff --git a/libraries/OpenThread/src/OThreadCLI_Util.h b/libraries/OpenThread/src/OThreadCLI_Util.h
index 1ab2e061dfc..116b886e095 100644
--- a/libraries/OpenThread/src/OThreadCLI_Util.h
+++ b/libraries/OpenThread/src/OThreadCLI_Util.h
@@ -18,25 +18,14 @@
 #if SOC_IEEE802154_SUPPORTED
 #if CONFIG_OPENTHREAD_ENABLED
 
-typedef enum {
-  OT_ROLE_DISABLED = 0,  ///< The Thread stack is disabled.
-  OT_ROLE_DETACHED = 1,  ///< Not currently participating in a Thread network/partition.
-  OT_ROLE_CHILD = 2,     ///< The Thread Child role.
-  OT_ROLE_ROUTER = 3,    ///< The Thread Router role.
-  OT_ROLE_LEADER = 4,    ///< The Thread Leader role.
-} ot_device_role_t;
-
 typedef struct {
   int errorCode;
   String errorMessage;
 } ot_cmd_return_t;
 
-ot_device_role_t otGetDeviceRole();
-const char *otGetStringDeviceRole();
 bool otGetRespCmd(const char *cmd, char *resp = NULL, uint32_t respTimeout = 5000);
 bool otExecCommand(const char *cmd, const char *arg, ot_cmd_return_t *returnCode = NULL);
 bool otPrintRespCLI(const char *cmd, Stream &output, uint32_t respTimeout);
-void otPrintNetworkInformation(Stream &output);
 
 #endif /* CONFIG_OPENTHREAD_ENABLED */
 #endif /* SOC_IEEE802154_SUPPORTED */
diff --git a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/Zigbee_Analog_Input_Output.ino b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/Zigbee_Analog_Input_Output.ino
index 59c4b514db1..f1cc54bda64 100644
--- a/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/Zigbee_Analog_Input_Output.ino
+++ b/libraries/Zigbee/examples/Zigbee_Analog_Input_Output/Zigbee_Analog_Input_Output.ino
@@ -72,6 +72,9 @@ void setup() {
   zbAnalogDevice.setAnalogOutputDescription("Fan Speed (RPM)");
   zbAnalogDevice.setAnalogOutputResolution(1);
 
+  // Set the min and max values for the analog output which is used by HA to limit the range of the analog output
+  zbAnalogDevice.setAnalogOutputMinMax(-10000, 10000);  //-10000 to 10000 RPM
+
   // If analog output cluster is added, set callback function for analog output change
   zbAnalogDevice.onAnalogOutputChange(onAnalogOutputChange);
 
diff --git a/libraries/Zigbee/src/ep/ZigbeeAnalog.cpp b/libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
index 893a9854ecc..309739d54c9 100644
--- a/libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
+++ b/libraries/Zigbee/src/ep/ZigbeeAnalog.cpp
@@ -1,5 +1,6 @@
 #include "ZigbeeAnalog.h"
 #if CONFIG_ZB_ENABLED
+#include <cfloat>
 
 ZigbeeAnalog::ZigbeeAnalog(uint8_t endpoint) : ZigbeeEP(endpoint) {
   _device_id = ESP_ZB_HA_SIMPLE_SENSOR_DEVICE_ID;
@@ -20,6 +21,8 @@ bool ZigbeeAnalog::addAnalogInput() {
                                "Analog Input";
   uint32_t application_type = 0x00000000 | (ESP_ZB_ZCL_AI_GROUP_ID << 24);
   float resolution = 0.1;  // Default resolution of 0.1
+  float min = -FLT_MAX;    // Default min value for float
+  float max = FLT_MAX;     // Default max value for float
 
   esp_err_t ret = esp_zb_analog_input_cluster_add_attr(esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_DESCRIPTION_ID, (void *)default_description);
   if (ret != ESP_OK) {
@@ -39,11 +42,24 @@ bool ZigbeeAnalog::addAnalogInput() {
     return false;
   }
 
+  ret = esp_zb_analog_input_cluster_add_attr(esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_MIN_PRESENT_VALUE_ID, (void *)&min);
+  if (ret != ESP_OK) {
+    log_e("Failed to set min value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+
+  ret = esp_zb_analog_input_cluster_add_attr(esp_zb_analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_MAX_PRESENT_VALUE_ID, (void *)&max);
+  if (ret != ESP_OK) {
+    log_e("Failed to set max value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+
   ret = esp_zb_cluster_list_add_analog_input_cluster(_cluster_list, esp_zb_analog_input_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
   if (ret != ESP_OK) {
     log_e("Failed to add Analog Input cluster: 0x%x: %s", ret, esp_err_to_name(ret));
     return false;
   }
+
   _analog_clusters |= ANALOG_INPUT;
   return true;
 }
@@ -76,6 +92,8 @@ bool ZigbeeAnalog::addAnalogOutput() {
                                "Analog Output";
   uint32_t application_type = 0x00000000 | (ESP_ZB_ZCL_AO_GROUP_ID << 24);
   float resolution = 1;  // Default resolution of 1
+  float min = -FLT_MAX;  // Default min value for float
+  float max = FLT_MAX;   // Default max value for float
 
   esp_err_t ret =
     esp_zb_analog_output_cluster_add_attr(esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_DESCRIPTION_ID, (void *)default_description);
@@ -96,6 +114,18 @@ bool ZigbeeAnalog::addAnalogOutput() {
     return false;
   }
 
+  ret = esp_zb_analog_output_cluster_add_attr(esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_MIN_PRESENT_VALUE_ID, (void *)&min);
+  if (ret != ESP_OK) {
+    log_e("Failed to set min value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+
+  ret = esp_zb_analog_output_cluster_add_attr(esp_zb_analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_MAX_PRESENT_VALUE_ID, (void *)&max);
+  if (ret != ESP_OK) {
+    log_e("Failed to set max value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+
   ret = esp_zb_cluster_list_add_analog_output_cluster(_cluster_list, esp_zb_analog_output_cluster, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
   if (ret != ESP_OK) {
     log_e("Failed to add Analog Output cluster: 0x%x: %s", ret, esp_err_to_name(ret));
@@ -376,4 +406,58 @@ bool ZigbeeAnalog::setAnalogOutputResolution(float resolution) {
   return true;
 }
 
+bool ZigbeeAnalog::setAnalogOutputMinMax(float min, float max) {
+  if (!(_analog_clusters & ANALOG_OUTPUT)) {
+    log_e("Analog Output cluster not added");
+    return false;
+  }
+
+  esp_zb_attribute_list_t *analog_output_cluster =
+    esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_ANALOG_OUTPUT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
+  if (analog_output_cluster == nullptr) {
+    log_e("Failed to get analog output cluster");
+    return false;
+  }
+
+  esp_err_t ret = esp_zb_cluster_update_attr(analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_MIN_PRESENT_VALUE_ID, (void *)&min);
+  if (ret != ESP_OK) {
+    log_e("Failed to set min value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+
+  ret = esp_zb_cluster_update_attr(analog_output_cluster, ESP_ZB_ZCL_ATTR_ANALOG_OUTPUT_MAX_PRESENT_VALUE_ID, (void *)&max);
+  if (ret != ESP_OK) {
+    log_e("Failed to set max value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+  return true;
+}
+
+bool ZigbeeAnalog::setAnalogInputMinMax(float min, float max) {
+  if (!(_analog_clusters & ANALOG_INPUT)) {
+    log_e("Analog Input cluster not added");
+    return false;
+  }
+
+  esp_zb_attribute_list_t *analog_input_cluster =
+    esp_zb_cluster_list_get_cluster(_cluster_list, ESP_ZB_ZCL_CLUSTER_ID_ANALOG_INPUT, ESP_ZB_ZCL_CLUSTER_SERVER_ROLE);
+  if (analog_input_cluster == nullptr) {
+    log_e("Failed to get analog input cluster");
+    return false;
+  }
+
+  esp_err_t ret = esp_zb_cluster_update_attr(analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_MIN_PRESENT_VALUE_ID, (void *)&min);
+  if (ret != ESP_OK) {
+    log_e("Failed to set min value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+
+  ret = esp_zb_cluster_update_attr(analog_input_cluster, ESP_ZB_ZCL_ATTR_ANALOG_INPUT_MAX_PRESENT_VALUE_ID, (void *)&max);
+  if (ret != ESP_OK) {
+    log_e("Failed to set max value: 0x%x: %s", ret, esp_err_to_name(ret));
+    return false;
+  }
+  return true;
+}
+
 #endif  // CONFIG_ZB_ENABLED
diff --git a/libraries/Zigbee/src/ep/ZigbeeAnalog.h b/libraries/Zigbee/src/ep/ZigbeeAnalog.h
index bbc5f6d6fc2..5218a0b7d60 100644
--- a/libraries/Zigbee/src/ep/ZigbeeAnalog.h
+++ b/libraries/Zigbee/src/ep/ZigbeeAnalog.h
@@ -41,6 +41,10 @@ class ZigbeeAnalog : public ZigbeeEP {
   bool setAnalogOutputDescription(const char *description);
   bool setAnalogOutputResolution(float resolution);
 
+  // Set the min and max values for the analog Input/Output
+  bool setAnalogOutputMinMax(float min, float max);
+  bool setAnalogInputMinMax(float min, float max);
+
   // Use to set a cb function to be called on analog output change
   void onAnalogOutputChange(void (*callback)(float analog)) {
     _on_analog_output_change = callback;
diff --git a/variants/Geekble_ESP32C3/pins_arduino.h b/variants/Geekble_ESP32C3/pins_arduino.h
index 660313ce849..56bda115a7e 100644
--- a/variants/Geekble_ESP32C3/pins_arduino.h
+++ b/variants/Geekble_ESP32C3/pins_arduino.h
@@ -22,6 +22,13 @@ static const uint8_t MOSI = 6;
 static const uint8_t MISO = 5;
 static const uint8_t SCK = 4;
 
+static const uint8_t D5 = 5;
+static const uint8_t D6 = 6;
+static const uint8_t D7 = 7;
+static const uint8_t D8 = 8;
+static const uint8_t D9 = 9;
+static const uint8_t D10 = 10;
+
 static const uint8_t A0 = 0;
 static const uint8_t A1 = 1;
 static const uint8_t A2 = 2;
diff --git a/variants/wifiduino32s3/pins_arduino.h b/variants/wifiduino32s3/pins_arduino.h
index d26e415910e..4fc08139c0e 100644
--- a/variants/wifiduino32s3/pins_arduino.h
+++ b/variants/wifiduino32s3/pins_arduino.h
@@ -2,43 +2,57 @@
 #define Pins_Arduino_h
 
 #include <stdint.h>
-
-#define USB_VID 0x303a
-#define USB_PID 0x1001
-
-// No USER LED or NeoLED
-
-static const uint8_t TX = 45;
+#include "soc/soc_caps.h"
+
+#define USB_VID          0x303a
+#define USB_PID          0x1001
+#define USB_MANUFACTURER "openjumper"
+#define USB_PRODUCT      "Wifiduino32-S3"
+#define USB_SERIAL       ""  // Empty string for MAC address
+
+// Some boards have too low voltage on this pin (board design bug)
+// Use different pin with 3V and connect with 48
+// and change this setup for the chosen pin (for example 38)
+#define PIN_RGB_LED 48
+// BUILTIN_LED can be used in new Arduino API digitalWrite() like in Blink.ino
+static const uint8_t LED_BUILTIN = SOC_GPIO_PIN_COUNT + PIN_RGB_LED;
+#define BUILTIN_LED LED_BUILTIN  // backward compatibility
+#define LED_BUILTIN LED_BUILTIN  // allow testing #ifdef LED_BUILTIN
+// RGB_BUILTIN and RGB_BRIGHTNESS can be used in new Arduino API rgbLedWrite()
+#define RGB_BUILTIN    LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+static const uint8_t TX = 43;
 static const uint8_t RX = 44;
 
 static const uint8_t SDA = 4;
 static const uint8_t SCL = 5;
 
-static const uint8_t SS = 46;
-static const uint8_t MOSI = 3;
-static const uint8_t MISO = 20;
-static const uint8_t SCK = 19;
+static const uint8_t SS = 10;
+static const uint8_t MOSI = 11;
+static const uint8_t MISO = 13;
+static const uint8_t SCK = 12;
 
-static const uint8_t A0 = 7;
-static const uint8_t A1 = 6;
+static const uint8_t A0 = 0;
+static const uint8_t A1 = 1;
 static const uint8_t A2 = 2;
-static const uint8_t A3 = 1;
+static const uint8_t A3 = 3;
 static const uint8_t A4 = 4;
 static const uint8_t A5 = 5;
 
 static const uint8_t D0 = 44;
-static const uint8_t D1 = 45;
-static const uint8_t D2 = 42;
-static const uint8_t D3 = 41;
-static const uint8_t D4 = 0;
-static const uint8_t D5 = 45;
-static const uint8_t D6 = 48;
-static const uint8_t D7 = 47;
+static const uint8_t D1 = 43;
+static const uint8_t D2 = 45;
+static const uint8_t D3 = 46;
+static const uint8_t D4 = 47;
+static const uint8_t D5 = 48;
+static const uint8_t D6 = 18;
+static const uint8_t D7 = 17;
 static const uint8_t D8 = 21;
-static const uint8_t D9 = 14;
-static const uint8_t D10 = 46;
-static const uint8_t D11 = 3;
-static const uint8_t D12 = 20;
-static const uint8_t D13 = 19;
+static const uint8_t D9 = 42;
+static const uint8_t D10 = 41;
+static const uint8_t D11 = 40;
+static const uint8_t D12 = 38;
+static const uint8_t D13 = 39;
 
 #endif /* Pins_Arduino_h */