Merge branch 'chip-submodule-' into 'main'

chip/submodule: Update chip submodule to latest master

See merge request app-frameworks/esp-matter!850

.gitlab-ci.yml

@@ -25,7 +25,7 @@ variables:
     IDF_CHECKOUT_REF: "v5.2.1"
     # This variable represents the short hash of the connectedhomeip submodule.
     # Note: Do change this short hash on submodule update MRs.
-    CHIP_SHORT_HASH: "0460715589"
+    CHIP_SHORT_HASH: "ea679d2dc6"
     DOCKER_IMAGE_NAME: "espressif/chip-idf"
 
 .add_gitlab_ssh_key: &add_gitlab_ssh_key |

README.md

@@ -29,7 +29,7 @@ section in the ESP-Matter Programming Guide.
 
 ## Supported ESP-IDF and connectedhomeip versions
 
-- This SDK currently works with commit [0460715589](https://github.com/project-chip/connectedhomeip/tree/0460715589) of connectedhomeip.
+- This SDK currently works with commit [ea679d2dc6](https://github.com/project-chip/connectedhomeip/tree/ea679d2dc6) of connectedhomeip.
 - For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1).
 
 

components/esp_matter/esp_matter_delegate_callbacks.cpp

@@ -241,7 +241,7 @@ void DoorLockDelegateInitCB(void *delegate, uint16_t endpoint_id)
         return;
     }
     DoorLock::Delegate *door_lock_delegate = static_cast<DoorLock::Delegate*>(delegate);
-    DoorLock::SetDefaultDelegate(endpoint_id, door_lock_delegate);
+    DoorLockServer::Instance().SetDelegate(endpoint_id, door_lock_delegate);
 }
 
 void BooleanStateConfigurationDelegateInitCB(void *delegate, uint16_t endpoint_id)

components/esp_matter/esp_matter_feature.cpp

