Merge branch 'master' into board_huidu

.github/workflows/dangerjs.yml

@@ -20,5 +20,8 @@ jobs:
         uses: espressif/shared-github-dangerjs@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          instructions-cla-link: "https://cla-assistant.io/espressif/arduino-esp32"
+          instructions-contributions-file: "docs/en/contributing.rst"
           rule-max-commits: "false"
           commit-messages-min-summary-length: "10"

.github/workflows/upload-idf-component.yml

@@ -4,7 +4,10 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag to push to the component registry'
+        description: 'Version to push to the component registry'
+        required: true
+      git_ref:
+        description: 'Git ref with the source to push to the component registry'
         required: true
   workflow_run:
     workflows: ["ESP32 Arduino Release"]
@@ -44,7 +47,7 @@ jobs:
 
       - uses: actions/checkout@v4
         with:
-          ref: ${{ env.RELEASE_TAG }}
+          ref: ${{ inputs.git_ref || env.RELEASE_TAG }}
           submodules: "recursive"
 
       - name: Upload components to the component registry

CMakeLists.txt

@@ -181,6 +181,7 @@ set(ARDUINO_LIBRARY_Matter_SRCS
   libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp
   libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
+  libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp
   libraries/Matter/src/Matter.cpp)
 
 set(ARDUINO_LIBRARY_PPP_SRCS
@@ -242,7 +243,11 @@ set(ARDUINO_LIBRARY_USB_SRCS
 set(ARDUINO_LIBRARY_WebServer_SRCS
   libraries/WebServer/src/WebServer.cpp
   libraries/WebServer/src/Parsing.cpp
-  libraries/WebServer/src/detail/mimetable.cpp)
+  libraries/WebServer/src/detail/mimetable.cpp
+  libraries/WebServer/src/middleware/MiddlewareChain.cpp
+  libraries/WebServer/src/middleware/AuthenticationMiddleware.cpp
+  libraries/WebServer/src/middleware/CorsMiddleware.cpp
+  libraries/WebServer/src/middleware/LoggingMiddleware.cpp)
 
 set(ARDUINO_LIBRARY_NetworkClientSecure_SRCS
   libraries/NetworkClientSecure/src/ssl_client.cpp

boards.txt

@@ -16900,6 +16900,274 @@ adafruit_qualia_s3_rgb666.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
 adafruit_qualia_s3_rgb666.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
 adafruit_qualia_s3_rgb666.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
 
+##############################################################
+# Adafruit Sparkle Motion w/ESP32
+
+sparklemotion.name=Adafruit Sparkle Motion (ESP32)
+
+sparklemotion.bootloader.tool=esptool_py
+sparklemotion.bootloader.tool.default=esptool_py
+
+sparklemotion.upload.tool=esptool_py
+sparklemotion.upload.tool.default=esptool_py
+sparklemotion.upload.tool.network=esp_ota
+
+sparklemotion.upload.maximum_size=1310720
+sparklemotion.upload.maximum_data_size=327680
+sparklemotion.upload.flags=
+sparklemotion.upload.extra_flags=
+
+sparklemotion.serial.disableDTR=true
+sparklemotion.serial.disableRTS=true
+
+sparklemotion.build.tarch=xtensa
+sparklemotion.build.bootloader_addr=0x1000
+sparklemotion.build.target=esp32
+sparklemotion.build.mcu=esp32
+sparklemotion.build.core=esp32
+sparklemotion.build.variant=adafruit_sparklemotion_esp32
+sparklemotion.build.board=SPARKLEMOTION_ESP32
+
+sparklemotion.build.f_cpu=240000000L
+sparklemotion.build.flash_size=4MB
+sparklemotion.build.flash_freq=80m
+sparklemotion.build.flash_mode=dio
+sparklemotion.build.boot=dio
+sparklemotion.build.partitions=default
+sparklemotion.build.defines=
+sparklemotion.build.loop_core=
+sparklemotion.build.event_core=
+
+sparklemotion.menu.LoopCore.1=Core 1
+sparklemotion.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+sparklemotion.menu.LoopCore.0=Core 0
+sparklemotion.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+sparklemotion.menu.EventsCore.1=Core 1
+sparklemotion.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+sparklemotion.menu.EventsCore.0=Core 0
+sparklemotion.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+sparklemotion.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+sparklemotion.menu.PartitionScheme.default.build.partitions=default
+sparklemotion.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+sparklemotion.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+sparklemotion.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+sparklemotion.menu.PartitionScheme.minimal.build.partitions=minimal
+sparklemotion.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+sparklemotion.menu.PartitionScheme.no_ota.build.partitions=no_ota
+sparklemotion.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+sparklemotion.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+sparklemotion.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+sparklemotion.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+sparklemotion.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+sparklemotion.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+sparklemotion.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+sparklemotion.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+sparklemotion.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+sparklemotion.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+sparklemotion.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+sparklemotion.menu.PartitionScheme.huge_app.build.partitions=huge_app
+sparklemotion.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+sparklemotion.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+sparklemotion.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+sparklemotion.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+sparklemotion.menu.CPUFreq.240=240MHz (WiFi/BT)
+sparklemotion.menu.CPUFreq.240.build.f_cpu=240000000L
+sparklemotion.menu.CPUFreq.160=160MHz (WiFi/BT)
+sparklemotion.menu.CPUFreq.160.build.f_cpu=160000000L
+sparklemotion.menu.CPUFreq.80=80MHz (WiFi/BT)
+sparklemotion.menu.CPUFreq.80.build.f_cpu=80000000L
+sparklemotion.menu.CPUFreq.40=40MHz
+sparklemotion.menu.CPUFreq.40.build.f_cpu=40000000L
+sparklemotion.menu.CPUFreq.20=20MHz
+sparklemotion.menu.CPUFreq.20.build.f_cpu=20000000L
+sparklemotion.menu.CPUFreq.10=10MHz
+sparklemotion.menu.CPUFreq.10.build.f_cpu=10000000L
+
+sparklemotion.menu.FlashFreq.80=80MHz
+sparklemotion.menu.FlashFreq.80.build.flash_freq=80m
+sparklemotion.menu.FlashFreq.40=40MHz
+sparklemotion.menu.FlashFreq.40.build.flash_freq=40m
+
+sparklemotion.menu.FlashSize.4M=4MB (32Mb)
+sparklemotion.menu.FlashSize.4M.build.flash_size=4MB
+
+sparklemotion.menu.UploadSpeed.921600=921600
+sparklemotion.menu.UploadSpeed.921600.upload.speed=921600
+sparklemotion.menu.UploadSpeed.115200=115200
+sparklemotion.menu.UploadSpeed.115200.upload.speed=115200
+sparklemotion.menu.UploadSpeed.256000.windows=256000
+sparklemotion.menu.UploadSpeed.256000.upload.speed=256000
+sparklemotion.menu.UploadSpeed.230400.windows.upload.speed=256000
+sparklemotion.menu.UploadSpeed.230400=230400
+sparklemotion.menu.UploadSpeed.230400.upload.speed=230400
+sparklemotion.menu.UploadSpeed.460800.linux=460800
+sparklemotion.menu.UploadSpeed.460800.macosx=460800
+sparklemotion.menu.UploadSpeed.460800.upload.speed=460800
+sparklemotion.menu.UploadSpeed.512000.windows=512000
+sparklemotion.menu.UploadSpeed.512000.upload.speed=512000
+
+sparklemotion.menu.DebugLevel.none=None
+sparklemotion.menu.DebugLevel.none.build.code_debug=0
+sparklemotion.menu.DebugLevel.error=Error
+sparklemotion.menu.DebugLevel.error.build.code_debug=1
+sparklemotion.menu.DebugLevel.warn=Warn
+sparklemotion.menu.DebugLevel.warn.build.code_debug=2
+sparklemotion.menu.DebugLevel.info=Info
+sparklemotion.menu.DebugLevel.info.build.code_debug=3
+sparklemotion.menu.DebugLevel.debug=Debug
+sparklemotion.menu.DebugLevel.debug.build.code_debug=4
+sparklemotion.menu.DebugLevel.verbose=Verbose
+sparklemotion.menu.DebugLevel.verbose.build.code_debug=5
+
+sparklemotion.menu.EraseFlash.none=Disabled
+sparklemotion.menu.EraseFlash.none.upload.erase_cmd=
+sparklemotion.menu.EraseFlash.all=Enabled
+sparklemotion.menu.EraseFlash.all.upload.erase_cmd=-e
+
+sparklemotion.menu.ZigbeeMode.default=Disabled
+sparklemotion.menu.ZigbeeMode.default.build.zigbee_mode=
+sparklemotion.menu.ZigbeeMode.default.build.zigbee_libs=
+sparklemotion.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
+sparklemotion.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+sparklemotion.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
+
+##############################################################
+# Adafruit Sparkle Motion Mini w/ESP32
+
+sparklemotionmini.name=Adafruit Sparkle Motion Mini (ESP32)
+
+sparklemotionmini.bootloader.tool=esptool_py
+sparklemotionmini.bootloader.tool.default=esptool_py
+
+sparklemotionmini.upload.tool=esptool_py
+sparklemotionmini.upload.tool.default=esptool_py
+sparklemotionmini.upload.tool.network=esp_ota
+
+sparklemotionmini.upload.maximum_size=1310720
+sparklemotionmini.upload.maximum_data_size=327680
+sparklemotionmini.upload.flags=
+sparklemotionmini.upload.extra_flags=
+
+sparklemotionmini.serial.disableDTR=true
+sparklemotionmini.serial.disableRTS=true
+
+sparklemotionmini.build.tarch=xtensa
+sparklemotionmini.build.bootloader_addr=0x1000
+sparklemotionmini.build.target=esp32
+sparklemotionmini.build.mcu=esp32
+sparklemotionmini.build.core=esp32
+sparklemotionmini.build.variant=adafruit_sparklemotionmini_esp32
+sparklemotionmini.build.board=SPARKLEMOTIONMINI_ESP32
+
+sparklemotionmini.build.f_cpu=240000000L
+sparklemotionmini.build.flash_size=4MB
+sparklemotionmini.build.flash_freq=80m
+sparklemotionmini.build.flash_mode=dio
+sparklemotionmini.build.boot=dio
+sparklemotionmini.build.partitions=default
+sparklemotionmini.build.defines=
+sparklemotionmini.build.loop_core=
+sparklemotionmini.build.event_core=
+
+sparklemotionmini.menu.LoopCore.1=Core 1
+sparklemotionmini.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+sparklemotionmini.menu.LoopCore.0=Core 0
+sparklemotionmini.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+sparklemotionmini.menu.EventsCore.1=Core 1
+sparklemotionmini.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+sparklemotionmini.menu.EventsCore.0=Core 0
+sparklemotionmini.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+sparklemotionmini.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+sparklemotionmini.menu.PartitionScheme.default.build.partitions=default
+sparklemotionmini.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+sparklemotionmini.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+sparklemotionmini.menu.PartitionScheme.minimal=Minimal (1.3MB APP/700KB SPIFFS)
+sparklemotionmini.menu.PartitionScheme.minimal.build.partitions=minimal
+sparklemotionmini.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+sparklemotionmini.menu.PartitionScheme.no_ota.build.partitions=no_ota
+sparklemotionmini.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+sparklemotionmini.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+sparklemotionmini.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+sparklemotionmini.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+sparklemotionmini.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+sparklemotionmini.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+sparklemotionmini.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+sparklemotionmini.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+sparklemotionmini.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+sparklemotionmini.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+sparklemotionmini.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+sparklemotionmini.menu.PartitionScheme.huge_app.build.partitions=huge_app
+sparklemotionmini.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+sparklemotionmini.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+sparklemotionmini.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+sparklemotionmini.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+
+sparklemotionmini.menu.CPUFreq.240=240MHz (WiFi/BT)
+sparklemotionmini.menu.CPUFreq.240.build.f_cpu=240000000L
+sparklemotionmini.menu.CPUFreq.160=160MHz (WiFi/BT)
+sparklemotionmini.menu.CPUFreq.160.build.f_cpu=160000000L
+sparklemotionmini.menu.CPUFreq.80=80MHz (WiFi/BT)
+sparklemotionmini.menu.CPUFreq.80.build.f_cpu=80000000L
+sparklemotionmini.menu.CPUFreq.40=40MHz
+sparklemotionmini.menu.CPUFreq.40.build.f_cpu=40000000L
+sparklemotionmini.menu.CPUFreq.20=20MHz
+sparklemotionmini.menu.CPUFreq.20.build.f_cpu=20000000L
+sparklemotionmini.menu.CPUFreq.10=10MHz
+sparklemotionmini.menu.CPUFreq.10.build.f_cpu=10000000L
+
+sparklemotionmini.menu.FlashFreq.80=80MHz
+sparklemotionmini.menu.FlashFreq.80.build.flash_freq=80m
+sparklemotionmini.menu.FlashFreq.40=40MHz
+sparklemotionmini.menu.FlashFreq.40.build.flash_freq=40m
+
+sparklemotionmini.menu.FlashSize.4M=4MB (32Mb)
+sparklemotionmini.menu.FlashSize.4M.build.flash_size=4MB
+
+sparklemotionmini.menu.UploadSpeed.921600=921600
+sparklemotionmini.menu.UploadSpeed.921600.upload.speed=921600
+sparklemotionmini.menu.UploadSpeed.115200=115200
+sparklemotionmini.menu.UploadSpeed.115200.upload.speed=115200
+sparklemotionmini.menu.UploadSpeed.256000.windows=256000
+sparklemotionmini.menu.UploadSpeed.256000.upload.speed=256000
+sparklemotionmini.menu.UploadSpeed.230400.windows.upload.speed=256000
+sparklemotionmini.menu.UploadSpeed.230400=230400
+sparklemotionmini.menu.UploadSpeed.230400.upload.speed=230400
+sparklemotionmini.menu.UploadSpeed.460800.linux=460800
+sparklemotionmini.menu.UploadSpeed.460800.macosx=460800
+sparklemotionmini.menu.UploadSpeed.460800.upload.speed=460800
+sparklemotionmini.menu.UploadSpeed.512000.windows=512000
+sparklemotionmini.menu.UploadSpeed.512000.upload.speed=512000
+
+sparklemotionmini.menu.DebugLevel.none=None
+sparklemotionmini.menu.DebugLevel.none.build.code_debug=0
+sparklemotionmini.menu.DebugLevel.error=Error
+sparklemotionmini.menu.DebugLevel.error.build.code_debug=1
+sparklemotionmini.menu.DebugLevel.warn=Warn
+sparklemotionmini.menu.DebugLevel.warn.build.code_debug=2
+sparklemotionmini.menu.DebugLevel.info=Info
+sparklemotionmini.menu.DebugLevel.info.build.code_debug=3
+sparklemotionmini.menu.DebugLevel.debug=Debug
+sparklemotionmini.menu.DebugLevel.debug.build.code_debug=4
+sparklemotionmini.menu.DebugLevel.verbose=Verbose
+sparklemotionmini.menu.DebugLevel.verbose.build.code_debug=5
+
+sparklemotionmini.menu.EraseFlash.none=Disabled
+sparklemotionmini.menu.EraseFlash.none.upload.erase_cmd=
+sparklemotionmini.menu.EraseFlash.all=Enabled
+sparklemotionmini.menu.EraseFlash.all.upload.erase_cmd=-e
+
+sparklemotionmini.menu.ZigbeeMode.default=Disabled
+sparklemotionmini.menu.ZigbeeMode.default.build.zigbee_mode=
+sparklemotionmini.menu.ZigbeeMode.default.build.zigbee_libs=
+sparklemotionmini.menu.ZigbeeMode.zczr=Zigbee ZCZR (coordinator/router)
+sparklemotionmini.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
+sparklemotionmini.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
+
 ##############################################################
 
 nodemcu-32s.name=NodeMCU-32S

cores/esp32/Client.h

@@ -26,9 +26,7 @@
 class Client : public Stream {
 public:
   virtual int connect(IPAddress ip, uint16_t port) = 0;
-  virtual int connect(IPAddress ip, uint16_t port, int32_t timeout) = 0;
   virtual int connect(const char *host, uint16_t port) = 0;
-  virtual int connect(const char *host, uint16_t port, int32_t timeout) = 0;
   virtual size_t write(uint8_t) = 0;
   virtual size_t write(const uint8_t *buf, size_t size) = 0;
   virtual int available() = 0;

docs/en/index.rst

@@ -16,6 +16,7 @@ Here you will find all the relevant information about the project.
    Guides <guides/guides>
    Tutorials <tutorials/tutorials>
    Advanced Utilities <advanced_utils>
+   Third Party Tools <third_party_tools>
    Migration Guides <migration_guides/migration_guides>
    FAQ <faq>
    Troubleshooting <troubleshooting>

docs/en/third_party/pioarduino.rst

@@ -0,0 +1,14 @@
+#######################################################
+pioarduino - (p)eople (i)nitiated (o)ptimized (arduino)
+#######################################################
+
+.. warning::
+  This tool is **not maintained by the ESP32 Arduino Core team**, so we cannot provide support or guarantee that it will work as expected.
+
+.. note::
+  This is a work in progress documentation and we will appreciate your help! We are looking for contributors!
+
+About
+-----
+
+For more information, please refer to the `official documentation <https://github.com/pioarduino/platform-espressif32>`_.