Merge branch 'fix/priv_data_in_override_cb' into 'main'

fixed the override callback to pass priv data See merge request app-frameworks/esp-matter!611
espressif · Jan 23, 2024 · c11e9a1 · c11e9a1
2 parents d947231 + 30bfa5e
commit c11e9a1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/components/esp_matter/esp_matter_attribute_utils.cpp b/components/esp_matter/esp_matter_attribute_utils.cpp
@@ -1012,12 +1012,14 @@ static esp_err_t execute_override_callback(attribute_t *attribute, callback_type
                                            uint32_t cluster_id, uint32_t attribute_id, esp_matter_attr_val_t *val)
 {
     callback_t override_callback = attribute::get_override_callback(attribute);
+    void *priv_data = endpoint::get_priv_data(endpoint_id);
     if (override_callback) {
-        return override_callback(type, endpoint_id, cluster_id, attribute_id, val, NULL);
+        return override_callback(type, endpoint_id, cluster_id, attribute_id, val, priv_data);
     } else {
         ESP_LOGI(TAG, "Attribute override callback not set for Endpoint 0x%04" PRIX16 "'s Cluster 0x%08" PRIX32 "'s Attribute 0x%08" PRIX32 ", calling the common callback",
                  endpoint_id, cluster_id, attribute_id);
-        return execute_callback(type, endpoint_id, cluster_id, attribute_id, val);
+        if (attribute_callback)
+            return attribute_callback(type, endpoint_id, cluster_id, attribute_id, val, priv_data);
     }
     return ESP_OK;
 }