[Pump] Fix device manager and update zap (#18988)

* Removed mask parameter frin device manager functions * Updated pump app zap and ran regen-all * Regen zap * Regen zap
project-chip · Aug 25, 2023 · 5d174f8 · 5d174f8
1 parent 94bec3e
commit 5d174f8
Show file tree

Hide file tree

Showing 13 changed files with 802 additions and 1,835 deletions.
diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/CHIPDeviceManager.cpp
@@ -64,28 +64,27 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb)
 } // namespace DeviceManager
 } // namespace chip
 
-void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type,
-                                       uint16_t size, uint8_t * value)
+void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
+                                       uint8_t * value)
 {
     chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
         chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
     if (cb != nullptr)
     {
-        cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, mask, type,
-                                        size, value);
+        cb->PostAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type, size,
+                                        value);
     }
 }
 
 chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath,
-                                                                           uint8_t mask, uint8_t type, uint16_t size,
-                                                                           uint8_t * value)
+                                                                           uint8_t type, uint16_t size, uint8_t * value)
 {
     chip::DeviceManager::CHIPDeviceManagerCallbacks * cb =
         chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks();
     if (cb != nullptr)
     {
-        return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, mask,
-                                              type, size, value);
+        return cb->PreAttributeChangeCallback(attributePath.mEndpointId, attributePath.mClusterId, attributePath.mAttributeId, type,
+                                              size, value);
     }
 
     return chip::Protocols::InteractionModel::Status::Success;

diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/DeviceCallbacks.cpp
@@ -105,8 +105,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_
 
 chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCallback(chip::EndpointId endpointId,
                                                                                       chip::ClusterId clusterId,
-                                                                                      chip::AttributeId attributeId, uint8_t mask,
-                                                                                      uint8_t type, uint16_t size, uint8_t * value)
+                                                                                      chip::AttributeId attributeId, uint8_t type,
+                                                                                      uint16_t size, uint8_t * value)
 {
     PLAT_LOG("PreAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
              endpointId, attributeId);
@@ -130,8 +130,8 @@ chip::Protocols::InteractionModel::Status DeviceCallbacks::PreAttributeChangeCal
     return chip::Protocols::InteractionModel::Status::Success;
 }
 
-void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask,
-                                                  uint8_t type, uint16_t size, uint8_t * value)
+void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t type,
+                                                  uint16_t size, uint8_t * value)
 {
     PLAT_LOG("PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId,
              endpointId, attributeId);

diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/CHIPDeviceManager.h
@@ -72,7 +72,7 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
      * @param value              pointer to the new value
      */
     virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t mask, uint8_t type, uint16_t size, uint8_t * value)
+                                             uint8_t type, uint16_t size, uint8_t * value)
     {}
     /**
      * @brief
@@ -91,8 +91,8 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks
      */
     virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpoint,
                                                                                  chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t mask,
-                                                                                 uint8_t type, uint16_t size, uint8_t * value)
+                                                                                 chip::AttributeId attributeId, uint8_t type,
+                                                                                 uint16_t size, uint8_t * value)
     {
         return chip::Protocols::InteractionModel::Status::Success;
     }

diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h b/examples/pump-app/cc13x2x7_26x2x7/main/include/DeviceCallbacks.h
@@ -35,10 +35,10 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks
     virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg);
     virtual chip::Protocols::InteractionModel::Status PreAttributeChangeCallback(chip::EndpointId endpointId,
                                                                                  chip::ClusterId clusterId,
-                                                                                 chip::AttributeId attributeId, uint8_t mask,
-                                                                                 uint8_t type, uint16_t size, uint8_t * value);
+                                                                                 chip::AttributeId attributeId, uint8_t type,
+                                                                                 uint16_t size, uint8_t * value);
     virtual void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId,
-                                             uint8_t mask, uint8_t type, uint16_t size, uint8_t * value);
+                                             uint8_t type, uint16_t size, uint8_t * value);
 
 private:
     void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event);