@@ -536,7 +536,7 @@ namespace hue_saturation {
 
 uint32_t get_id()
 {
-    return (uint32_t)ColorControl::ColorCapabilities::kHueSaturationSupported;
+    return (uint32_t)ColorControl::ColorCapabilitiesBitmap::kHueSaturation;
 }
 
 esp_err_t add(cluster_t *cluster, config_t *config)
@@ -570,7 +570,7 @@ namespace color_temperature {
 
 uint32_t get_id()
 {
-    return (uint32_t)ColorControl::ColorCapabilities::kColorTemperatureSupported;
+    return (uint32_t)ColorControl::ColorCapabilitiesBitmap::kColorTemperature;
 }
 
 esp_err_t add(cluster_t *cluster, config_t *config)
@@ -603,7 +603,7 @@ namespace xy {
 
 uint32_t get_id()
 {
-    return (uint32_t)ColorControl::ColorCapabilities::kXYAttributesSupported;
+    return (uint32_t)ColorControl::ColorCapabilitiesBitmap::kXy;
 }
 
 esp_err_t add(cluster_t *cluster, config_t *config)
@@ -633,7 +633,7 @@ namespace enhanced_hue {
 
 uint32_t get_id()
 {
-    return (uint32_t)chip::app::Clusters::ColorControl::ColorCapabilities::kEnhancedHueSupported;
+    return (uint32_t)chip::app::Clusters::ColorControl::ColorCapabilitiesBitmap::kEnhancedHue;
 }
 
 esp_err_t add(cluster_t *cluster, config_t *config)
@@ -668,7 +668,7 @@ esp_err_t add(cluster_t *cluster, config_t *config)
 namespace color_loop {
 uint32_t get_id()
 {
-    return (uint32_t)chip::app::Clusters::ColorControl::ColorCapabilities::kColorLoopSupported;
+    return (uint32_t)chip::app::Clusters::ColorControl::ColorCapabilitiesBitmap::kColorLoop;
 }
 
 esp_err_t add(cluster_t *cluster, config_t *config)

components/esp_matter/zap_common/app/PluginApplicationCallbacks.h

@@ -18,6 +18,7 @@ void MatterCarbonDioxideConcentrationMeasurementPluginServerInitCallback();
 void MatterCarbonMonoxideConcentrationMeasurementPluginServerInitCallback();
 void MatterChannelPluginServerInitCallback();
 void MatterColorControlPluginServerInitCallback();
+void MatterCommissionerControlPluginServerInitCallback();
 void MatterContentAppObserverPluginServerInitCallback();
 void MatterContentControlPluginServerInitCallback();
 void MatterContentLauncherPluginServerInitCallback();
@@ -28,6 +29,7 @@ void MatterDiagnosticLogsPluginServerInitCallback();
 void MatterDishwasherAlarmPluginServerInitCallback();
 void MatterDishwasherModePluginServerInitCallback();
 void MatterDoorLockPluginServerInitCallback();
+void MatterEcosystemInformationPluginServerInitCallback();
 void MatterElectricalEnergyMeasurementPluginServerInitCallback();
 void MatterElectricalPowerMeasurementPluginServerInitCallback();
 void MatterEnergyEvsePluginServerInitCallback();
@@ -112,6 +114,8 @@ void MatterUnitTestingPluginServerInitCallback();
 void MatterUserLabelPluginServerInitCallback();
 void MatterValveConfigurationAndControlPluginServerInitCallback();
 void MatterWakeOnLanPluginServerInitCallback();
+void MatterWaterHeaterManagementPluginServerInitCallback();
+void MatterWaterHeaterModePluginServerInitCallback();
 void MatterWiFiNetworkDiagnosticsPluginServerInitCallback();
 void MatterWiFiNetworkManagementPluginServerInitCallback();
 void MatterWindowCoveringPluginServerInitCallback();

components/esp_matter/zap_common/app/callback-stub.cpp

@@ -96,6 +96,11 @@ void __attribute__((weak)) emberAfColorControlClusterInitCallback(EndpointId end
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfCommissionerControlClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfContentAppObserverClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -146,6 +151,11 @@ void __attribute__((weak)) emberAfDoorLockClusterInitCallback(EndpointId endpoin
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfEcosystemInformationClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfElectricalEnergyMeasurementClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning
@@ -566,6 +576,16 @@ void __attribute__((weak)) emberAfWakeOnLanClusterInitCallback(EndpointId endpoi
     // To prevent warning
     (void) endpoint;
 }
+void __attribute__((weak)) emberAfWaterHeaterManagementClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
+void __attribute__((weak)) emberAfWaterHeaterModeClusterInitCallback(EndpointId endpoint)
+{
+    // To prevent warning
+    (void) endpoint;
+}
 void __attribute__((weak)) emberAfWiFiNetworkDiagnosticsClusterInitCallback(EndpointId endpoint)
 {
     // To prevent warning

components/esp_matter/zap_common/app/cluster-init-callback.cpp

@@ -67,6 +67,9 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case app::Clusters::ColorControl::Id:
         emberAfColorControlClusterInitCallback(endpoint);
         break;
+    case app::Clusters::CommissionerControl::Id:
+        emberAfCommissionerControlClusterInitCallback(endpoint);
+        break;
     case app::Clusters::ContentAppObserver::Id:
         emberAfContentAppObserverClusterInitCallback(endpoint);
         break;
@@ -97,6 +100,9 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case app::Clusters::DoorLock::Id:
         emberAfDoorLockClusterInitCallback(endpoint);
         break;
+    case app::Clusters::EcosystemInformation::Id:
+        emberAfEcosystemInformationClusterInitCallback(endpoint);
+        break;
     case app::Clusters::ElectricalEnergyMeasurement::Id:
         emberAfElectricalEnergyMeasurementClusterInitCallback(endpoint);
         break;
@@ -349,6 +355,12 @@ void emberAfClusterInitCallback(EndpointId endpoint, ClusterId clusterId)
     case app::Clusters::WakeOnLan::Id:
         emberAfWakeOnLanClusterInitCallback(endpoint);
         break;
+    case app::Clusters::WaterHeaterManagement::Id:
+        emberAfWaterHeaterManagementClusterInitCallback(endpoint);
+        break;
+    case app::Clusters::WaterHeaterMode::Id:
+        emberAfWaterHeaterModeClusterInitCallback(endpoint);
+        break;
     case app::Clusters::WiFiNetworkDiagnostics::Id:
         emberAfWiFiNetworkDiagnosticsClusterInitCallback(endpoint);
         break;