fix(matter): it shuold work even when no callback is set

Author: SuGlider

libraries/Matter/src/MatterEndpoints/MatterDimmableLight.cpp

@@ -33,16 +33,16 @@ bool MatterDimmableLight::attributeChangeCB(uint16_t endpoint_id, uint32_t clust
   log_d("Dimmable Attr update callback: endpoint: %u, cluster: %u, attribute: %u, val: %u", endpoint_id, cluster_id, attribute_id, val->val.u32);
 
   if (endpoint_id == getEndPointId()) {
-    bool ret = false;
+    bool ret = true;
     switch(cluster_id) {
       case OnOff::Id:
         if (attribute_id == OnOff::Attributes::OnOff::Id) {
           log_d("DimmableLight On/Off State changed to %d", val->val.b);
           if (_onChangeOnOffCB != NULL) {
-            ret |= _onChangeOnOffCB(val->val.b);
+            ret &= _onChangeOnOffCB(val->val.b);
           }
           if (_onChangeCB != NULL) {
-            ret |= _onChangeCB(val->val.b, brightnessLevel);
+            ret &= _onChangeCB(val->val.b, brightnessLevel);
           }
           if (ret == true) {
             onOffState = val->val.b;
@@ -53,10 +53,10 @@ bool MatterDimmableLight::attributeChangeCB(uint16_t endpoint_id, uint32_t clust
         if (attribute_id == LevelControl::Attributes::CurrentLevel::Id) {
           log_d("DimmableLight Brightness changed to %d", val->val.u8);
           if (_onChangeBrightnessCB != NULL) {
-            ret |= _onChangeBrightnessCB(val->val.u8);
+            ret &= _onChangeBrightnessCB(val->val.u8);
           }
           if (_onChangeCB != NULL) {
-            ret |= _onChangeCB(onOffState, val->val.u8);
+            ret &= _onChangeCB(onOffState, val->val.u8);
           }
           if (ret == true) {
             brightnessLevel = val->val.u8;

libraries/Matter/src/MatterEndpoints/MatterOnOffLight.cpp

@@ -33,14 +33,18 @@ bool MatterOnOffLight::attributeChangeCB(uint16_t endpoint_id, uint32_t cluster_
   log_d("OnOff Attr update callback: endpoint: %u, cluster: %u, attribute: %u, val: %u", endpoint_id, cluster_id, attribute_id, val->val.u32);
 
   if (endpoint_id == getEndPointId()) {
+    log_d("OnOffLight state changed to %d", val->val.b);
+    bool ret = true;
     if (cluster_id == OnOff::Id) {
       if (attribute_id == OnOff::Attributes::OnOff::Id) {
+        if (_onChangeOnOffCB != NULL) {
+          ret &= _onChangeOnOffCB(val->val.b);
+        }
         if (_onChangeCB != NULL) {
-          ret = _onChangeCB(val->val.b);
-          log_d("OnOffLight state changed to %d", val->val.b);
-          if (ret == true) {
-            onOffState = val->val.b;
-          }
+          ret &= _onChangeCB(val->val.b);
+        }
+        if (ret == true) {
+          onOffState = val->val.b;
         }
       }
     }

libraries/Matter/src/MatterEndpoints/MatterOnOffLight.h

@@ -43,10 +43,14 @@ class MatterOnOffLight : public MatterEndPoint {
   void onChange(EndPointCB onChangeCB) {
     _onChangeCB = onChangeCB;
   }
+  void onChangeOnOff(EndPointCB onChangeCB) {
+    _onChangeOnOffCB = onChangeCB;
+  }
 
 protected:
   bool started = false;
   bool onOffState = false;  // default initial state is off, but it can be changed by begin(bool)
   EndPointCB _onChangeCB = NULL;
+  EndPointCB _onChangeOnOffCB = NULL;
 };
 #endif /* CONFIG_ESP_MATTER_ENABLE_DATA_MODEL */