Merge branch 'master' into DNSServer-EDNS

Author: Kolkman

.github/CODEOWNERS

@@ -0,0 +1,79 @@
+# CODEOWNERS for ESP32 Arduino Core
+
+# This file is used to specify the code owners for the ESP32 Arduino Core.
+# Read more about CODEOWNERS:
+# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+# Note that order matters. The last matching pattern will be used.
+
+# The default owners are the active developers of the ESP32 Arduino Core.
+# Refrain from using @espressif/arduino-esp32 to avoid spamming non-developers with review requests.
+* @espressif/arduino-devs
+
+# CI
+/.github/ @lucasssvaz @me-no-dev @P-R-O-C-H-Y
+/tests/ @lucasssvaz @P-R-O-C-H-Y
+
+# Tools
+/tools/ @me-no-dev
+/tools/pre-commit/ @lucasssvaz
+/tools/add_lib.sh @P-R-O-C-H-Y
+
+# Pre-commit
+/.* @lucasssvaz # Files in root directory that start with a dot.
+
+# Git Files
+/.gitignore @espressif/arduino-devs
+/.gitmodules @espressif/arduino-devs
+
+# Documentation
+/docs/ @pedrominatel
+/.github/ISSUE_TEMPLATE/ @pedrominatel
+/.github/PULL_REQUEST_TEMPLATE.md @pedrominatel
+/.readthedocs.yaml @pedrominatel
+/*.md @pedrominatel
+
+# Boards
+/variants/ @P-R-O-C-H-Y
+/boards.txt @P-R-O-C-H-Y
+
+# Arduino as Component
+/idf_component_examples/ @SuGlider
+/idf_component.yml @SuGlider @me-no-dev
+/CMakeLists.txt @SuGlider @me-no-dev
+/Kconfig.projbuild @SuGlider @me-no-dev
+
+# Build System
+/package.json @me-no-dev
+/platform.txt @me-no-dev
+/programmers.txt @me-no-dev
+/package/ @me-no-dev
+
+# Libraries
+/libraries/ArduinoOTA/ @me-no-dev
+/libraries/AsyncUDP/ @me-no-dev
+/libraries/BLE/ @lucasssvaz @SuGlider
+/libraries/ESP_I2S/ @me-no-dev
+/libraries/ESP_NOW/ @P-R-O-C-H-Y @lucasssvaz
+/libraries/ESP_SR/ @me-no-dev
+/libraries/ESPmDNS/ @me-no-dev
+/libraries/Ethernet/ @me-no-dev
+/libraries/Matter/ @SuGlider
+/libraries/NetBIOS/ @me-no-dev
+/libraries/Network/ @me-no-dev
+/libraries/OpenThread/ @SuGlider
+/libraries/PPP/ @me-no-dev
+/libraries/SPI/ @me-no-dev
+/libraries/Update/ @me-no-dev
+/libraries/USB/ @SuGlider @me-no-dev
+/libraries/WiFi/ @me-no-dev
+/libraries/WiFiProv/ @me-no-dev
+/libraries/Wire/ @me-no-dev
+/libraries/Zigbee/ @P-R-O-C-H-Y
+
+# CI JSON
+# Keep this after other libraries and tests to avoid being overridden.
+**/ci.json @lucasssvaz
+
+# The CODEOWNERS file should be owned by the developers of the ESP32 Arduino Core.
+# Leave this entry as the last one to avoid being overridden.
+/.github/CODEOWNERS @espressif/arduino-devs

boards.txt

@@ -41778,6 +41778,13 @@ Geekble_Nano_ESP32S3.menu.PartitionScheme.custom=Custom
 Geekble_Nano_ESP32S3.menu.PartitionScheme.custom.build.partitions=
 Geekble_Nano_ESP32S3.menu.PartitionScheme.custom.upload.maximum_size=16777216
 
+Geekble_Nano_ESP32S3.menu.PSRAM.disabled=Disabled
+Geekble_Nano_ESP32S3.menu.PSRAM.disabled.build.defines=
+Geekble_Nano_ESP32S3.menu.PSRAM.disabled.build.psram_type=qspi
+Geekble_Nano_ESP32S3.menu.PSRAM.enabled=Enabled
+Geekble_Nano_ESP32S3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+Geekble_Nano_ESP32S3.menu.PSRAM.enabled.build.psram_type=qspi
+
 Geekble_Nano_ESP32S3.menu.DebugLevel.none=None
 Geekble_Nano_ESP32S3.menu.DebugLevel.none.build.code_debug=0
 Geekble_Nano_ESP32S3.menu.DebugLevel.error=Error

