Merge branch 'release/v3.1.x' into matter_identify_callback

Author: SuGlider

Diff for: cores/esp32/esp32-hal-cpu.c

@@ -259,18 +259,10 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
   if (apb_change_callbacks) {
     triggerApbChangeCallback(APB_AFTER_CHANGE, capb, apb);
   }
-  // clang-format off
-#ifdef SOC_CLK_APLL_SUPPORTED
+#if defined(SOC_CLK_APLL_SUPPORTED) && !defined(CONFIG_IDF_TARGET_ESP32P4)  // APLL not yet supported in ESP32-P4
   log_d(
     "%s: %u / %u = %u Mhz, APB: %u Hz",
-    (conf.source == SOC_CPU_CLK_SRC_PLL) ? "PLL"
-                                          : ((conf.source == SOC_CPU_CLK_SRC_APLL) ? "APLL"
-                                          : ((conf.source == SOC_CPU_CLK_SRC_XTAL) ? "XTAL"
-#ifdef CONFIG_IDF_TARGET_ESP32P4
-                                          : "17.5M")),
-#else
-                                          : "8M")),
-#endif
+    (conf.source == SOC_CPU_CLK_SRC_PLL) ? "PLL" : ((conf.source == SOC_CPU_CLK_SRC_APLL) ? "APLL" : ((conf.source == SOC_CPU_CLK_SRC_XTAL) ? "XTAL" : "8M")),
     conf.source_freq_mhz, conf.div, conf.freq_mhz, apb
   );
 #else
@@ -279,7 +271,6 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
     conf.source_freq_mhz, conf.div, conf.freq_mhz, apb
   );
 #endif
-  // clang-format on
   return true;
 }
 

Diff for: libraries/Matter/examples/MatterColorLight/MatterColorLight.ino

@@ -21,6 +21,10 @@
 // Color Light Endpoint
 MatterColorLight ColorLight;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // it will keep last OnOff & HSV Color state stored, using Preferences
 Preferences matterPref;
 const char *onOffPrefKey = "OnOff";
