Merge branch 'rm_matter/ci_fix' into 'master'

Made changes for ci fix on latest matter commit id : 83845fc0430f70dfd74083a993ddd3fb2866bc72 See merge request app-frameworks/esp-rainmaker!470
espressif · Sep 4, 2024 · e98d36b · e98d36b
2 parents 837b039 + f1be7e2
commit e98d36b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/examples/matter/common/controller_custom_cluster/matter_controller_cluster.cpp b/examples/matter/common/controller_custom_cluster/matter_controller_cluster.cpp
@@ -701,7 +701,7 @@ MatterControllerAttrAccess g_attr_access;
 
 void controller_cluster_plugin_server_init_callback()
 {
-    registerAttributeAccessOverride(&g_attr_access);
+    chip::app::AttributeAccessInterfaceRegistry::Instance().Register(&g_attr_access);
 }
 
 cluster_t *create(endpoint_t *endpoint, uint8_t flags)

diff --git a/examples/matter/matter_light/main/app_matter_light.cpp b/examples/matter/matter_light/main/app_matter_light.cpp
@@ -232,7 +232,7 @@ esp_err_t app_matter_light_create(app_driver_handle_t driver_handle)
     light_config.level_control.lighting.start_up_current_level = DEFAULT_BRIGHTNESS;
     light_config.color_control.color_mode = static_cast<uint8_t>(ColorControl::ColorMode::kColorTemperature);
     light_config.color_control.enhanced_color_mode =
-        static_cast<uint8_t>(ColorControlServer::EnhancedColorMode::kColorTemperature);
+        static_cast<uint8_t>(ColorControl::ColorMode::kColorTemperature);
     light_config.color_control.color_temperature.startup_color_temperature_mireds = nullptr;
     endpoint_t *endpoint = extended_color_light::create(node, &light_config, ENDPOINT_FLAG_NONE, driver_handle);