cores/esp32/esp32-hal-bt.c

@@ -15,7 +15,7 @@
 #include "esp32-hal-bt.h"
 
 #if SOC_BT_SUPPORTED
-#ifdef CONFIG_BT_BLUEDROID_ENABLED
+#if defined(CONFIG_BT_BLUEDROID_ENABLED) && __has_include("esp_bt.h")
 
 #if CONFIG_IDF_TARGET_ESP32
 bool btInUse() {

idf_component.yml

@@ -68,6 +68,8 @@ dependencies:
   # RainMaker Start (Fixed versions, because Matter supports only Insights 1.0.1)
   espressif/network_provisioning:
     version: "1.0.2"
+    rules:
+      - if: "target != esp32c2"
   espressif/esp_rainmaker:
     version: "1.5.2"
     rules:

libraries/DNSServer/examples/CaptivePortal/CaptivePortal.ino

@@ -34,8 +34,9 @@ void handleNotFound() {
 
 void setup() {
   Serial.begin(115200);
-  WiFi.mode(WIFI_AP);
-  WiFi.softAP("ESP32-DNSServer");
+  WiFi.AP.begin();
+  WiFi.AP.create("ESP32-DNSServer");
+  WiFi.AP.enableDhcpCaptivePortal();
 
   // by default DNSServer is started serving any "*" domain name. It will reply
   // AccessPoint's IP to all DNS request (this is required for Captive Portal detection)

libraries/HTTPUpdate/src/HTTPUpdate.cpp

@@ -356,6 +356,7 @@ HTTPUpdateResult HTTPUpdate::handleUpdate(HTTPClient &http, const String &curren
         log_e("Content-Length was 0 or wasn't set by Server?!\n");
       }
       break;
+    case HTTP_CODE_NO_CONTENT:
     case HTTP_CODE_NOT_MODIFIED:
       ///< Not Modified (No updates)
       ret = HTTP_UPDATE_NO_UPDATES;

libraries/WiFi/src/AP.cpp

@@ -305,6 +305,45 @@ bool APClass::enableNAPT(bool enable) {
   return true;
 }
 
+bool APClass::enableDhcpCaptivePortal() {
+  esp_err_t err = ESP_OK;
+  static char captiveportal_uri[32] = {
+    0,
+  };
+
+  if (!started()) {
+    log_e("AP must be first started to enable DHCP Captive Portal");
+    return false;
+  }
+
+  // Create Captive Portal URL: http://192.168.0.4
+  strcpy(captiveportal_uri, "http://");
+  strcat(captiveportal_uri, String(localIP()).c_str());
+
+  // Stop DHCPS
+  err = esp_netif_dhcps_stop(_esp_netif);
+  if (err && err != ESP_ERR_ESP_NETIF_DHCP_ALREADY_STOPPED) {
+    log_e("DHCPS Stop Failed! 0x%04x: %s", err, esp_err_to_name(err));
+    return false;
+  }
+
+  // Enable DHCP Captive Portal
+  err = esp_netif_dhcps_option(_esp_netif, ESP_NETIF_OP_SET, ESP_NETIF_CAPTIVEPORTAL_URI, captiveportal_uri, strlen(captiveportal_uri));
+  if (err) {
+    log_e("Could not set enable DHCP Captive Portal! 0x%x: %s", err, esp_err_to_name(err));
+    return false;
+  }
+
+  // Start DHCPS
+  err = esp_netif_dhcps_start(_esp_netif);
+  if (err) {
+    log_e("DHCPS Start Failed! 0x%04x: %s", err, esp_err_to_name(err));
+    return false;
+  }
+
+  return true;
+}
+
 String APClass::SSID(void) const {
   if (!started()) {
     return String();

libraries/WiFi/src/WiFiAP.h

@@ -53,6 +53,7 @@ class APClass : public NetworkInterface {
 
   bool bandwidth(wifi_bandwidth_t bandwidth);
   bool enableNAPT(bool enable = true);
+  bool enableDhcpCaptivePortal();
 
   String SSID(void) const;
   uint8_t stationCount();

libraries/Zigbee/examples/Zigbee_Analog_Input_Output/Zigbee_Analog_Input_Output.ino

@@ -26,8 +26,8 @@
  * Modified by Pat Clay
  */
 
-#ifndef ZIGBEE_MODE_ED
-#error "Zigbee end device mode is not selected in Tools->Zigbee mode"
+#ifndef ZIGBEE_MODE_ZCZR
+#error "Zigbee coordinator/router device mode is not selected in Tools->Zigbee mode"
 #endif
 
 #include "Zigbee.h"
@@ -70,6 +70,7 @@ void setup() {
   zbAnalogDevice.addAnalogOutput();
   zbAnalogDevice.setAnalogOutputApplication(ESP_ZB_ZCL_AI_RPM_OTHER);
   zbAnalogDevice.setAnalogOutputDescription("Fan Speed (RPM)");
+  zbAnalogDevice.setAnalogOutputResolution(1);
 
   // If analog output cluster is added, set callback function for analog output change
   zbAnalogDevice.onAnalogOutputChange(onAnalogOutputChange);
@@ -99,8 +100,8 @@ void setup() {
   Zigbee.addEndpoint(&zbAnalogPercent);
 
   Serial.println("Starting Zigbee...");
-  // When all EPs are registered, start Zigbee in End Device mode
-  if (!Zigbee.begin()) {
+  // When all EPs are registered, start Zigbee in Router Device mode
+  if (!Zigbee.begin(ZIGBEE_ROUTER)) {
     Serial.println("Zigbee failed to start!");
     Serial.println("Rebooting...");
     ESP.restart();
@@ -151,6 +152,9 @@ void loop() {
         Zigbee.factoryReset();
       }
     }
+    // For demonstration purposes, increment the analog output value by 100
+    zbAnalogDevice.setAnalogOutput(zbAnalogDevice.getAnalogOutput() + 100);
+    zbAnalogDevice.reportAnalogOutput();
   }
   delay(100);
 }

libraries/Zigbee/examples/Zigbee_Analog_Input_Output/ci.json

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

libraries/Zigbee/examples/Zigbee_Thermostat/Zigbee_Thermostat.ino

@@ -34,7 +34,8 @@
 #include "Zigbee.h"
 
 /* Zigbee thermostat configuration */
-#define THERMOSTAT_ENDPOINT_NUMBER 5
+#define THERMOSTAT_ENDPOINT_NUMBER   1
+#define USE_RECEIVE_TEMP_WITH_SOURCE 1
 uint8_t button = BOOT_PIN;
 
 ZigbeeThermostat zbThermostat = ZigbeeThermostat(THERMOSTAT_ENDPOINT_NUMBER);
@@ -48,13 +49,28 @@ float sensor_tolerance;
 struct tm timeinfo = {};  // Time structure for Time cluster
 
 /****************** Temperature sensor handling *******************/
-void recieveSensorTemp(float temperature) {
+#if USE_RECEIVE_TEMP_WITH_SOURCE == 0
+void receiveSensorTemp(float temperature) {
   Serial.printf("Temperature sensor value: %.2f°C\n", temperature);
   sensor_temp = temperature;
 }
+#else
+void receiveSensorTempWithSource(float temperature, uint8_t src_endpoint, esp_zb_zcl_addr_t src_address) {
+  if (src_address.addr_type == ESP_ZB_ZCL_ADDR_TYPE_SHORT) {
+    Serial.printf("Temperature sensor value: %.2f°C from endpoint %d, address 0x%04x\n", temperature, src_endpoint, src_address.u.short_addr);
+  } else {
+    Serial.printf(
+      "Temperature sensor value: %.2f°C from endpoint %d, address %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", temperature, src_endpoint,
+      src_address.u.ieee_addr[7], src_address.u.ieee_addr[6], src_address.u.ieee_addr[5], src_address.u.ieee_addr[4], src_address.u.ieee_addr[3],
+      src_address.u.ieee_addr[2], src_address.u.ieee_addr[1], src_address.u.ieee_addr[0]
+    );
+  }
+  sensor_temp = temperature;
+}
+#endif
 
-void recieveSensorConfig(float min_temp, float max_temp, float tolerance) {
-  Serial.printf("Temperature sensor settings: min %.2f°C, max %.2f°C, tolerance %.2f°C\n", min_temp, max_temp, tolerance);
+void receiveSensorConfig(float min_temp, float max_temp, float tolerance) {
+  Serial.printf("Temperature sensor config: min %.2f°C, max %.2f°C, tolerance %.2f°C\n", min_temp, max_temp, tolerance);
   sensor_min_temp = min_temp;
   sensor_max_temp = max_temp;
   sensor_tolerance = tolerance;
@@ -66,9 +82,15 @@ void setup() {
   // Init button switch
   pinMode(button, INPUT_PULLUP);
 
-  // Set callback functions for temperature and configuration receive
-  zbThermostat.onTempRecieve(recieveSensorTemp);
-  zbThermostat.onConfigRecieve(recieveSensorConfig);
+// Set callback function for receiving temperature from sensor - Use only one option
+#if USE_RECEIVE_TEMP_WITH_SOURCE == 0
+  zbThermostat.onTempReceive(receiveSensorTemp);  // If you bound only one sensor or you don't need to know the source of the temperature
+#else
+  zbThermostat.onTempReceiveWithSource(receiveSensorTempWithSource);
+#endif
+
+  // Set callback function for receiving sensor configuration
+  zbThermostat.onConfigReceive(receiveSensorConfig);
 
   //Optional: set Zigbee device name and model
   zbThermostat.setManufacturerAndModel("Espressif", "ZigbeeThermostat");
@@ -107,19 +129,30 @@ void setup() {
 
   Serial.println();
 
-  // Get temperature sensor configuration
-  zbThermostat.getSensorSettings();
+  // Get temperature sensor configuration for all bound sensors by endpoint number and address
+  std::list<zb_device_params_t *> boundSensors = zbThermostat.getBoundDevices();
+  for (const auto &device : boundSensors) {
+    Serial.println("--------------------------------");
+    if (device->short_addr == 0x0000 || device->short_addr == 0xFFFF) {  //End devices never have 0x0000 short address or 0xFFFF group address
+      Serial.printf(
+        "Device on endpoint %d, IEEE Address: %02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\r\n", device->endpoint, device->ieee_addr[7], device->ieee_addr[6],
+        device->ieee_addr[5], device->ieee_addr[4], device->ieee_addr[3], device->ieee_addr[2], device->ieee_addr[1], device->ieee_addr[0]
+      );
+      zbThermostat.getSensorSettings(device->endpoint, device->ieee_addr);
+    } else {
+      Serial.printf("Device on endpoint %d, short address: 0x%x\r\n", device->endpoint, device->short_addr);
+      zbThermostat.getSensorSettings(device->endpoint, device->short_addr);
+    }
+  }
 }
 
 void loop() {
   // Handle button switch in loop()
   if (digitalRead(button) == LOW) {  // Push button pressed
-
     // Key debounce handling
     while (digitalRead(button) == LOW) {
       delay(50);
     }
-
     // Set reporting interval for temperature sensor
     zbThermostat.setTemperatureReporting(0, 10, 2);
   }
@@ -130,5 +163,6 @@ void loop() {
     last_print = millis();
     int temp_percent = (int)((sensor_temp - sensor_min_temp) / (sensor_max_temp - sensor_min_temp) * 100);
     Serial.printf("Loop temperature info: %.2f°C (%d %%)\n", sensor_temp, temp_percent);
+    zbThermostat.printBoundDevices(Serial);
   }
 }

libraries/Zigbee/keywords.txt

@@ -107,6 +107,7 @@ setLightColor	KEYWORD2
 # ZigbeeThermostat
 onTempRecieve	KEYWORD2
 onConfigRecieve	KEYWORD2
+onTempReceiveWithSource	KEYWORD2
 getTemperature	KEYWORD2
 getSensorSettings	KEYWORD2
 setTemperatureReporting	KEYWORD2
@@ -142,14 +143,21 @@ setSensorType	KEYWORD2
 setCarbonDioxide	KEYWORD2
 
 # ZigbeeAnalog
-addAnalogValue	KEYWORD2
 addAnalogInput	KEYWORD2
 addAnalogOutput	KEYWORD2
 onAnalogOutputChange	KEYWORD2
-setAnalogValue	KEYWORD2
 setAnalogInput	KEYWORD2
+setAnalogOutput	KEYWORD2
+getAnalogOutput	KEYWORD2
 reportAnalogInput	KEYWORD2
+reportAnalogOutput	KEYWORD2
 setAnalogInputReporting	KEYWORD2
+setAnalogInputApplication	KEYWORD2
+setAnalogInputDescription	KEYWORD2
+setAnalogInputResolution	KEYWORD2
+setAnalogOutputApplication	KEYWORD2
+setAnalogOutputDescription	KEYWORD2
+setAnalogOutputResolution	KEYWORD2
 
 # ZigbeeCarbonDioxideSensor
 setCarbonDioxide	KEYWORD2
@@ -191,4 +199,4 @@ ZIGBEE_DEFAULT_COORDINATOR_CONFIG	LITERAL1
 ZIGBEE_DEFAULT_RADIO_CONFIG	LITERAL1
 ZIGBEE_DEFAULT_UART_RCP_RADIO_CONFIG	LITERAL1
 ZIGBEE_DEFAULT_HOST_CONFIG	LITERAL1
-ZB_ARRAY_LENTH	LITERAL1
+ZB_ARRAY_LENGHT	LITERAL1