@@ -43,10 +47,6 @@ bool button_state = false;                     // false = released | true = pres
 const uint32_t debouceTime = 250;              // button debouncing time (ms)
 const uint32_t decommissioningTimeout = 5000;  // keep the button pressed for 5s, or longer, to decommission
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 // Set the RGB LED Light based on the current state of the Color Light
 bool setLightState(bool state, espHsvColor_t colorHSV) {
 
@@ -76,15 +76,10 @@ void setup() {
   pinMode(ledPin, OUTPUT);
 
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterCommissionTest/MatterCommissionTest.ino

@@ -26,15 +26,10 @@ const char *password = "your-password";  // Change this to your WiFi password
 
 void setup() {
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterComposedLights/MatterComposedLights.ino

@@ -55,15 +55,10 @@ void setup() {
   pinMode(buttonPin, INPUT_PULLUP);
 
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterContactSensor/MatterContactSensor.ino

@@ -36,6 +36,10 @@
 // Matter Contact Sensor Endpoint
 MatterContactSensor ContactSensor;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // LED will be used to indicate the Contact Sensor state
 // set your board RGB LED pin here
 #ifdef RGB_BUILTIN
@@ -48,10 +52,6 @@ const uint8_t ledPin = 2;  // Set your pin here if your board has not defined LE
 // set your board USER BUTTON pin here - decommissioning and Manual Contact Sensor toggle button
 const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 // Button control
 uint32_t button_time_stamp = 0;                // debouncing control
 bool button_state = false;                     // false = released | true = pressed

Diff for: libraries/Matter/examples/MatterDimmableLight/MatterDimmableLight.ino

@@ -21,6 +21,10 @@
 // Dimmable Light Endpoint
 MatterDimmableLight DimmableLight;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // it will keep last OnOff & Brightness state stored, using Preferences
 Preferences matterPref;
 const char *onOffPrefKey = "OnOff";
@@ -43,10 +47,6 @@ bool button_state = false;                     // false = released | true = pres
 const uint32_t debouceTime = 250;              // button debouncing time (ms)
 const uint32_t decommissioningTimeout = 5000;  // keep the button pressed for 5s, or longer, to decommission
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 // Set the RGB LED Light based on the current state of the Dimmable Light
 bool setLightState(bool state, uint8_t brightness) {
   if (state) {
@@ -72,15 +72,10 @@ void setup() {
   pinMode(ledPin, OUTPUT);
 
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterEnhancedColorLight/MatterEnhancedColorLight.ino

@@ -21,6 +21,10 @@
 // Color Light Endpoint
 MatterEnhancedColorLight EnhancedColorLight;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // It will use HSV color to control all Matter Attribute Changes
 HsvColor_t currentHSVColor = {0, 0, 0};
 
@@ -46,10 +50,6 @@ bool button_state = false;                     // false = released | true = pres
 const uint32_t debouceTime = 250;              // button debouncing time (ms)
 const uint32_t decommissioningTimeout = 5000;  // keep the button pressed for 5s, or longer, to decommission
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 // Set the RGB LED Light based on the current state of the Enhanced Color Light
 bool setLightState(bool state, espHsvColor_t colorHSV, uint8_t brighteness, uint16_t temperature_Mireds) {
 
@@ -80,15 +80,10 @@ void setup() {
   pinMode(ledPin, OUTPUT);
 
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterFan/MatterFan.ino

@@ -20,6 +20,10 @@
 // Fan Endpoint - On/Off control + Speed Percent Control + Fan Modes
 MatterFan Fan;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // set your board USER BUTTON pin here - used for toggling On/Off and decommission the Matter Node
 const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
 
@@ -41,10 +45,6 @@ const uint8_t dcMotorPin = 2;  // Set your pin here if your board has not define
 #warning "Do not forget to set the RGB LED pin"
 #endif
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 void fanDCMotorDrive(bool fanState, uint8_t speedPercent) {
   // drive the Fan DC motor
   if (fanState == false) {
@@ -71,15 +71,10 @@ void setup() {
   pinMode(dcMotorPin, OUTPUT);
 
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterHumiditySensor/MatterHumiditySensor.ino

@@ -27,13 +27,13 @@
 // Matter Humidity Sensor Endpoint
 MatterHumiditySensor SimulatedHumiditySensor;
 
-// set your board USER BUTTON pin here - decommissioning button
-const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
-
 // WiFi is manually set and started
 const char *ssid = "your-ssid";          // Change this to your WiFi SSID
 const char *password = "your-password";  // Change this to your WiFi password
 
+// set your board USER BUTTON pin here - decommissioning button
+const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
+
 // Button control - decommision the Matter Node
 uint32_t button_time_stamp = 0;                // debouncing control
 bool button_state = false;                     // false = released | true = pressed

Diff for: libraries/Matter/examples/MatterMinimum/MatterMinimum.ino

@@ -28,6 +28,10 @@
 // Single On/Off Light Endpoint - at least one per node
 MatterOnOffLight OnOffLight;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // Light GPIO that can be controlled by Matter APP
 #ifdef LED_BUILTIN
 const uint8_t ledPin = LED_BUILTIN;
@@ -44,23 +48,18 @@ bool button_state = false;                     // false = released | true = pres
 const uint32_t decommissioningTimeout = 5000;  // keep the button pressed for 5s, or longer, to decommission
 
 // Matter Protocol Endpoint (On/OFF Light) Callback
-bool matterCB(bool state) {
+bool onOffLightCallback(bool state) {
   digitalWrite(ledPin, state ? HIGH : LOW);
   // This callback must return the success state to Matter core
   return true;
 }
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 void setup() {
   // Initialize the USER BUTTON (Boot button) that will be used to decommission the Matter Node
   pinMode(buttonPin, INPUT_PULLUP);
   // Initialize the LED GPIO
   pinMode(ledPin, OUTPUT);
 
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection
@@ -72,7 +71,7 @@ void setup() {
   OnOffLight.begin();
 
   // Associate a callback to the Matter Controller
-  OnOffLight.onChange(matterCB);
+  OnOffLight.onChange(onOffLightCallback);
 
   // Matter beginning - Last step, after all EndPoints are initialized
   Matter.begin();

Diff for: libraries/Matter/examples/MatterOccupancySensor/MatterOccupancySensor.ino

@@ -34,13 +34,13 @@
 // Matter Occupancy Sensor Endpoint
 MatterOccupancySensor OccupancySensor;
 
-// set your board USER BUTTON pin here - decommissioning only
-const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
-
 // WiFi is manually set and started
 const char *ssid = "your-ssid";          // Change this to your WiFi SSID
 const char *password = "your-password";  // Change this to your WiFi password
 
+// set your board USER BUTTON pin here - decommissioning only
+const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
+
 // Button control
 uint32_t button_time_stamp = 0;                // debouncing control
 bool button_state = false;                     // false = released | true = pressed

Diff for: libraries/Matter/examples/MatterOnOffLight/MatterOnOffLight.ino

@@ -17,6 +17,10 @@
 #include <WiFi.h>
 #include <Preferences.h>
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // List of Matter Endpoints for this Node
 // On/Off Light Endpoint
 MatterOnOffLight OnOffLight;
@@ -42,10 +46,6 @@ bool button_state = false;                     // false = released | true = pres
 const uint32_t debouceTime = 250;              // button debouncing time (ms)
 const uint32_t decommissioningTimeout = 5000;  // keep the button pressed for 5s, or longer, to decommission
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 // Matter Protocol Endpoint Callback
 bool setLightOnOff(bool state) {
   Serial.printf("User Callback :: New Light State = %s\r\n", state ? "ON" : "OFF");
@@ -67,15 +67,10 @@ void setup() {
   pinMode(ledPin, OUTPUT);
 
   Serial.begin(115200);
-  while (!Serial) {
-    delay(100);
-  }
 
   // We start by connecting to a WiFi network
   Serial.print("Connecting to ");
   Serial.println(ssid);
-  // enable IPv6
-  WiFi.enableIPv6(true);
   // Manually connect to WiFi
   WiFi.begin(ssid, password);
   // Wait for connection

Diff for: libraries/Matter/examples/MatterOnOffPlugin/MatterOnOffPlugin.ino

@@ -21,6 +21,10 @@
 // On/Off Plugin Endpoint
 MatterOnOffPlugin OnOffPlugin;
 
+// WiFi is manually set and started
+const char *ssid = "your-ssid";          // Change this to your WiFi SSID
+const char *password = "your-password";  // Change this to your WiFi password
+
 // it will keep last OnOff state stored, using Preferences
 Preferences matterPref;
 const char *onOffPrefKey = "OnOff";
@@ -41,10 +45,6 @@ uint32_t button_time_stamp = 0;                // debouncing control
 bool button_state = false;                     // false = released | true = pressed
 const uint32_t decommissioningTimeout = 5000;  // keep the button pressed for 5s, or longer, to decommission
 
-// WiFi is manually set and started
-const char *ssid = "your-ssid";          // Change this to your WiFi SSID
-const char *password = "your-password";  // Change this to your WiFi password
-
 // Matter Protocol Endpoint Callback
 bool setPluginOnOff(bool state) {
   Serial.printf("User Callback :: New Plugin State = %s\r\n", state ? "ON" : "OFF");

Diff for: libraries/Matter/examples/MatterPressureSensor/MatterPressureSensor.ino

@@ -27,13 +27,13 @@
 // Matter Pressure Sensor Endpoint
 MatterPressureSensor SimulatedPressureSensor;
 
-// set your board USER BUTTON pin here - decommissioning button
-const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
-
 // WiFi is manually set and started
 const char *ssid = "your-ssid";          // Change this to your WiFi SSID
 const char *password = "your-password";  // Change this to your WiFi password
 
+// set your board USER BUTTON pin here - decommissioning button
+const uint8_t buttonPin = BOOT_PIN;  // Set your pin here. Using BOOT Button.
+
 // Button control - decommision the Matter Node
 uint32_t button_time_stamp = 0;                // debouncing control
 bool button_state = false;                     // false = released | true = pressed