Merge branch 'master' into release/v3.3.x

Author: me-no-dev

.github/workflows/dangerjs.yml

@@ -24,4 +24,5 @@ jobs:
           instructions-cla-link: "https://cla-assistant.io/espressif/arduino-esp32"
           instructions-contributions-file: "docs/en/contributing.rst"
           rule-max-commits: "false"
+          rule-target-branch: "false"
           commit-messages-min-summary-length: "10"

CMakeLists.txt

@@ -306,6 +306,7 @@ set(ARDUINO_LIBRARY_Zigbee_SRCS
   libraries/Zigbee/src/ep/ZigbeeElectricalMeasurement.cpp
   libraries/Zigbee/src/ep/ZigbeeBinary.cpp
   libraries/Zigbee/src/ep/ZigbeePowerOutlet.cpp
+  libraries/Zigbee/src/ep/ZigbeeFanControl.cpp
   )
 
 set(ARDUINO_LIBRARY_BLE_SRCS

boards.txt

@@ -51016,10 +51016,12 @@ rakwireless_rak3112.build.dfu_on_boot=0
 rakwireless_rak3112.build.f_cpu=240000000L
 rakwireless_rak3112.build.flash_size=16MB
 rakwireless_rak3112.build.flash_freq=80m
-rakwireless_rak3112.build.flash_mode=dio
-rakwireless_rak3112.build.boot=dio
+rakwireless_rak3112.build.flash_mode=qio
+rakwireless_rak3112.build.boot=qio
 rakwireless_rak3112.build.partitions=default
 rakwireless_rak3112.build.defines=
+rakwireless_rak3112.build.psram_type=opi
+rakwireless_rak3112.build.memory_type={build.boot}_{build.psram_type}
 
 rakwireless_rak3112.menu.PSRAM.enabled=Enabled
 rakwireless_rak3112.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM

cores/esp32/esp32-hal-i2c-ng.c

@@ -56,6 +56,13 @@ static bool i2cDetachBus(void *bus_i2c_num) {
   return true;
 }
 
+void *i2cBusHandle(uint8_t i2c_num) {
+  if (i2c_num >= SOC_I2C_NUM) {
+    return NULL;
+  }
+  return bus[i2c_num].bus_handle;
+}
+
 bool i2cIsInit(uint8_t i2c_num) {
   if (i2c_num >= SOC_I2C_NUM) {
     return false;

cores/esp32/esp32-hal-i2c.h

@@ -19,6 +19,7 @@
 
 #include "soc/soc_caps.h"
 #if SOC_I2C_SUPPORTED
+#include "esp_idf_version.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -39,6 +40,10 @@ esp_err_t i2cWriteReadNonStop(
 );
 bool i2cIsInit(uint8_t i2c_num);
 
+#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 4, 0)
+void *i2cBusHandle(uint8_t i2c_num);
+#endif
+
 #ifdef __cplusplus
 }
 #endif

libraries/AsyncUDP/src/AsyncUDP.cpp

@@ -582,8 +582,8 @@ bool AsyncUDP::listen(const ip_addr_t *addr, uint16_t port) {
   }
   close();
   if (addr) {
-    IP_SET_TYPE_VAL(_pcb->local_ip, addr->type);
-    IP_SET_TYPE_VAL(_pcb->remote_ip, addr->type);
+    IP_SET_TYPE_VAL(_pcb->local_ip, IP_GET_TYPE(addr));
+    IP_SET_TYPE_VAL(_pcb->remote_ip, IP_GET_TYPE(addr));
   }
   if (_udp_bind(_pcb, addr, port) != ERR_OK) {
     return false;
@@ -692,17 +692,8 @@ bool AsyncUDP::listenMulticast(const ip_addr_t *addr, uint16_t port, uint8_t ttl
     return false;
   }
 
-#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
+  IP_SET_TYPE(&bind_addr, IP_GET_TYPE(addr));
+  ip_addr_set_any(IP_IS_V6(addr), &bind_addr);
   if (!listen(&bind_addr, port)) {
     return false;
   }

libraries/Wire/src/Wire.cpp

@@ -39,7 +39,7 @@ extern "C" {
 #include "Arduino.h"
 
 TwoWire::TwoWire(uint8_t bus_num)
-  : num(bus_num & 1), sda(-1), scl(-1), bufferSize(I2C_BUFFER_LENGTH)  // default Wire Buffer Size
+  : num(bus_num), sda(-1), scl(-1), bufferSize(I2C_BUFFER_LENGTH)  // default Wire Buffer Size
     ,
     rxBuffer(NULL), rxIndex(0), rxLength(0), txBuffer(NULL), txLength(0), txAddress(0), _timeOutMillis(50), nonStop(false)
 #if !CONFIG_DISABLE_HAL_LOCKS
@@ -62,6 +62,10 @@ TwoWire::~TwoWire() {
 #endif
 }
 
+uint8_t TwoWire::getBusNum() {
+  return num;
+}
+
 bool TwoWire::initPins(int sdaPin, int sclPin) {
   if (sdaPin < 0) {  // default param passed
     if (num == 0) {

libraries/Wire/src/Wire.h

@@ -105,6 +105,8 @@ class TwoWire : public HardwareI2C {
 
   bool end() override;
 
+  uint8_t getBusNum();
+
   bool setClock(uint32_t freq) override;
 
   void beginTransmission(uint8_t address) override;

libraries/Zigbee/examples/Zigbee_Fan_Control/README.md

@@ -0,0 +1,83 @@
+# Arduino-ESP32 Zigbee Fan Control Example
+
+This example demonstrates how to use the Zigbee library to create a router device fan control and use it as a Home Automation (HA) fan control device.
+
+# Supported Targets
+
+Currently, this example supports the following targets.
+
+| Supported Targets | ESP32-C6 | ESP32-H2 |
+| ----------------- | -------- | -------- |
+
+## Fan Control Functions
+
+1. Initialize a Zigbee fan control device.
+2. Control fan modes (OFF, LOW, MEDIUM, HIGH, ON).
+3. Respond to fan control commands from the Zigbee network.
+
+## Hardware Required
+
+* ESP32-H2 or ESP32-C6 development board
+* A USB cable for power supply and programming
+* RGB LED for visual feedback (built-in on most development boards)
+
+### Configure the Project
+
+In this example the RGB LED is used to indicate the current fan control mode.
+The LED colors represent different fan modes:
+- OFF: No light
+- LOW: Blue
+- MEDIUM: Yellow  
+- HIGH: Red
+- ON: White
+
+Set the button GPIO by changing the `button` variable. By default, it's the pin `BOOT_PIN` (BOOT button on ESP32-C6 and ESP32-H2).
+
+#### Using Arduino IDE
+
+To get more information about the Espressif boards see [Espressif Development Kits](https://www.espressif.com/en/products/devkits).
+
+* Before Compile/Verify, select the correct board: `Tools -> Board`.
+* Select the End device Zigbee mode: `Tools -> Zigbee mode: Zigbee ZCZR (coordinator/router)`
+* Select Partition Scheme for Zigbee: `Tools -> Partition Scheme: Zigbee ZCZR 4MB with spiffs`
+* Select the COM port: `Tools -> Port: xxx` where the `xxx` is the detected COM port.
+* Optional: Set debug level to verbose to see all logs from Zigbee stack: `Tools -> Core Debug Level: Verbose`.
+
+## Troubleshooting
+
+If the End device flashed with this example is not connecting to the coordinator, erase the flash of the End device before flashing the example to the board. It is recommended to do this if you re-flash the coordinator.
+You can do the following:
+
+* In the Arduino IDE go to the Tools menu and set `Erase All Flash Before Sketch Upload` to `Enabled`.
+* Add to the sketch `Zigbee.factoryReset();` to reset the device and Zigbee stack.
+
+By default, the coordinator network is closed after rebooting or flashing new firmware.
+To open the network you have 2 options:
+
+* Open network after reboot by setting `Zigbee.setRebootOpenNetwork(time);` before calling `Zigbee.begin();`.
+* In application you can anytime call `Zigbee.openNetwork(time);` to open the network for devices to join.
+
+
+***Important: Make sure you are using a good quality USB cable and that you have a reliable power source***
+
+* **LED not blinking:** Check the wiring connection and the IO selection.
+* **Programming Fail:** If the programming/flash procedure fails, try reducing the serial connection speed.
+* **COM port not detected:** Check the USB cable and the USB to Serial driver installation.
+
+If the error persists, you can ask for help at the official [ESP32 forum](https://esp32.com) or see [Contribute](#contribute).
+
+## Contribute
+
+To know how to contribute to this project, see [How to contribute.](https://github.com/espressif/arduino-esp32/blob/master/CONTRIBUTING.rst)
+
+If you have any **feedback** or **issue** to report on this example/library, please open an issue or fix it by creating a new PR. Contributions are more than welcome!
+
+Before creating a new issue, be sure to try Troubleshooting and check if the same issue was already created by someone else.
+
+## Resources
+
+* Official ESP32 Forum: [Link](https://esp32.com)
+* Arduino-ESP32 Official Repository: [espressif/arduino-esp32](https://github.com/espressif/arduino-esp32)
+* ESP32-C6 Datasheet: [Link to datasheet](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf)
+* ESP32-H2 Datasheet: [Link to datasheet](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf)
+* Official ESP-IDF documentation: [ESP-IDF](https://idf.espressif.com)

libraries/Zigbee/examples/Zigbee_Fan_Control/Zigbee_Fan_Control.ino

@@ -0,0 +1,129 @@
+// 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.
+// 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.
+
+/**
+ * @brief This example demonstrates simple Zigbee fan control.
+ *
+ * The example demonstrates how to use Zigbee library to create a router device fan control.
+ * The fan control is a Zigbee router device, which is controlled by a Zigbee coordinator.
+ *
+ * Proper Zigbee mode must be selected in Tools->Zigbee mode
+ * and also the correct partition scheme must be selected in Tools->Partition Scheme.
+ *
+ * Please check the README.md for instructions and more detailed description.
+ *
+ * Created by Jan Procházka (https://github.com/P-R-O-C-H-Y/)
+ */
+
+#ifndef ZIGBEE_MODE_ZCZR
+#error "Zigbee coordinator mode is not selected in Tools->Zigbee mode"
+#endif
+
+#include "Zigbee.h"
+
+/* Zigbee light bulb configuration */
+#define ZIGBEE_FAN_CONTROL_ENDPOINT 1
+
+#ifdef RGB_BUILTIN
+uint8_t led = RGB_BUILTIN;  // To demonstrate the current fan control mode
+#else
+uint8_t led = 2;
+#endif
+
+uint8_t button = BOOT_PIN;
+
+ZigbeeFanControl zbFanControl = ZigbeeFanControl(ZIGBEE_FAN_CONTROL_ENDPOINT);
+
+/********************* fan control callback function **************************/
+void setFan(ZigbeeFanMode mode) {
+  switch (mode) {
+    case FAN_MODE_OFF:
+      rgbLedWrite(led, 0, 0, 0);  // Off
+      Serial.println("Fan mode: OFF");
+      break;
+    case FAN_MODE_LOW:
+      rgbLedWrite(led, 0, 0, 255);  // Blue
+      Serial.println("Fan mode: LOW");
+      break;
+    case FAN_MODE_MEDIUM:
+      rgbLedWrite(led, 255, 255, 0);  // Yellow
+      Serial.println("Fan mode: MEDIUM");
+      break;
+    case FAN_MODE_HIGH:
+      rgbLedWrite(led, 255, 0, 0);  // Red
+      Serial.println("Fan mode: HIGH");
+      break;
+    case FAN_MODE_ON:
+      rgbLedWrite(led, 255, 255, 255);  // White
+      Serial.println("Fan mode: ON");
+      break;
+    default: log_e("Unhandled fan mode: %d", mode); break;
+  }
+}
+
+/********************* Arduino functions **************************/
+void setup() {
+  Serial.begin(115200);
+
+  // Init LED that will be used to indicate the current fan control mode
+  rgbLedWrite(led, 0, 0, 0);
+
+  // Init button for factory reset
+  pinMode(button, INPUT_PULLUP);
+
+  //Optional: set Zigbee device name and model
+  zbFanControl.setManufacturerAndModel("Espressif", "ZBFanControl");
+
+  // Set the fan mode sequence to LOW_MED_HIGH
+  zbFanControl.setFanModeSequence(FAN_MODE_SEQUENCE_LOW_MED_HIGH);
+
+  // Set callback function for fan mode change
+  zbFanControl.onFanModeChange(setFan);
+
+  //Add endpoint to Zigbee Core
+  Serial.println("Adding ZigbeeFanControl endpoint to Zigbee Core");
+  Zigbee.addEndpoint(&zbFanControl);
+
+  // When all EPs are registered, start Zigbee in ROUTER mode
+  if (!Zigbee.begin(ZIGBEE_ROUTER)) {
+    Serial.println("Zigbee failed to start!");
+    Serial.println("Rebooting...");
+    ESP.restart();
+  }
+  Serial.println("Connecting to network");
+  while (!Zigbee.connected()) {
+    Serial.print(".");
+    delay(100);
+  }
+  Serial.println();
+}
+
+void loop() {
+  // Checking button for factory reset
+  if (digitalRead(button) == LOW) {  // Push button pressed
+    // Key debounce handling
+    delay(100);
+    int startTime = millis();
+    while (digitalRead(button) == LOW) {
+      delay(50);
+      if ((millis() - startTime) > 3000) {
+        // If key pressed for more than 3secs, factory reset Zigbee and reboot
+        Serial.println("Resetting Zigbee to factory and rebooting in 1s.");
+        delay(1000);
+        Zigbee.factoryReset();
+      }
+    }
+  }
+  delay(100);
+}

libraries/Zigbee/examples/Zigbee_Fan_Control/ci.json

@@ -0,0 +1,6 @@
+{
+  "fqbn_append": "PartitionScheme=zigbee_zczr,ZigbeeMode=zczr",
+  "requires": [
+    "CONFIG_ZB_ENABLED=y"
+  ]
+}