From 1012764bc13a48991da56eb0f096250007b5e9f1 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Sat, 30 Apr 2022 01:34:04 -0400 Subject: [PATCH] Get rid of the concept of client attributes. (#17875) They don't exist in Matter. We still have some places using *ServerAttribute instead of just *Attribute; that will be sorted out in a separate PR. --- .../ameba/main/CHIPDeviceManager.cpp | 5 +- .../ameba/main/DeviceCallbacks.cpp | 4 +- .../ameba/main/include/CHIPDeviceManager.h | 3 +- .../ameba/main/include/DeviceCallbacks.h | 2 +- .../cc13x2x7_26x2x7/main/ZclCallbacks.cpp | 4 +- .../esp32/main/CHIPDeviceManager.cpp | 5 +- .../esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- .../all-clusters-app/p6/src/ZclCallbacks.cpp | 4 +- .../esp32/main/CHIPDeviceManager.cpp | 5 +- .../bridge-app/esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- examples/bridge-app/esp32/main/main.cpp | 10 +- examples/bridge-app/linux/main.cpp | 16 +- .../efr32/src/ZclCallbacks.cpp | 4 +- .../ameba/main/CHIPDeviceManager.cpp | 6 +- .../ameba/main/DeviceCallbacks.cpp | 4 +- .../ameba/main/include/CHIPDeviceManager.h | 3 +- .../ameba/main/include/DeviceCallbacks.h | 2 +- .../bl602/include/CHIPDeviceManager.h | 3 +- .../bl602/include/DeviceCallbacks.h | 2 +- .../bouffalolab/bl602/src/AppTask.cpp | 4 +- .../bl602/src/CHIPDeviceManager.cpp | 8 +- .../bouffalolab/bl602/src/DeviceCallbacks.cpp | 4 +- .../cyw30739/src/ZclCallbacks.cpp | 2 +- .../lighting-app/efr32/src/ZclCallbacks.cpp | 4 +- .../esp32/main/CHIPDeviceManager.cpp | 8 +- .../esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- examples/lighting-app/linux/main.cpp | 4 +- .../lighting-app/mbed/main/ZclCallbacks.cpp | 4 +- .../nrfconnect/main/ZclCallbacks.cpp | 4 +- .../nxp/k32w/k32w0/main/AppTask.cpp | 7 +- .../nxp/k32w/k32w0/main/ZclCallbacks.cpp | 3 +- examples/lighting-app/p6/src/AppTask.cpp | 4 +- examples/lighting-app/p6/src/ZclCallbacks.cpp | 4 +- examples/lighting-app/python/lighting.py | 1 - examples/lighting-app/qpg/src/AppTask.cpp | 10 +- .../lighting-app/qpg/src/ZclCallbacks.cpp | 4 +- examples/lighting-app/telink/src/AppTask.cpp | 8 +- .../lighting-app/telink/src/ZclCallbacks.cpp | 4 +- .../cc13x2x7_26x2x7/main/ZclCallbacks.cpp | 4 +- .../lock-app/cyw30739/src/ZclCallbacks.cpp | 2 +- examples/lock-app/efr32/src/ZclCallbacks.cpp | 4 +- examples/lock-app/esp32/main/AppTask.cpp | 4 +- .../lock-app/esp32/main/CHIPDeviceManager.cpp | 8 +- .../lock-app/esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- .../linux/src/ZCLDoorLockCallbacks.cpp | 4 +- examples/lock-app/mbed/main/AppTask.cpp | 4 +- examples/lock-app/mbed/main/ZclCallbacks.cpp | 4 +- .../lock-app/nrfconnect/main/ZclCallbacks.cpp | 4 +- .../lock-app/nxp/k32w/k32w0/main/AppTask.cpp | 4 +- .../nxp/k32w/k32w0/main/ZclCallbacks.cpp | 3 +- examples/lock-app/p6/src/AppTask.cpp | 4 +- examples/lock-app/p6/src/ZclCallbacks.cpp | 4 +- examples/lock-app/qpg/src/AppTask.cpp | 4 +- examples/lock-app/qpg/src/ZclCallbacks.cpp | 4 +- .../esp32/main/CHIPDeviceManager.cpp | 5 +- .../esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- .../ameba/main/CHIPDeviceManager.cpp | 5 +- .../ameba/main/DeviceCallbacks.cpp | 4 +- .../ameba/main/include/CHIPDeviceManager.h | 3 +- .../ameba/main/include/DeviceCallbacks.h | 2 +- .../efr32/src/ZclCallbacks.cpp | 4 +- .../esp32/main/CHIPDeviceManager.cpp | 5 +- .../esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- .../ota-requestor-app/p6/src/ZclCallbacks.cpp | 4 +- .../cc13x2x7_26x2x7/main/ZclCallbacks.cpp | 4 +- .../pump-app/nrfconnect/main/ZclCallbacks.cpp | 4 +- .../cc13x2x7_26x2x7/main/ZclCallbacks.cpp | 4 +- .../nrfconnect/main/ZclCallbacks.cpp | 4 +- .../esp32/main/CHIPDeviceManager.cpp | 5 +- .../esp32/main/DeviceCallbacks.cpp | 4 +- .../esp32/main/include/CHIPDeviceManager.h | 3 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- .../android/java/ClusterChangeAttribute.cpp | 2 +- examples/tv-app/linux/ZclCallbacks.cpp | 4 +- .../include/cluster-change-attribute.cpp | 4 +- .../window-app/common/src/ZclCallbacks.cpp | 2 +- src/app/InteractionModelEngine.cpp | 5 +- .../ias-zone-server/ias-zone-server.cpp | 10 +- .../clusters/level-control/level-control.cpp | 16 +- .../mode-select-server/mode-select-server.cpp | 10 +- .../clusters/on-off-server/on-off-server.cpp | 8 +- src/app/reporting/reporting.h | 2 +- src/app/util/af.h | 78 +- src/app/util/attribute-storage.cpp | 8 +- src/app/util/attribute-storage.h | 5 +- src/app/util/attribute-table.cpp | 81 +- src/app/util/attribute-table.h | 8 +- .../util/ember-compatibility-functions.cpp | 6 +- src/app/util/mock/attribute-storage.cpp | 2 +- src/app/util/util.cpp | 13 +- src/app/util/util.h | 5 +- .../templates/app/callback-stub-src.zapt | 6 +- .../zap-templates/templates/app/callback.zapt | 14 +- .../python/chip/server/ServerInit.cpp | 7 +- src/darwin/Framework/CHIP/CHIPIMDispatch.mm | 5 +- .../zap-generated/callback-stub.cpp | 10 +- .../app-common/zap-generated/callback.h | 979 +----------------- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../lock-app/zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../app1/zap-generated/callback-stub.cpp | 10 +- .../app2/zap-generated/callback-stub.cpp | 10 +- .../pump-app/zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../tv-app/zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- .../zap-generated/callback-stub.cpp | 10 +- 126 files changed, 350 insertions(+), 1456 deletions(-) mode change 100755 => 100644 examples/lighting-app/ameba/main/CHIPDeviceManager.cpp mode change 100755 => 100644 examples/lighting-app/ameba/main/DeviceCallbacks.cpp diff --git a/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp index b89a57c08a8d39..4c1b55fbddb9fc 100644 --- a/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp +++ b/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp @@ -80,13 +80,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp index 5ff6b6713d4ed3..31b18003d65e05 100644 --- a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp @@ -77,8 +77,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ } } -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) { switch (clusterId) { diff --git a/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h index 97002717225d1a..4a4efd1d4d39dd 100644 --- a/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/all-clusters-app/ameba/main/include/CHIPDeviceManager.h @@ -67,14 +67,13 @@ class CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/all-clusters-app/ameba/main/include/DeviceCallbacks.h b/examples/all-clusters-app/ameba/main/include/DeviceCallbacks.h index 10ac917c02890a..003b6e700db0eb 100644 --- a/examples/all-clusters-app/ameba/main/include/DeviceCallbacks.h +++ b/examples/all-clusters-app/ameba/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) override; void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint8_t type, uint16_t size, uint8_t * value) override; + uint8_t type, uint16_t size, uint8_t * value) override; private: void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event); diff --git a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 7c6dac030d5a72..0524dc7578fd23 100644 --- a/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/all-clusters-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -39,8 +39,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { EndpointId endpoint = attributePath.mEndpointId; ClusterId clusterId = attributePath.mClusterId; diff --git a/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp index 248bd9cab29d55..6ad588cdc49ebd 100644 --- a/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp @@ -85,8 +85,7 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { TaskHandle_t task = xTaskGetCurrentTaskHandle(); const char * name = pcTaskGetName(task); @@ -99,6 +98,6 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp index 9d73baddc68a4a..a3046af0f59c0b 100644 --- a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp @@ -169,8 +169,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %u\n", static_cast(heap_caps_get_free_size(MALLOC_CAP_8BIT))); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: " diff --git a/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h index c340587ad088f9..9be71931631f91 100644 --- a/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h @@ -66,14 +66,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h b/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h index b196165766df5b..4bfcb3921d8ad7 100644 --- a/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/all-clusters-app/p6/src/ZclCallbacks.cpp b/examples/all-clusters-app/p6/src/ZclCallbacks.cpp index 2191da0280f239..32ba951b52cfc6 100644 --- a/examples/all-clusters-app/p6/src/ZclCallbacks.cpp +++ b/examples/all-clusters-app/p6/src/ZclCallbacks.cpp @@ -35,8 +35,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { EndpointId endpoint = attributePath.mEndpointId; ClusterId clusterId = attributePath.mClusterId; diff --git a/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp b/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp index add55587dd3eb7..1dec61ef5c8d57 100644 --- a/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/bridge-app/esp32/main/CHIPDeviceManager.cpp @@ -80,13 +80,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp index a0491fc2df7af5..0c6b50607b739d 100644 --- a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp @@ -61,8 +61,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId, endpointId, attributeId); diff --git a/examples/bridge-app/esp32/main/include/CHIPDeviceManager.h b/examples/bridge-app/esp32/main/include/CHIPDeviceManager.h index 7123d8e2ffcc07..3d755dcdbcfce2 100644 --- a/examples/bridge-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/bridge-app/esp32/main/include/CHIPDeviceManager.h @@ -63,14 +63,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/bridge-app/esp32/main/include/DeviceCallbacks.h b/examples/bridge-app/esp32/main/include/DeviceCallbacks.h index 3f05381273e379..03ce245674e373 100644 --- a/examples/bridge-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/bridge-app/esp32/main/include/DeviceCallbacks.h @@ -32,7 +32,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp index 6e00d45e960bca..7cc518c476384a 100644 --- a/examples/bridge-app/esp32/main/main.cpp +++ b/examples/bridge-app/esp32/main/main.cpp @@ -348,15 +348,14 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) { uint8_t reachable = dev->IsReachable() ? 1 : 0; MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, - ZCL_REACHABLE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, - &reachable); + ZCL_REACHABLE_ATTRIBUTE_ID, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &reachable); } if (itemChangedMask & Device::kChanged_State) { uint8_t isOn = dev->IsOn() ? 1 : 0; MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); + ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); } if (itemChangedMask & Device::kChanged_Name) @@ -364,8 +363,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) uint8_t zclName[kNodeLabelSize + 1]; ToZclCharString(zclName, dev->GetName(), kNodeLabelSize); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, - ZCL_NODE_LABEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, - zclName); + ZCL_NODE_LABEL_ATTRIBUTE_ID, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, zclName); } if (itemChangedMask & Device::kChanged_Location) { @@ -377,7 +375,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) EncodeFixedLabel("room", dev->GetLocation(), buffer, sizeof(buffer), &am); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_FIXED_LABEL_CLUSTER_ID, ZCL_LABEL_LIST_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); + ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); } } diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index a5ba5eb83f74c9..e4fa85ffc4d65d 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -294,8 +294,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) { uint8_t reachable = dev->IsReachable() ? 1 : 0; MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, - ZCL_REACHABLE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, - &reachable); + ZCL_REACHABLE_ATTRIBUTE_ID, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &reachable); } if (itemChangedMask & Device::kChanged_Name) @@ -304,8 +303,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) MutableByteSpan zclNameSpan(zclName); MakeZclCharString(zclNameSpan, dev->GetName()); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_BRIDGED_DEVICE_BASIC_CLUSTER_ID, - ZCL_NODE_LABEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, - zclNameSpan.data()); + ZCL_NODE_LABEL_ATTRIBUTE_ID, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, zclNameSpan.data()); } if (itemChangedMask & Device::kChanged_Location) @@ -318,7 +316,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) EncodeFixedLabel("room", dev->GetLocation(), buffer, sizeof(buffer), &am); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_FIXED_LABEL_CLUSTER_ID, ZCL_LABEL_LIST_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); + ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); } } @@ -333,7 +331,7 @@ void HandleDeviceOnOffStatusChanged(DeviceOnOff * dev, DeviceOnOff::Changed_t it { uint8_t isOn = dev->IsOn() ? 1 : 0; MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); + ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); } } @@ -348,21 +346,21 @@ void HandleDeviceSwitchStatusChanged(DeviceSwitch * dev, DeviceSwitch::Changed_t { uint8_t numberOfPositions = dev->GetNumberOfPositions(); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_SWITCH_CLUSTER_ID, ZCL_NUMBER_OF_POSITIONS_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_INT8U_ATTRIBUTE_TYPE, &numberOfPositions); + ZCL_INT8U_ATTRIBUTE_TYPE, &numberOfPositions); } if (itemChangedMask & DeviceSwitch::kChanged_CurrentPosition) { uint8_t currentPosition = dev->GetCurrentPosition(); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_SWITCH_CLUSTER_ID, ZCL_CURRENT_POSITION_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_INT8U_ATTRIBUTE_TYPE, ¤tPosition); + ZCL_INT8U_ATTRIBUTE_TYPE, ¤tPosition); } if (itemChangedMask & DeviceSwitch::kChanged_MultiPressMax) { uint8_t multiPressMax = dev->GetMultiPressMax(); MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_SWITCH_CLUSTER_ID, ZCL_MULTI_PRESS_MAX_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, ZCL_INT8U_ATTRIBUTE_TYPE, &multiPressMax); + ZCL_INT8U_ATTRIBUTE_TYPE, &multiPressMax); } } diff --git a/examples/light-switch-app/efr32/src/ZclCallbacks.cpp b/examples/light-switch-app/efr32/src/ZclCallbacks.cpp index b854819734b52e..6dad9e5923e5a0 100644 --- a/examples/light-switch-app/efr32/src/ZclCallbacks.cpp +++ b/examples/light-switch-app/efr32/src/ZclCallbacks.cpp @@ -31,8 +31,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp old mode 100755 new mode 100644 index 23e377f9694067..c164e20609c497 --- a/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp +++ b/examples/lighting-app/ameba/main/CHIPDeviceManager.cpp @@ -86,8 +86,8 @@ 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(); @@ -153,7 +153,7 @@ void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & { if (cb != nullptr) { - cb->PostAttributeChangeCallback(endpointId, clusterId, attributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(endpointId, clusterId, attributeId, type, size, value); } ChipLogProgress(Zcl, "ZCL_IDENTIFY_TIME_ATTRIBUTE_ID value: %u ", *value); } diff --git a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp old mode 100755 new mode 100644 index 8f5e45b8dfc882..bb8fe22d4e609d --- a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp @@ -104,8 +104,8 @@ void DeviceCallbacks::OnSessionEstablished(const ChipDeviceEvent * event) } } -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) { switch (clusterId) { diff --git a/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h b/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h index d7b7d41f6513b6..91e4ce2a2d9f46 100644 --- a/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/lighting-app/ameba/main/include/CHIPDeviceManager.h @@ -66,14 +66,13 @@ class CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/lighting-app/ameba/main/include/DeviceCallbacks.h b/examples/lighting-app/ameba/main/include/DeviceCallbacks.h index f7a2c0b52b1624..43c3a8a6906ab3 100755 --- a/examples/lighting-app/ameba/main/include/DeviceCallbacks.h +++ b/examples/lighting-app/ameba/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint8_t type, uint16_t size, uint8_t * value) override; + uint8_t type, uint16_t size, uint8_t * value) override; private: void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event); diff --git a/examples/lighting-app/bouffalolab/bl602/include/CHIPDeviceManager.h b/examples/lighting-app/bouffalolab/bl602/include/CHIPDeviceManager.h index 91d8c7c6c01d7b..e1ab643bc58ae0 100644 --- a/examples/lighting-app/bouffalolab/bl602/include/CHIPDeviceManager.h +++ b/examples/lighting-app/bouffalolab/bl602/include/CHIPDeviceManager.h @@ -66,14 +66,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/lighting-app/bouffalolab/bl602/include/DeviceCallbacks.h b/examples/lighting-app/bouffalolab/bl602/include/DeviceCallbacks.h index 080c65751df181..b3ee3e941a750d 100644 --- a/examples/lighting-app/bouffalolab/bl602/include/DeviceCallbacks.h +++ b/examples/lighting-app/bouffalolab/bl602/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp b/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp index 8214b3a2a26f91..905d6124f1bac2 100644 --- a/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp +++ b/examples/lighting-app/bouffalolab/bl602/src/AppTask.cpp @@ -501,8 +501,8 @@ void AppTask::UpdateClusterState(void) uint8_t newValue = LightMgr().IsLightOn(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { log_error("ERR: updating on/off %x\r\n", status); diff --git a/examples/lighting-app/bouffalolab/bl602/src/CHIPDeviceManager.cpp b/examples/lighting-app/bouffalolab/bl602/src/CHIPDeviceManager.cpp index 0e64a4f0513248..44adca26d9df9a 100644 --- a/examples/lighting-app/bouffalolab/bl602/src/CHIPDeviceManager.cpp +++ b/examples/lighting-app/bouffalolab/bl602/src/CHIPDeviceManager.cpp @@ -94,14 +94,14 @@ 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); } } diff --git a/examples/lighting-app/bouffalolab/bl602/src/DeviceCallbacks.cpp b/examples/lighting-app/bouffalolab/bl602/src/DeviceCallbacks.cpp index 69fa6d94a0f1fd..69dc7bb2744e02 100644 --- a/examples/lighting-app/bouffalolab/bl602/src/DeviceCallbacks.cpp +++ b/examples/lighting-app/bouffalolab/bl602/src/DeviceCallbacks.cpp @@ -94,8 +94,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ } } -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) { log_info("PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'\r\n", clusterId, endpointId, attributeId); diff --git a/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp b/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp index ce4b51297cc321..bbb4e91ba68e3a 100644 --- a/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp +++ b/examples/lighting-app/cyw30739/src/ZclCallbacks.cpp @@ -39,7 +39,7 @@ void emberAfBasicClusterInitCallback(EndpointId endpoint) Basic::Attributes::ManufacturingDate::Set(endpoint, CharSpan(cString)); } -void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { diff --git a/examples/lighting-app/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/efr32/src/ZclCallbacks.cpp index 8ceba598204e91..cfbcbc8a191411 100644 --- a/examples/lighting-app/efr32/src/ZclCallbacks.cpp +++ b/examples/lighting-app/efr32/src/ZclCallbacks.cpp @@ -31,8 +31,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lighting-app/esp32/main/CHIPDeviceManager.cpp b/examples/lighting-app/esp32/main/CHIPDeviceManager.cpp index ee7962ed549a72..6a801fd5a1fda7 100644 --- a/examples/lighting-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/lighting-app/esp32/main/CHIPDeviceManager.cpp @@ -80,14 +80,14 @@ 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); } } diff --git a/examples/lighting-app/esp32/main/DeviceCallbacks.cpp b/examples/lighting-app/esp32/main/DeviceCallbacks.cpp index 1353598daa6554..9c1d21f03c7af6 100644 --- a/examples/lighting-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/lighting-app/esp32/main/DeviceCallbacks.cpp @@ -121,8 +121,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %u\n", static_cast(heap_caps_get_free_size(MALLOC_CAP_8BIT))); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId, endpointId, attributeId); diff --git a/examples/lighting-app/esp32/main/include/CHIPDeviceManager.h b/examples/lighting-app/esp32/main/include/CHIPDeviceManager.h index e3f71df1c84c63..a1b85d28f741dd 100644 --- a/examples/lighting-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/lighting-app/esp32/main/include/CHIPDeviceManager.h @@ -65,14 +65,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/lighting-app/esp32/main/include/DeviceCallbacks.h b/examples/lighting-app/esp32/main/include/DeviceCallbacks.h index 31ca1dfa738cd5..c6fb5ef6f0e6c6 100644 --- a/examples/lighting-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/lighting-app/esp32/main/include/DeviceCallbacks.h @@ -34,7 +34,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp index 74816f1c7106c7..b77d4b4fe1b3f1 100644 --- a/examples/lighting-app/linux/main.cpp +++ b/examples/lighting-app/linux/main.cpp @@ -41,8 +41,8 @@ Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(0, &s } // namespace #endif -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/lighting-app/mbed/main/ZclCallbacks.cpp b/examples/lighting-app/mbed/main/ZclCallbacks.cpp index 6975bc8e0916f2..1564decac4b83b 100644 --- a/examples/lighting-app/mbed/main/ZclCallbacks.cpp +++ b/examples/lighting-app/mbed/main/ZclCallbacks.cpp @@ -27,8 +27,8 @@ using namespace chip; using namespace ::chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp index 219f3f98bcf6e5..07267413a17fe4 100644 --- a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp @@ -27,8 +27,8 @@ using namespace chip; using namespace chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp index eb8e749278b314..4e8d5c5fb6cec4 100644 --- a/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/lighting-app/nxp/k32w/k32w0/main/AppTask.cpp @@ -730,8 +730,8 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg) uint8_t newValue = !LightingMgr().IsTurnedOff(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating on/off %x", status); @@ -748,8 +748,7 @@ void AppTask::UpdateDeviceStateInternal(intptr_t arg) bool onoffAttrValue = 0; /* get onoff attribute value */ - (void) emberAfReadAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, (uint8_t *) &onoffAttrValue, - 1, NULL); + (void) emberAfReadAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &onoffAttrValue, 1); /* set the device state */ sLightLED.Set(onoffAttrValue); diff --git a/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp b/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp index 6f9fa24a2a3a43..0503bd2c71b488 100644 --- a/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp +++ b/examples/lighting-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp @@ -30,8 +30,7 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { if (path.mClusterId == OnOff::Id) { diff --git a/examples/lighting-app/p6/src/AppTask.cpp b/examples/lighting-app/p6/src/AppTask.cpp index 4b6ca49942e8ec..55e2aa3ee9cd29 100644 --- a/examples/lighting-app/p6/src/AppTask.cpp +++ b/examples/lighting-app/p6/src/AppTask.cpp @@ -516,8 +516,8 @@ void AppTask::UpdateClusterState(intptr_t context) uint8_t newValue = LightMgr().IsLightOn(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { P6_LOG("ERR: updating on/off %x", status); diff --git a/examples/lighting-app/p6/src/ZclCallbacks.cpp b/examples/lighting-app/p6/src/ZclCallbacks.cpp index 9e695bb89d3aba..d67c8cc86c6597 100644 --- a/examples/lighting-app/p6/src/ZclCallbacks.cpp +++ b/examples/lighting-app/p6/src/ZclCallbacks.cpp @@ -31,8 +31,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lighting-app/python/lighting.py b/examples/lighting-app/python/lighting.py index 8de8c440d855a1..50e4d71498ccbe 100644 --- a/examples/lighting-app/python/lighting.py +++ b/examples/lighting-app/python/lighting.py @@ -177,7 +177,6 @@ def attributeChangeCallback( endpoint: int, clusterId: int, attributeId: int, - mask: int, manufacturerCode: int, xx_type: int, size: int, diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp index 53fc9639e3a643..c87e047e92b9a0 100644 --- a/examples/lighting-app/qpg/src/AppTask.cpp +++ b/examples/lighting-app/qpg/src/AppTask.cpp @@ -455,17 +455,17 @@ void AppTask::UpdateClusterState(void) ChipLogProgress(NotSpecified, "UpdateClusterState"); // write the new on/off value - newValue = LightingMgr().IsTurnedOn(); - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + newValue = LightingMgr().IsTurnedOn(); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating on/off %x", status); } newValue = LightingMgr().GetLevel(); - status = emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_INT8U_ATTRIBUTE_TYPE); + status = emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, (uint8_t *) &newValue, + ZCL_INT8U_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/lighting-app/qpg/src/ZclCallbacks.cpp b/examples/lighting-app/qpg/src/ZclCallbacks.cpp index 94c65c4e8e6eb1..ed08c83a71251c 100644 --- a/examples/lighting-app/qpg/src/ZclCallbacks.cpp +++ b/examples/lighting-app/qpg/src/ZclCallbacks.cpp @@ -32,8 +32,8 @@ using namespace ::chip; using namespace chip::app::Clusters; -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) { EndpointId endpoint = attributePath.mEndpointId; ClusterId clusterId = attributePath.mClusterId; diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp index 694f4413a49d1f..c842afe8d0fc9e 100644 --- a/examples/lighting-app/telink/src/AppTask.cpp +++ b/examples/lighting-app/telink/src/AppTask.cpp @@ -349,8 +349,8 @@ void AppTask::UpdateClusterState() uint8_t onoff = LightingMgr().IsTurnedOn(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &onoff, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, &onoff, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { LOG_ERR("Updating on/off cluster failed: %x", status); @@ -358,8 +358,8 @@ void AppTask::UpdateClusterState() uint8_t level = LightingMgr().GetLevel(); - status = emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &level, - ZCL_INT8U_ATTRIBUTE_TYPE); + status = + emberAfWriteAttribute(1, ZCL_LEVEL_CONTROL_CLUSTER_ID, ZCL_CURRENT_LEVEL_ATTRIBUTE_ID, &level, ZCL_INT8U_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { diff --git a/examples/lighting-app/telink/src/ZclCallbacks.cpp b/examples/lighting-app/telink/src/ZclCallbacks.cpp index f69006c4a1b507..2c315f8e897b17 100644 --- a/examples/lighting-app/telink/src/ZclCallbacks.cpp +++ b/examples/lighting-app/telink/src/ZclCallbacks.cpp @@ -27,8 +27,8 @@ using namespace chip; using namespace chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index b2eafabd5b293a..f3b352607c913e 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -26,8 +26,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/lock-app/cyw30739/src/ZclCallbacks.cpp b/examples/lock-app/cyw30739/src/ZclCallbacks.cpp index f258cfb718fd2e..35db42f3482d4a 100644 --- a/examples/lock-app/cyw30739/src/ZclCallbacks.cpp +++ b/examples/lock-app/cyw30739/src/ZclCallbacks.cpp @@ -39,7 +39,7 @@ void emberAfBasicClusterInitCallback(EndpointId endpoint) Basic::Attributes::ManufacturingDate::Set(endpoint, CharSpan(cString)); } -void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { diff --git a/examples/lock-app/efr32/src/ZclCallbacks.cpp b/examples/lock-app/efr32/src/ZclCallbacks.cpp index 1f8bd0600ce791..daf244afb477bf 100644 --- a/examples/lock-app/efr32/src/ZclCallbacks.cpp +++ b/examples/lock-app/efr32/src/ZclCallbacks.cpp @@ -33,8 +33,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; using namespace ::chip::DeviceLayer::Internal; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/lock-app/esp32/main/AppTask.cpp b/examples/lock-app/esp32/main/AppTask.cpp index efb179407c9594..bedaf75b6946e2 100644 --- a/examples/lock-app/esp32/main/AppTask.cpp +++ b/examples/lock-app/esp32/main/AppTask.cpp @@ -467,8 +467,8 @@ void AppTask::UpdateClusterState(chip::System::Layer *, void * context) uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { ESP_LOGI(TAG, "ERR: updating on/off %x", status); diff --git a/examples/lock-app/esp32/main/CHIPDeviceManager.cpp b/examples/lock-app/esp32/main/CHIPDeviceManager.cpp index b6d0db29573370..cda76136242f37 100644 --- a/examples/lock-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/lock-app/esp32/main/CHIPDeviceManager.cpp @@ -80,14 +80,14 @@ 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); } } diff --git a/examples/lock-app/esp32/main/DeviceCallbacks.cpp b/examples/lock-app/esp32/main/DeviceCallbacks.cpp index 00fe2a1d4928df..1d176bdb86f54c 100644 --- a/examples/lock-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/lock-app/esp32/main/DeviceCallbacks.cpp @@ -76,8 +76,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId, endpointId, attributeId); diff --git a/examples/lock-app/esp32/main/include/CHIPDeviceManager.h b/examples/lock-app/esp32/main/include/CHIPDeviceManager.h index 91d8c7c6c01d7b..e1ab643bc58ae0 100644 --- a/examples/lock-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/lock-app/esp32/main/include/CHIPDeviceManager.h @@ -66,14 +66,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/lock-app/esp32/main/include/DeviceCallbacks.h b/examples/lock-app/esp32/main/include/DeviceCallbacks.h index 7d82271389043d..f8066f6ad7ff50 100644 --- a/examples/lock-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/lock-app/esp32/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp index 24a17b8f1131a2..f29ea051eb6234 100644 --- a/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp +++ b/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp @@ -74,8 +74,8 @@ DlStatus emberAfPluginDoorLockGetSchedule(chip::EndpointId endpointId, uint8_t y return LockManager::Instance().GetSchedule(endpointId, yearDayIndex, userIndex, schedule); } -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) { // TODO: Watch for LockState, DoorState, Mode, etc changes and trigger appropriate action if (attributePath.mClusterId == DoorLock::Id) diff --git a/examples/lock-app/mbed/main/AppTask.cpp b/examples/lock-app/mbed/main/AppTask.cpp index 3386c12a0f07e9..d9fc7e6dab8a13 100644 --- a/examples/lock-app/mbed/main/AppTask.cpp +++ b/examples/lock-app/mbed/main/AppTask.cpp @@ -462,8 +462,8 @@ void AppTask::UpdateClusterState() uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ZCL update failed: %lx", status); diff --git a/examples/lock-app/mbed/main/ZclCallbacks.cpp b/examples/lock-app/mbed/main/ZclCallbacks.cpp index 9a3db78220904e..a985d9f4999afc 100644 --- a/examples/lock-app/mbed/main/ZclCallbacks.cpp +++ b/examples/lock-app/mbed/main/ZclCallbacks.cpp @@ -27,8 +27,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp index db0bd22a6dd5fb..b56d6aa8ee8888 100644 --- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp @@ -31,8 +31,8 @@ using namespace ::chip::app::Clusters::DoorLock; LOG_MODULE_DECLARE(app, CONFIG_MATTER_LOG_LEVEL); -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) { VerifyOrReturn(attributePath.mClusterId == DoorLock::Id && attributePath.mAttributeId == DoorLock::Attributes::LockState::Id); diff --git a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp index ffb3a268d38ee4..2572cdd35a2698 100644 --- a/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp +++ b/examples/lock-app/nxp/k32w/k32w0/main/AppTask.cpp @@ -732,8 +732,8 @@ void AppTask::UpdateClusterStateInternal(intptr_t arg) uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating on/off %x", status); diff --git a/examples/lock-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp b/examples/lock-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp index 00df11a048932a..2ce2fe1c3056c1 100644 --- a/examples/lock-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp +++ b/examples/lock-app/nxp/k32w/k32w0/main/ZclCallbacks.cpp @@ -30,8 +30,7 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { if (path.mClusterId != OnOff::Id) { diff --git a/examples/lock-app/p6/src/AppTask.cpp b/examples/lock-app/p6/src/AppTask.cpp index c3ef7066f1d2c8..3dbff0e7d47b03 100644 --- a/examples/lock-app/p6/src/AppTask.cpp +++ b/examples/lock-app/p6/src/AppTask.cpp @@ -502,8 +502,8 @@ void AppTask::UpdateCluster(intptr_t context) uint8_t newValue = !BoltLockMgr().IsUnlocked(); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, &newValue, - ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { P6_LOG("ERR: updating on/off %x", status); diff --git a/examples/lock-app/p6/src/ZclCallbacks.cpp b/examples/lock-app/p6/src/ZclCallbacks.cpp index 777e788bb130a1..dd90025ccfe234 100644 --- a/examples/lock-app/p6/src/ZclCallbacks.cpp +++ b/examples/lock-app/p6/src/ZclCallbacks.cpp @@ -32,8 +32,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/lock-app/qpg/src/AppTask.cpp b/examples/lock-app/qpg/src/AppTask.cpp index 4f24d2e7e4f9f5..50dc8a0ef2e452 100644 --- a/examples/lock-app/qpg/src/AppTask.cpp +++ b/examples/lock-app/qpg/src/AppTask.cpp @@ -518,8 +518,8 @@ void AppTask::UpdateClusterState(void) ChipLogProgress(NotSpecified, "UpdateClusterState"); // write the new on/off value - EmberAfStatus status = emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, - (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); + EmberAfStatus status = + emberAfWriteAttribute(1, ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, (uint8_t *) &newValue, ZCL_BOOLEAN_ATTRIBUTE_TYPE); if (status != EMBER_ZCL_STATUS_SUCCESS) { ChipLogError(NotSpecified, "ERR: updating on/off %x", status); diff --git a/examples/lock-app/qpg/src/ZclCallbacks.cpp b/examples/lock-app/qpg/src/ZclCallbacks.cpp index f30f69192821d1..ef68ea5b933c39 100644 --- a/examples/lock-app/qpg/src/ZclCallbacks.cpp +++ b/examples/lock-app/qpg/src/ZclCallbacks.cpp @@ -28,8 +28,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp b/examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp index add55587dd3eb7..1dec61ef5c8d57 100644 --- a/examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/ota-provider-app/esp32/main/CHIPDeviceManager.cpp @@ -80,13 +80,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/ota-provider-app/esp32/main/DeviceCallbacks.cpp b/examples/ota-provider-app/esp32/main/DeviceCallbacks.cpp index 043d452011e7a4..83174c06e1c17a 100644 --- a/examples/ota-provider-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/ota-provider-app/esp32/main/DeviceCallbacks.cpp @@ -64,8 +64,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '" ChipLogFormatMEI diff --git a/examples/ota-provider-app/esp32/main/include/CHIPDeviceManager.h b/examples/ota-provider-app/esp32/main/include/CHIPDeviceManager.h index ee424b366df1b8..6d8524733c3bfd 100644 --- a/examples/ota-provider-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/ota-provider-app/esp32/main/include/CHIPDeviceManager.h @@ -67,14 +67,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/ota-provider-app/esp32/main/include/DeviceCallbacks.h b/examples/ota-provider-app/esp32/main/include/DeviceCallbacks.h index d94560b8448d86..9993310d25e8fc 100644 --- a/examples/ota-provider-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/ota-provider-app/esp32/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp b/examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp index b89a57c08a8d39..4c1b55fbddb9fc 100644 --- a/examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp +++ b/examples/ota-requestor-app/ameba/main/CHIPDeviceManager.cpp @@ -80,13 +80,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp index 5ff6b6713d4ed3..31b18003d65e05 100644 --- a/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp +++ b/examples/ota-requestor-app/ameba/main/DeviceCallbacks.cpp @@ -77,8 +77,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ } } -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) { switch (clusterId) { diff --git a/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h b/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h index 97002717225d1a..4a4efd1d4d39dd 100644 --- a/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h +++ b/examples/ota-requestor-app/ameba/main/include/CHIPDeviceManager.h @@ -67,14 +67,13 @@ class CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/ota-requestor-app/ameba/main/include/DeviceCallbacks.h b/examples/ota-requestor-app/ameba/main/include/DeviceCallbacks.h index 10ac917c02890a..003b6e700db0eb 100644 --- a/examples/ota-requestor-app/ameba/main/include/DeviceCallbacks.h +++ b/examples/ota-requestor-app/ameba/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg) override; void PostAttributeChangeCallback(chip::EndpointId endpointId, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint8_t type, uint16_t size, uint8_t * value) override; + uint8_t type, uint16_t size, uint8_t * value) override; private: void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event); diff --git a/examples/ota-requestor-app/efr32/src/ZclCallbacks.cpp b/examples/ota-requestor-app/efr32/src/ZclCallbacks.cpp index 8ceba598204e91..cfbcbc8a191411 100644 --- a/examples/ota-requestor-app/efr32/src/ZclCallbacks.cpp +++ b/examples/ota-requestor-app/efr32/src/ZclCallbacks.cpp @@ -31,8 +31,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp b/examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp index add55587dd3eb7..1dec61ef5c8d57 100644 --- a/examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/ota-requestor-app/esp32/main/CHIPDeviceManager.cpp @@ -80,13 +80,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/ota-requestor-app/esp32/main/DeviceCallbacks.cpp b/examples/ota-requestor-app/esp32/main/DeviceCallbacks.cpp index 6807e16cde0bb9..4daa73dd48a00b 100644 --- a/examples/ota-requestor-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/ota-requestor-app/esp32/main/DeviceCallbacks.cpp @@ -66,8 +66,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '" ChipLogFormatMEI diff --git a/examples/ota-requestor-app/esp32/main/include/CHIPDeviceManager.h b/examples/ota-requestor-app/esp32/main/include/CHIPDeviceManager.h index ee424b366df1b8..6d8524733c3bfd 100644 --- a/examples/ota-requestor-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/ota-requestor-app/esp32/main/include/CHIPDeviceManager.h @@ -67,14 +67,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/ota-requestor-app/esp32/main/include/DeviceCallbacks.h b/examples/ota-requestor-app/esp32/main/include/DeviceCallbacks.h index d94560b8448d86..9993310d25e8fc 100644 --- a/examples/ota-requestor-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/ota-requestor-app/esp32/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/ota-requestor-app/p6/src/ZclCallbacks.cpp b/examples/ota-requestor-app/p6/src/ZclCallbacks.cpp index 220ac02fc40ddf..eca4602def88e9 100644 --- a/examples/ota-requestor-app/p6/src/ZclCallbacks.cpp +++ b/examples/ota-requestor-app/p6/src/ZclCallbacks.cpp @@ -33,8 +33,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { EndpointId endpoint = attributePath.mEndpointId; ClusterId clusterId = attributePath.mClusterId; diff --git a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 4575ee2d2ace0b..0724c78284b479 100644 --- a/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/pump-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -29,8 +29,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp b/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp index 05271e58ff5687..49ec8f15946d77 100644 --- a/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/pump-app/nrfconnect/main/ZclCallbacks.cpp @@ -25,8 +25,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 96d30c06d5f481..9dfc7e22e76687 100644 --- a/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/pump-controller-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -29,8 +29,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp b/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp index 05271e58ff5687..49ec8f15946d77 100644 --- a/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/pump-controller-app/nrfconnect/main/ZclCallbacks.cpp @@ -25,8 +25,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp b/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp index 665bb9f6b5133e..526b3cd3bea937 100644 --- a/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp @@ -83,13 +83,12 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace DeviceManager } // namespace chip -void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t mask, uint8_t type, uint16_t size, - uint8_t * value) +void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & path, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); if (cb != nullptr) { - cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, mask, type, size, value); + cb->PostAttributeChangeCallback(path.mEndpointId, path.mClusterId, path.mAttributeId, type, size, value); } } diff --git a/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp b/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp index b5ddca53ade197..80c2320c26781a 100644 --- a/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp @@ -72,8 +72,8 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ ESP_LOGI(TAG, "Current free heap: %d\n", heap_caps_get_free_size(MALLOC_CAP_8BIT)); } -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) { ESP_LOGI(TAG, "PostAttributeChangeCallback - Cluster ID: '0x%04x', EndPoint ID: '0x%02x', Attribute ID: '0x%04x'", clusterId, endpointId, attributeId); diff --git a/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h b/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h index 95e3a7c09ecd3c..4d583571762391 100644 --- a/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h @@ -67,14 +67,13 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param endpoint endpoint id * @param clusterID cluster id * @param attributeId attribute id that was changed - * @param mask mask of the attribute * @param manufacturerCode manufacturer code * @param type attribute type * @param size size of the attribute * @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) {} virtual ~CHIPDeviceManagerCallbacks() {} }; diff --git a/examples/temperature-measurement-app/esp32/main/include/DeviceCallbacks.h b/examples/temperature-measurement-app/esp32/main/include/DeviceCallbacks.h index d94560b8448d86..9993310d25e8fc 100644 --- a/examples/temperature-measurement-app/esp32/main/include/DeviceCallbacks.h +++ b/examples/temperature-measurement-app/esp32/main/include/DeviceCallbacks.h @@ -35,7 +35,7 @@ class DeviceCallbacks : public chip::DeviceManager::CHIPDeviceManagerCallbacks public: virtual void DeviceEventCallback(const chip::DeviceLayer::ChipDeviceEvent * event, intptr_t arg); 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); diff --git a/examples/tv-app/android/java/ClusterChangeAttribute.cpp b/examples/tv-app/android/java/ClusterChangeAttribute.cpp index da264151f07b62..c5c9971691f765 100644 --- a/examples/tv-app/android/java/ClusterChangeAttribute.cpp +++ b/examples/tv-app/android/java/ClusterChangeAttribute.cpp @@ -26,7 +26,7 @@ using namespace chip; using namespace ::chip::app::Clusters; -void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) diff --git a/examples/tv-app/linux/ZclCallbacks.cpp b/examples/tv-app/linux/ZclCallbacks.cpp index e17a2f30073112..0fe95c9aef6642 100644 --- a/examples/tv-app/linux/ZclCallbacks.cpp +++ b/examples/tv-app/linux/ZclCallbacks.cpp @@ -28,8 +28,8 @@ using namespace ::chip; using namespace ::chip::app::Clusters; -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) { ClusterId clusterId = attributePath.mClusterId; AttributeId attributeId = attributePath.mAttributeId; diff --git a/examples/tv-app/linux/include/cluster-change-attribute.cpp b/examples/tv-app/linux/include/cluster-change-attribute.cpp index b82682e4ea9e9f..0a6c8deca6969c 100644 --- a/examples/tv-app/linux/include/cluster-change-attribute.cpp +++ b/examples/tv-app/linux/include/cluster-change-attribute.cpp @@ -46,8 +46,8 @@ void runTvCommand(TvCommand command) } } -void MatterAfPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, - uint16_t size, uint8_t * value) +void MatterAfPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, + uint8_t * value) { if (attributePath.mClusterId == OnOff::Id && attributePath.mAttributeId == OnOff::Attributes::OnOff::Id) { diff --git a/examples/window-app/common/src/ZclCallbacks.cpp b/examples/window-app/common/src/ZclCallbacks.cpp index db39b0e7ec6ed0..ae2416576bb009 100644 --- a/examples/window-app/common/src/ZclCallbacks.cpp +++ b/examples/window-app/common/src/ZclCallbacks.cpp @@ -37,7 +37,7 @@ using namespace ::chip; using namespace ::chip::app::Clusters::WindowCovering; -void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +void MatterPostAttributeChangeCallback(const app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { switch (attributePath.mClusterId) diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index 55acf477b6694b..2d214b197f2384 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -29,8 +29,7 @@ #include -extern bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - bool asServer); +extern bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId); namespace chip { namespace app { @@ -866,7 +865,7 @@ void InteractionModelEngine::RemoveDuplicateConcreteAttributePath(ObjectListmValue.IsWildcardPath() || - !emberAfContainsAttribute(path1->mValue.mEndpointId, path1->mValue.mClusterId, path1->mValue.mAttributeId, true)) + !emberAfContainsAttribute(path1->mValue.mEndpointId, path1->mValue.mClusterId, path1->mValue.mAttributeId)) { prev = path1; path1 = path1->mpNext; diff --git a/src/app/clusters/ias-zone-server/ias-zone-server.cpp b/src/app/clusters/ias-zone-server/ias-zone-server.cpp index a14c8d13176f74..cee9b1d3275b7f 100644 --- a/src/app/clusters/ias-zone-server/ias-zone-server.cpp +++ b/src/app/clusters/ias-zone-server/ias-zone-server.cpp @@ -560,7 +560,7 @@ void emberAfIasZoneClusterServerInitCallback(EndpointId endpoint) #endif zoneType = (EmberAfIasZoneType) EMBER_AF_PLUGIN_IAS_ZONE_SERVER_ZONE_TYPE; - emberAfWriteAttribute(endpoint, ZCL_IAS_ZONE_CLUSTER_ID, ZCL_ZONE_TYPE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, (uint8_t *) &zoneType, + emberAfWriteAttribute(endpoint, ZCL_IAS_ZONE_CLUSTER_ID, ZCL_ZONE_TYPE_ATTRIBUTE_ID, (uint8_t *) &zoneType, ZCL_INT16U_ATTRIBUTE_TYPE); emberAfPluginIasZoneServerUpdateZoneStatus(endpoint, @@ -590,10 +590,10 @@ uint8_t emberAfPluginIasZoneServerGetZoneId(EndpointId endpoint) //------------------------------------------------------------------------------ static bool areZoneServerAttributesNonVolatile(EndpointId endpoint) { - if (!emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::IasCieAddress::Id, true) || - !emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneState::Id, true) || - !emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneType::Id, true) || - !emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneId::Id, true)) + if (!emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::IasCieAddress::Id) || + !emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneState::Id) || + !emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneType::Id) || + !emberAfIsNonVolatileAttribute(endpoint, IasZone::Id, Attributes::ZoneId::Id)) { return false; } diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index 1841085c790f2d..af820270fe4864 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -156,7 +156,7 @@ static void reallyUpdateCoupledColorTemp(EndpointId endpoint) return; } - if (emberAfContainsAttribute(endpoint, ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, true)) + if (emberAfContainsAttribute(endpoint, ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id)) { if (READBITS(options, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL)) { @@ -278,7 +278,7 @@ void emberAfLevelControlClusterServerTickCallback(EndpointId endpoint) static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs) { #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_LEVEL_CONTROL_REMAINING_TIME - if (emberAfContainsAttribute(endpoint, LevelControl::Id, LevelControl::Attributes::RemainingTime::Id, true)) + if (emberAfContainsAttribute(endpoint, LevelControl::Id, LevelControl::Attributes::RemainingTime::Id)) { // Convert milliseconds to tenths of a second, rounding any fractional value // up to the nearest whole value. This means: @@ -319,7 +319,7 @@ static void setOnOffValue(EndpointId endpoint, bool onOff) static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, uint8_t optionMask, uint8_t optionOverride) { #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS - if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::Options::Id, true)) + if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::Options::Id)) { // From 3.10.2.2.8.1 of ZCL7 document 14-0127-20j-zcl-ch-3-general.docx: // "Command execution SHALL NOT continue beyond the Options processing if @@ -583,7 +583,7 @@ static EmberAfStatus moveToLevelHandler(EndpointId endpoint, CommandId commandId if (transitionTimeDs == 0xFFFF) { #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_ON_OFF_TRANSITION_TIME - if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::OnOffTransitionTime::Id, true)) + if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::OnOffTransitionTime::Id)) { status = Attributes::OnOffTransitionTime::Get(endpoint, &transitionTimeDs); if (status != EMBER_ZCL_STATUS_SUCCESS) @@ -930,7 +930,7 @@ void emberAfOnOffClusterLevelControlEffectCallback(EndpointId endpoint, bool new // Read the OnLevel attribute. #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_ON_LEVEL_ATTRIBUTE - if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::OnLevel::Id, true)) + if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::OnLevel::Id)) { status = Attributes::OnLevel::Get(endpoint, resolvedLevel); if (status != EMBER_ZCL_STATUS_SUCCESS) @@ -955,7 +955,7 @@ void emberAfOnOffClusterLevelControlEffectCallback(EndpointId endpoint, bool new // Read the OnOffTransitionTime attribute. #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_ON_OFF_TRANSITION_TIME - if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::OnOffTransitionTime::Id, true)) + if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::OnOffTransitionTime::Id)) { status = Attributes::OnOffTransitionTime::Get(endpoint, ¤tOnOffTransitionTime); if (status != EMBER_ZCL_STATUS_SUCCESS) @@ -1108,9 +1108,9 @@ void emberAfLevelControlClusterServerInitCallback(EndpointId endpoint) #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_START_UP_CURRENT_LEVEL static bool areStartUpLevelControlServerAttributesNonVolatile(EndpointId endpoint) { - if (emberAfIsNonVolatileAttribute(endpoint, LevelControl::Id, Attributes::CurrentLevel::Id, true)) + if (emberAfIsNonVolatileAttribute(endpoint, LevelControl::Id, Attributes::CurrentLevel::Id)) { - return emberAfIsNonVolatileAttribute(endpoint, LevelControl::Id, Attributes::StartUpCurrentLevel::Id, true); + return emberAfIsNonVolatileAttribute(endpoint, LevelControl::Id, Attributes::StartUpCurrentLevel::Id); } return false; diff --git a/src/app/clusters/mode-select-server/mode-select-server.cpp b/src/app/clusters/mode-select-server/mode-select-server.cpp index b53174d0cf9676..adee979e052911 100644 --- a/src/app/clusters/mode-select-server/mode-select-server.cpp +++ b/src/app/clusters/mode-select-server/mode-select-server.cpp @@ -141,13 +141,13 @@ void emberAfModeSelectClusterServerInitCallback(EndpointId endpointId) // value of On (turn on at power up), then the CurrentMode attribute SHALL be set to the OnMode attribute // value when the server is supplied with power, except if the OnMode attribute is null. if (emberAfContainsServer(endpointId, OnOff::Id) && - emberAfContainsAttribute(endpointId, OnOff::Id, OnOff::Attributes::StartUpOnOff::Id, true) && - emberAfContainsAttribute(endpointId, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, true)) + emberAfContainsAttribute(endpointId, OnOff::Id, OnOff::Attributes::StartUpOnOff::Id) && + emberAfContainsAttribute(endpointId, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id)) { Attributes::OnMode::TypeInfo::Type onMode; bool onOffValueForStartUp = 0; if (Attributes::OnMode::Get(endpointId, onMode) == EMBER_ZCL_STATUS_SUCCESS && - emberAfIsNonVolatileAttribute(endpointId, OnOff::Id, OnOff::Attributes::StartUpOnOff::Id, true) && + emberAfIsNonVolatileAttribute(endpointId, OnOff::Id, OnOff::Attributes::StartUpOnOff::Id) && OnOffServer::Instance().getOnOffValueForStartUp(endpointId, onOffValueForStartUp) == EMBER_ZCL_STATUS_SUCCESS) { if (onOffValueForStartUp && !onMode.IsNull()) @@ -189,8 +189,8 @@ namespace { */ inline bool areStartUpModeAndCurrentModeNonVolatile(EndpointId endpointId) { - return emberAfIsNonVolatileAttribute(endpointId, ModeSelect::Id, Attributes::CurrentMode::Id, true) && - emberAfIsNonVolatileAttribute(endpointId, ModeSelect::Id, Attributes::StartUpMode::Id, true); + return emberAfIsNonVolatileAttribute(endpointId, ModeSelect::Id, Attributes::CurrentMode::Id) && + emberAfIsNonVolatileAttribute(endpointId, ModeSelect::Id, Attributes::StartUpMode::Id); } } // namespace diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index 96ccf644d89e2e..305da0bafff1e3 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -184,7 +184,7 @@ EmberAfStatus OnOffServer::setOnOffValue(chip::EndpointId endpoint, uint8_t comm #ifdef EMBER_AF_PLUGIN_MODE_SELECT // If OnMode is not a null value, then change the current mode to it. if (emberAfContainsServer(endpoint, ModeSelect::Id) && - emberAfContainsAttribute(endpoint, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, true)) + emberAfContainsAttribute(endpoint, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id)) { ModeSelect::Attributes::OnMode::TypeInfo::Type onMode; if (ModeSelect::Attributes::OnMode::Get(endpoint, onMode) == EMBER_ZCL_STATUS_SUCCESS && !onMode.IsNull()) @@ -270,7 +270,7 @@ void OnOffServer::initOnOffServer(chip::EndpointId endpoint) #ifdef EMBER_AF_PLUGIN_MODE_SELECT // If OnMode is not a null value, then change the current mode to it. if (onOffValueForStartUp && emberAfContainsServer(endpoint, ModeSelect::Id) && - emberAfContainsAttribute(endpoint, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, true)) + emberAfContainsAttribute(endpoint, ModeSelect::Id, ModeSelect::Attributes::OnMode::Id)) { ModeSelect::Attributes::OnMode::TypeInfo::Type onMode; if (ModeSelect::Attributes::OnMode::Get(endpoint, onMode) == EMBER_ZCL_STATUS_SUCCESS && !onMode.IsNull()) @@ -584,9 +584,9 @@ void OnOffServer::updateOnOffTimeCommand(chip::EndpointId endpoint) #ifndef IGNORE_ON_OFF_CLUSTER_START_UP_ON_OFF bool OnOffServer::areStartUpOnOffServerAttributesNonVolatile(EndpointId endpoint) { - if (emberAfIsNonVolatileAttribute(endpoint, OnOff::Id, Attributes::OnOff::Id, true)) + if (emberAfIsNonVolatileAttribute(endpoint, OnOff::Id, Attributes::OnOff::Id)) { - return emberAfIsNonVolatileAttribute(endpoint, OnOff::Id, Attributes::StartUpOnOff::Id, true); + return emberAfIsNonVolatileAttribute(endpoint, OnOff::Id, Attributes::StartUpOnOff::Id); } return false; diff --git a/src/app/reporting/reporting.h b/src/app/reporting/reporting.h index 31b6dc9a99b1dd..f2eaab432cb56c 100644 --- a/src/app/reporting/reporting.h +++ b/src/app/reporting/reporting.h @@ -50,7 +50,7 @@ * notification to inform its reporting decisions. */ void MatterReportingAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, EmberAfAttributeType type, uint8_t * data); + EmberAfAttributeType type, uint8_t * data); /* * Same but with just an attribute path and no data available. diff --git a/src/app/util/af.h b/src/app/util/af.h index 62260001a9c47c..2575116f71df13 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -145,37 +145,14 @@ bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId) * over the air. Because this function is being called locally * it assumes that the device knows what it is doing and has permission * to perform the given operation. - * - * @see emberAfWriteClientAttribute, emberAfWriteServerAttribute, */ -EmberAfStatus emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, +EmberAfStatus emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * dataPtr, EmberAfAttributeType dataType); -/** - * @brief write a cluster server attribute. - * - * This function is the same as emberAfWriteAttribute - * except that it saves having to pass the cluster mask. - * This is useful for code savings since write attribute - * is used frequently throughout the framework - * - * @see emberAfWriteClientAttribute, - */ -EmberAfStatus emberAfWriteServerAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t * dataPtr, EmberAfAttributeType dataType); - -/** - * @brief write a cluster client attribute. - * - * This function is the same as emberAfWriteAttribute - * except that it saves having to pass the cluster mask. - * This is useful for code savings since write attribute - * is used frequently throughout the framework - * - * @see emberAfWriteServerAttribute, - */ -EmberAfStatus emberAfWriteClientAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t * dataPtr, EmberAfAttributeType dataType); +// For now, just define emberAfWriteServerAttribute to emberAfWriteAttribute, to +// minimize code churn. +// TODO: Remove this define. +#define emberAfWriteServerAttribute emberAfWriteAttribute /** * @brief Function that test the success of attribute write. @@ -187,51 +164,28 @@ EmberAfStatus emberAfWriteClientAttribute(chip::EndpointId endpoint, chip::Clust * @param endpoint Zigbee endpoint number * @param cluster Cluster ID of the sought cluster. * @param attributeID Attribute ID of the sought attribute. - * @param mask CLUSTER_MASK_SERVER or CLUSTER_MASK_CLIENT * @param dataPtr Location where attribute will be written from. * @param dataType ZCL attribute type. */ EmberAfStatus emberAfVerifyAttributeWrite(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t mask, uint8_t * dataPtr, EmberAfAttributeType dataType); + uint8_t * dataPtr, EmberAfAttributeType dataType); /** * @brief Read the attribute value, performing all the checks. * - * This function will attempt to read the attribute and store - * it into the pointer. It will also read the data type. - * Both dataPtr and dataType may be NULL, signifying that either - * value or type is not desired. + * This function will attempt to read the attribute and store it into the + * pointer. * - * @see emberAfReadClientAttribute, emberAfReadServerAttribute, + * dataPtr may be NULL, signifying that we don't need the value, just the status + * (i.e. whether the attribute can be read). */ -EmberAfStatus emberAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, - uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType); +EmberAfStatus emberAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, + uint8_t * dataPtr, uint16_t readLength); -/** - * @brief Read the server attribute value, performing all the checks. - * - * This function will attempt to read the attribute and store - * it into the pointer. It will also read the data type. - * Both dataPtr and dataType may be NULL, signifying that either - * value or type is not desired. - * - * @see emberAfReadClientAttribute, - */ -EmberAfStatus emberAfReadServerAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t * dataPtr, uint16_t readLength); - -/** - * @brief Read the client attribute value, performing all the checks. - * - * This function will attempt to read the attribute and store - * it into the pointer. It will also read the data type. - * Both dataPtr and dataType may be NULL, signifying that either - * value or type is not desired. - * - * @see emberAfReadServerAttribute, - */ -EmberAfStatus emberAfReadClientAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t * dataPtr, uint16_t readLength); +// For now, just define emberAfReadServerAttribute to emberAfReadAttribute, to +// minimize code churn. +// TODO: Remove this define. +#define emberAfReadServerAttribute emberAfReadAttribute /** * @brief this function returns the size of the ZCL data in bytes. diff --git a/src/app/util/attribute-storage.cpp b/src/app/util/attribute-storage.cpp index 88c2e2dc575fcd..c31603314d2118 100644 --- a/src/app/util/attribute-storage.cpp +++ b/src/app/util/attribute-storage.cpp @@ -349,9 +349,9 @@ void emberAfClusterMessageSentCallback(const MessageSendDestination & destinatio } // This function is used to call the per-cluster attribute changed callback -void emAfClusterAttributeChangedCallback(const app::ConcreteAttributePath & attributePath, uint8_t clientServerMask) +void emAfClusterAttributeChangedCallback(const app::ConcreteAttributePath & attributePath) { - const EmberAfCluster * cluster = emberAfFindCluster(attributePath.mEndpointId, attributePath.mClusterId, clientServerMask); + const EmberAfCluster * cluster = emberAfFindCluster(attributePath.mEndpointId, attributePath.mClusterId, CLUSTER_MASK_SERVER); if (cluster != nullptr) { EmberAfGenericClusterFunction f = emberAfFindClusterFunction(cluster, CLUSTER_MASK_ATTRIBUTE_CHANGED_FUNCTION); @@ -363,10 +363,10 @@ void emAfClusterAttributeChangedCallback(const app::ConcreteAttributePath & attr } // This function is used to call the per-cluster pre-attribute changed callback -EmberAfStatus emAfClusterPreAttributeChangedCallback(const app::ConcreteAttributePath & attributePath, uint8_t clientServerMask, +EmberAfStatus emAfClusterPreAttributeChangedCallback(const app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value) { - const EmberAfCluster * cluster = emberAfFindCluster(attributePath.mEndpointId, attributePath.mClusterId, clientServerMask); + const EmberAfCluster * cluster = emberAfFindCluster(attributePath.mEndpointId, attributePath.mClusterId, CLUSTER_MASK_SERVER); if (cluster == nullptr) { return EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE; diff --git a/src/app/util/attribute-storage.h b/src/app/util/attribute-storage.h index 63910f516bd475..0aaab4a9e6efb2 100644 --- a/src/app/util/attribute-storage.h +++ b/src/app/util/attribute-storage.h @@ -205,12 +205,11 @@ void emAfSaveAttributeToStorageIfNeeded(uint8_t * data, chip::EndpointId endpoin const EmberAfAttributeMetadata * metadata); // Calls the attribute changed callback -void emAfClusterAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t clientServerMask); +void emAfClusterAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); // Calls the attribute changed callback for a specific cluster. EmberAfStatus emAfClusterPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - uint8_t clientServerMask, EmberAfAttributeType attributeType, uint16_t size, - uint8_t * value); + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); // Calls the default response callback for a specific cluster. // with the EMBER_NULL_MANUFACTURER_CODE diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp index 4bbf7889cce0dd..8f2c9aaa70e65b 100644 --- a/src/app/util/attribute-table.cpp +++ b/src/app/util/attribute-table.cpp @@ -67,73 +67,44 @@ using namespace chip; //------------------------------------------------------------------------------ // Globals -EmberAfStatus emberAfWriteAttributeExternal(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, - uint8_t * dataPtr, EmberAfAttributeType dataType) +EmberAfStatus emberAfWriteAttributeExternal(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, + EmberAfAttributeType dataType) { EmberAfAttributeWritePermission extWritePermission = - emberAfAllowNetworkWriteAttributeCallback(endpoint, cluster, attributeID, mask, dataPtr, dataType); + emberAfAllowNetworkWriteAttributeCallback(endpoint, cluster, attributeID, dataPtr, dataType); switch (extWritePermission) { case EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_DENY_WRITE: return EMBER_ZCL_STATUS_FAILURE; case EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL: case EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY: - return emAfWriteAttribute(endpoint, cluster, attributeID, mask, dataPtr, dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, (extWritePermission == EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY), false); default: return (EmberAfStatus) extWritePermission; } } -//@deprecated use emberAfWriteServerAttribute or emberAfWriteClientAttribute -EmberAfStatus emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, - uint8_t * dataPtr, EmberAfAttributeType dataType) +EmberAfStatus emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, + EmberAfAttributeType dataType) { - return emAfWriteAttribute(endpoint, cluster, attributeID, mask, dataPtr, dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, true, // override read-only? false); // just test? } -EmberAfStatus emberAfWriteClientAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, +EmberAfStatus emberAfVerifyAttributeWrite(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, EmberAfAttributeType dataType) { - return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, dataPtr, dataType, - true, // override read-only? - false); // just test? -} - -EmberAfStatus emberAfWriteServerAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, - EmberAfAttributeType dataType) -{ - return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_SERVER, dataPtr, dataType, - true, // override read-only? - false); // just test? -} - -EmberAfStatus emberAfVerifyAttributeWrite(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, - uint8_t * dataPtr, EmberAfAttributeType dataType) -{ - return emAfWriteAttribute(endpoint, cluster, attributeID, mask, dataPtr, dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, dataPtr, dataType, false, // override read-only? true); // just test? } -EmberAfStatus emberAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, - uint16_t readLength, EmberAfAttributeType * dataType) +EmberAfStatus emberAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, + uint16_t readLength) { - return emAfReadAttribute(endpoint, cluster, attributeID, mask, dataPtr, readLength, dataType); -} - -EmberAfStatus emberAfReadServerAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, - uint16_t readLength) -{ - return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_SERVER, dataPtr, readLength, nullptr); -} - -EmberAfStatus emberAfReadClientAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, - uint16_t readLength) -{ - return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, dataPtr, readLength, nullptr); + return emAfReadAttribute(endpoint, cluster, attributeID, dataPtr, readLength, nullptr); } static void emberAfAttributeDecodeAndPrintCluster(ClusterId cluster) @@ -182,8 +153,8 @@ void emberAfPrintAttributeTable(void) (metaData->IsReadOnly() ? "RO" : "RW"), (metaData->IsNonVolatile() ? " nonvolatile " : (metaData->IsExternal() ? " extern " : " RAM "))); emberAfAttributesFlush(); - status = emAfReadAttribute(ep->endpoint, cluster->clusterId, metaData->attributeId, CLUSTER_MASK_SERVER, data, - ATTRIBUTE_LARGEST, nullptr); + status = + emAfReadAttribute(ep->endpoint, cluster->clusterId, metaData->attributeId, data, ATTRIBUTE_LARGEST, nullptr); if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { emberAfAttributesPrintln("Unsupported"); @@ -294,14 +265,9 @@ static bool IsNullValue(const uint8_t * data, uint16_t dataLen, bool isAttribute // the table or the data is too large, returns true and writes to dataPtr // if the attribute is supported and the readLength specified is less than // the length of the data. -EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * data, +EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * data, EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, bool justTest) { - if (mask != CLUSTER_MASK_SERVER) - { - return EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE; - } - const EmberAfAttributeMetadata * metadata = nullptr; EmberAfAttributeSearchRecord record; record.endpoint = endpoint; @@ -387,7 +353,7 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu // Pre write attribute callback for all attribute changes, // regardless of cluster. Protocols::InteractionModel::Status imStatus = - MatterPreAttributeChangeCallback(attributePath, mask, dataType, emberAfAttributeSize(metadata), data); + MatterPreAttributeChangeCallback(attributePath, dataType, emberAfAttributeSize(metadata), data); if (imStatus != Protocols::InteractionModel::Status::Success) { return app::ToEmberAfStatus(imStatus); @@ -396,7 +362,7 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu // Pre-write attribute callback specific // to the cluster that the attribute lives in. EmberAfStatus status = - emAfClusterPreAttributeChangedCallback(attributePath, mask, dataType, emberAfAttributeSize(metadata), data); + emAfClusterPreAttributeChangedCallback(attributePath, dataType, emberAfAttributeSize(metadata), data); if (status != EMBER_ZCL_STATUS_SUCCESS) { return status; @@ -418,15 +384,15 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu // The callee will weed out attributes that do not need to be stored. emAfSaveAttributeToStorageIfNeeded(data, endpoint, cluster, metadata); - MatterReportingAttributeChangeCallback(endpoint, cluster, attributeID, mask, dataType, data); + MatterReportingAttributeChangeCallback(endpoint, cluster, attributeID, dataType, data); // Post write attribute callback for all attributes changes, regardless // of cluster. - MatterPostAttributeChangeCallback(attributePath, mask, dataType, emberAfAttributeSize(metadata), data); + MatterPostAttributeChangeCallback(attributePath, dataType, emberAfAttributeSize(metadata), data); // Post-write attribute callback specific // to the cluster that the attribute lives in. - emAfClusterAttributeChangedCallback(attributePath, mask); + emAfClusterAttributeChangedCallback(attributePath); } else { @@ -443,14 +409,9 @@ EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attribu // If dataPtr is NULL, no data is copied to the caller. // readLength should be 0 in that case. -EmberAfStatus emAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, +EmberAfStatus emAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType) { - if (mask != CLUSTER_MASK_SERVER) - { - return EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE; - } - const EmberAfAttributeMetadata * metadata = nullptr; EmberAfAttributeSearchRecord record; EmberAfStatus status; diff --git a/src/app/util/attribute-table.h b/src/app/util/attribute-table.h index fbae46ac559be6..9090ad7098067b 100644 --- a/src/app/util/attribute-table.h +++ b/src/app/util/attribute-table.h @@ -47,12 +47,12 @@ // Remote devices writing attributes of local device EmberAfStatus emberAfWriteAttributeExternal(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t mask, uint8_t * dataPtr, EmberAfAttributeType dataType); + uint8_t * dataPtr, EmberAfAttributeType dataType); void emberAfPrintAttributeTable(void); -EmberAfStatus emAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, - uint8_t * data, EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, bool justTest); +EmberAfStatus emAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * data, + EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, bool justTest); -EmberAfStatus emAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, +EmberAfStatus emAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType); diff --git a/src/app/util/ember-compatibility-functions.cpp b/src/app/util/ember-compatibility-functions.cpp index 2c0b960970fea0..6e0e721a6fae6f 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -1037,8 +1037,7 @@ CHIP_ERROR WriteSingleClusterData(const SubjectDescriptor & aSubjectDescriptor, } auto status = ToInteractionModelStatus(emberAfWriteAttributeExternal(aPath.mEndpointId, aPath.mClusterId, aPath.mAttributeId, - CLUSTER_MASK_SERVER, attributeData, - attributeMetadata->attributeType)); + attributeData, attributeMetadata->attributeType)); return apWriteHandler->AddStatus(aPath, status); } @@ -1078,12 +1077,11 @@ bool IsDeviceTypeOnEndpoint(DeviceTypeId deviceType, EndpointId endpoint) } // namespace app } // namespace chip -void MatterReportingAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, +void MatterReportingAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, EmberAfAttributeType type, uint8_t * data) { IgnoreUnusedVariable(type); IgnoreUnusedVariable(data); - IgnoreUnusedVariable(mask); MatterReportingAttributeChangeCallback(endpoint, clusterId, attributeId); } diff --git a/src/app/util/mock/attribute-storage.cpp b/src/app/util/mock/attribute-storage.cpp index 93c4dde20e76aa..d4a9cddace1bb2 100644 --- a/src/app/util/mock/attribute-storage.cpp +++ b/src/app/util/mock/attribute-storage.cpp @@ -164,7 +164,7 @@ uint16_t emberAfGetServerAttributeIndexByAttributeId(chip::EndpointId endpoint, return UINT16_MAX; } -bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, bool asServer) +bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId) { return !(emberAfGetServerAttributeIndexByAttributeId(endpoint, clusterId, attributeId) == UINT16_MAX); } diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 3644d45ad51b04..5b87e8f48a8d42 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -769,22 +769,13 @@ uint8_t emberAfMake8bitEncodedChanPg(uint8_t page, uint8_t channel) } } -bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, bool asServer) +bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId) { - if (!asServer) - { - return false; - } return (emberAfLocateAttributeMetadata(endpoint, clusterId, attributeId) != nullptr); } -bool emberAfIsNonVolatileAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - bool asServer) +bool emberAfIsNonVolatileAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId) { - if (!asServer) - { - return false; - } const EmberAfAttributeMetadata * metadata = emberAfLocateAttributeMetadata(endpoint, clusterId, attributeId); if (metadata == nullptr) diff --git a/src/app/util/util.h b/src/app/util/util.h index 7a8552e8a8d4b0..2362d217304387 100644 --- a/src/app/util/util.h +++ b/src/app/util/util.h @@ -275,9 +275,8 @@ uint8_t emberAfGetChannelFrom8bitEncodedChanPg(uint8_t chanPg); */ uint8_t emberAfMake8bitEncodedChanPg(uint8_t page, uint8_t channel); -bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, bool asServer); -bool emberAfIsNonVolatileAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - bool asServer); +bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId); +bool emberAfIsNonVolatileAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId); namespace chip { chip::Messaging::ExchangeManager * ExchangeManager(); diff --git a/src/app/zap-templates/templates/app/callback-stub-src.zapt b/src/app/zap-templates/templates/app/callback-stub-src.zapt index b7b1993d39243b..8e8ce31bce288a 100644 --- a/src/app/zap-templates/templates/app/callback-stub-src.zapt +++ b/src/app/zap-templates/templates/app/callback-stub-src.zapt @@ -41,7 +41,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback( EndpointId endpoint, ClusterId clusterId, - AttributeId attributeId, uint8_t mask, + AttributeId attributeId, uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default @@ -122,13 +122,13 @@ bool __attribute__((weak)) emberAfStartMoveCallback() chip::Protocols::InteractionModel::Status __attribute__((weak)) 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) { return chip::Protocols::InteractionModel::Status::Success; } void __attribute__((weak)) MatterPostAttributeChangeCallback( 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) { } diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt index 381732202a138c..9c296dbf8939fb 100644 --- a/src/app/zap-templates/templates/app/callback.zapt +++ b/src/app/zap-templates/templates/app/callback.zapt @@ -72,14 +72,6 @@ void emberAf{{asUpperCamelCase label}}ClusterClientInitCallback(chip::EndpointId */ void Matter{{asUpperCamelCase label}}ClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief {{label}} Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void Matter{{asUpperCamelCase label}}ClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief {{label}} Cluster Server Message Sent * * Server Message Sent @@ -212,7 +204,7 @@ void emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks); * restricted by the application implementing this callback. */ EmberAfAttributeWritePermission emberAfAllowNetworkWriteAttributeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, - chip::AttributeId attributeId, uint8_t mask, + chip::AttributeId attributeId, uint8_t * value, uint8_t type); /** @brief Attribute Read Access @@ -421,7 +413,7 @@ bool emberAfStartMoveCallback(); * any other code to reject it. */ 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); /** @brief Post Attribute Change * @@ -430,4 +422,4 @@ chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const * the attribute was set by the framework. */ void MatterPostAttributeChangeCallback(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); diff --git a/src/controller/python/chip/server/ServerInit.cpp b/src/controller/python/chip/server/ServerInit.cpp index b40cd59c73da51..c0b0d1086a66f4 100644 --- a/src/controller/python/chip/server/ServerInit.cpp +++ b/src/controller/python/chip/server/ServerInit.cpp @@ -98,7 +98,7 @@ static bool EnsureWiFiIsStarted() } #endif -using PostAttributeChangeCallback = void (*)(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, +using PostAttributeChangeCallback = void (*)(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value); class PythonServerDelegate // : public ServerDelegate @@ -195,14 +195,13 @@ void pychip_server_native_init() } void emberAfPostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { // ChipLogProgress(NotSpecified, "emberAfPostAttributeChangeCallback()"); if (gPythonServerDelegate.mPostAttributeChangeCallback != nullptr) { // ChipLogProgress(NotSpecified, "callback %p", gPythonServerDelegate.mPostAttributeChangeCallback); - gPythonServerDelegate.mPostAttributeChangeCallback(endpoint, clusterId, attributeId, mask, manufacturerCode, type, size, - value); + gPythonServerDelegate.mPostAttributeChangeCallback(endpoint, clusterId, attributeId, manufacturerCode, type, size, value); } else { diff --git a/src/darwin/Framework/CHIP/CHIPIMDispatch.mm b/src/darwin/Framework/CHIP/CHIPIMDispatch.mm index 8be1bb2834d121..0a08666f6b846d 100644 --- a/src/darwin/Framework/CHIP/CHIPIMDispatch.mm +++ b/src/darwin/Framework/CHIP/CHIPIMDispatch.mm @@ -272,10 +272,7 @@ uint16_t emberAfGetServerAttributeIndexByAttributeId(EndpointId endpoint, Cluste return UINT16_MAX; } -bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, bool asServer) -{ - return false; -} +bool emberAfContainsAttribute(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId) { return false; } uint8_t emberAfClusterCount(EndpointId endpoint, bool server) { diff --git a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp index c152dae5f7de3e..d14cac9e3e37cf 100644 --- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp @@ -557,8 +557,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -628,12 +628,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index c5312c57e82cbb..35a697a3b01e62 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -1011,14 +1011,6 @@ void emberAfPowerConfigurationClusterClientInitCallback(chip::EndpointId endpoin */ void MatterPowerConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Power Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPowerConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Power Configuration Cluster Server Message Sent * * Server Message Sent @@ -1116,15 +1108,6 @@ void emberAfDeviceTemperatureConfigurationClusterClientInitCallback(chip::Endpoi void MatterDeviceTemperatureConfigurationClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Device Temperature Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterDeviceTemperatureConfigurationClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Device Temperature Configuration Cluster Server Message Sent * * Server Message Sent @@ -1221,14 +1204,6 @@ void emberAfIdentifyClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterIdentifyClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Identify Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterIdentifyClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Identify Cluster Server Message Sent * * Server Message Sent @@ -1325,14 +1300,6 @@ void emberAfGroupsClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterGroupsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Groups Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterGroupsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Groups Cluster Server Message Sent * * Server Message Sent @@ -1429,14 +1396,6 @@ void emberAfScenesClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterScenesClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Scenes Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterScenesClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Scenes Cluster Server Message Sent * * Server Message Sent @@ -1533,14 +1492,6 @@ void emberAfOnOffClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterOnOffClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief On/Off Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOnOffClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief On/Off Cluster Server Message Sent * * Server Message Sent @@ -1637,14 +1588,6 @@ void emberAfOnOffSwitchConfigurationClusterClientInitCallback(chip::EndpointId e */ void MatterOnOffSwitchConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief On/off Switch Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOnOffSwitchConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief On/off Switch Configuration Cluster Server Message Sent * * Server Message Sent @@ -1741,14 +1684,6 @@ void emberAfLevelControlClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterLevelControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Level Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterLevelControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Level Control Cluster Server Message Sent * * Server Message Sent @@ -1845,14 +1780,6 @@ void emberAfAlarmsClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterAlarmsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Alarms Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterAlarmsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Alarms Cluster Server Message Sent * * Server Message Sent @@ -1949,14 +1876,6 @@ void emberAfTimeClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterTimeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Time Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTimeClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Time Cluster Server Message Sent * * Server Message Sent @@ -2053,14 +1972,6 @@ void emberAfBinaryInputBasicClusterClientInitCallback(chip::EndpointId endpoint) */ void MatterBinaryInputBasicClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Binary Input (Basic) Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBinaryInputBasicClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Binary Input (Basic) Cluster Server Message Sent * * Server Message Sent @@ -2159,14 +2070,6 @@ void emberAfPowerProfileClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterPowerProfileClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Power Profile Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPowerProfileClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Power Profile Cluster Server Message Sent * * Server Message Sent @@ -2263,14 +2166,6 @@ void emberAfApplianceControlClusterClientInitCallback(chip::EndpointId endpoint) */ void MatterApplianceControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Appliance Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterApplianceControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Appliance Control Cluster Server Message Sent * * Server Message Sent @@ -2369,14 +2264,6 @@ void emberAfPulseWidthModulationClusterClientInitCallback(chip::EndpointId endpo */ void MatterPulseWidthModulationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Pulse Width Modulation Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPulseWidthModulationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Pulse Width Modulation Cluster Server Message Sent * * Server Message Sent @@ -2473,14 +2360,6 @@ void emberAfDescriptorClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterDescriptorClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Descriptor Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterDescriptorClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Descriptor Cluster Server Message Sent * * Server Message Sent @@ -2577,14 +2456,6 @@ void emberAfBindingClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterBindingClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Binding Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBindingClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Binding Cluster Server Message Sent * * Server Message Sent @@ -2681,14 +2552,6 @@ void emberAfAccessControlClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterAccessControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Access Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterAccessControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Access Control Cluster Server Message Sent * * Server Message Sent @@ -2787,14 +2650,6 @@ void emberAfPollControlClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterPollControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Poll Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPollControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Poll Control Cluster Server Message Sent * * Server Message Sent @@ -2891,14 +2746,6 @@ void emberAfBridgedActionsClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterBridgedActionsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Bridged Actions Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBridgedActionsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Bridged Actions Cluster Server Message Sent * * Server Message Sent @@ -2997,14 +2844,6 @@ void emberAfBasicClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterBasicClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Basic Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBasicClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Basic Cluster Server Message Sent * * Server Message Sent @@ -3101,14 +2940,6 @@ void emberAfOtaSoftwareUpdateProviderClusterClientInitCallback(chip::EndpointId */ void MatterOtaSoftwareUpdateProviderClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief OTA Software Update Provider Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOtaSoftwareUpdateProviderClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief OTA Software Update Provider Cluster Server Message Sent * * Server Message Sent @@ -3205,14 +3036,6 @@ void emberAfOtaSoftwareUpdateRequestorClusterClientInitCallback(chip::EndpointId */ void MatterOtaSoftwareUpdateRequestorClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief OTA Software Update Requestor Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOtaSoftwareUpdateRequestorClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief OTA Software Update Requestor Cluster Server Message Sent * * Server Message Sent @@ -3309,14 +3132,6 @@ void emberAfLocalizationConfigurationClusterClientInitCallback(chip::EndpointId */ void MatterLocalizationConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Localization Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterLocalizationConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Localization Configuration Cluster Server Message Sent * * Server Message Sent @@ -3413,14 +3228,6 @@ void emberAfTimeFormatLocalizationClusterClientInitCallback(chip::EndpointId end */ void MatterTimeFormatLocalizationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Time Format Localization Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTimeFormatLocalizationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Time Format Localization Cluster Server Message Sent * * Server Message Sent @@ -3517,14 +3324,6 @@ void emberAfUnitLocalizationClusterClientInitCallback(chip::EndpointId endpoint) */ void MatterUnitLocalizationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Unit Localization Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterUnitLocalizationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Unit Localization Cluster Server Message Sent * * Server Message Sent @@ -3623,14 +3422,6 @@ void emberAfPowerSourceConfigurationClusterClientInitCallback(chip::EndpointId e */ void MatterPowerSourceConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Power Source Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPowerSourceConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Power Source Configuration Cluster Server Message Sent * * Server Message Sent @@ -3727,14 +3518,6 @@ void emberAfPowerSourceClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterPowerSourceClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Power Source Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPowerSourceClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Power Source Cluster Server Message Sent * * Server Message Sent @@ -3831,14 +3614,6 @@ void emberAfGeneralCommissioningClusterClientInitCallback(chip::EndpointId endpo */ void MatterGeneralCommissioningClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief General Commissioning Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterGeneralCommissioningClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief General Commissioning Cluster Server Message Sent * * Server Message Sent @@ -3935,14 +3710,6 @@ void emberAfNetworkCommissioningClusterClientInitCallback(chip::EndpointId endpo */ void MatterNetworkCommissioningClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Network Commissioning Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterNetworkCommissioningClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Network Commissioning Cluster Server Message Sent * * Server Message Sent @@ -4039,14 +3806,6 @@ void emberAfDiagnosticLogsClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterDiagnosticLogsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Diagnostic Logs Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterDiagnosticLogsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Diagnostic Logs Cluster Server Message Sent * * Server Message Sent @@ -4145,14 +3904,6 @@ void emberAfGeneralDiagnosticsClusterClientInitCallback(chip::EndpointId endpoin */ void MatterGeneralDiagnosticsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief General Diagnostics Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterGeneralDiagnosticsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief General Diagnostics Cluster Server Message Sent * * Server Message Sent @@ -4249,14 +4000,6 @@ void emberAfSoftwareDiagnosticsClusterClientInitCallback(chip::EndpointId endpoi */ void MatterSoftwareDiagnosticsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Software Diagnostics Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSoftwareDiagnosticsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Software Diagnostics Cluster Server Message Sent * * Server Message Sent @@ -4353,14 +4096,6 @@ void emberAfThreadNetworkDiagnosticsClusterClientInitCallback(chip::EndpointId e */ void MatterThreadNetworkDiagnosticsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Thread Network Diagnostics Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterThreadNetworkDiagnosticsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Thread Network Diagnostics Cluster Server Message Sent * * Server Message Sent @@ -4457,14 +4192,6 @@ void emberAfWiFiNetworkDiagnosticsClusterClientInitCallback(chip::EndpointId end */ void MatterWiFiNetworkDiagnosticsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief WiFi Network Diagnostics Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterWiFiNetworkDiagnosticsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief WiFi Network Diagnostics Cluster Server Message Sent * * Server Message Sent @@ -4561,14 +4288,6 @@ void emberAfEthernetNetworkDiagnosticsClusterClientInitCallback(chip::EndpointId */ void MatterEthernetNetworkDiagnosticsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Ethernet Network Diagnostics Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterEthernetNetworkDiagnosticsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Ethernet Network Diagnostics Cluster Server Message Sent * * Server Message Sent @@ -4665,14 +4384,6 @@ void emberAfTimeSynchronizationClusterClientInitCallback(chip::EndpointId endpoi */ void MatterTimeSynchronizationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Time Synchronization Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTimeSynchronizationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Time Synchronization Cluster Server Message Sent * * Server Message Sent @@ -4769,14 +4480,6 @@ void emberAfBridgedDeviceBasicClusterClientInitCallback(chip::EndpointId endpoin */ void MatterBridgedDeviceBasicClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Bridged Device Basic Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBridgedDeviceBasicClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Bridged Device Basic Cluster Server Message Sent * * Server Message Sent @@ -4873,14 +4576,6 @@ void emberAfSwitchClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterSwitchClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Switch Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSwitchClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Switch Cluster Server Message Sent * * Server Message Sent @@ -4977,14 +4672,6 @@ void emberAfAdministratorCommissioningClusterClientInitCallback(chip::EndpointId */ void MatterAdministratorCommissioningClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief AdministratorCommissioning Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterAdministratorCommissioningClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief AdministratorCommissioning Cluster Server Message Sent * * Server Message Sent @@ -5081,14 +4768,6 @@ void emberAfOperationalCredentialsClusterClientInitCallback(chip::EndpointId end */ void MatterOperationalCredentialsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Operational Credentials Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOperationalCredentialsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Operational Credentials Cluster Server Message Sent * * Server Message Sent @@ -5185,14 +4864,6 @@ void emberAfGroupKeyManagementClusterClientInitCallback(chip::EndpointId endpoin */ void MatterGroupKeyManagementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Group Key Management Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterGroupKeyManagementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Group Key Management Cluster Server Message Sent * * Server Message Sent @@ -5289,14 +4960,6 @@ void emberAfFixedLabelClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterFixedLabelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Fixed Label Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterFixedLabelClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Fixed Label Cluster Server Message Sent * * Server Message Sent @@ -5393,14 +5056,6 @@ void emberAfUserLabelClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterUserLabelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief User Label Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterUserLabelClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief User Label Cluster Server Message Sent * * Server Message Sent @@ -5497,14 +5152,6 @@ void emberAfProxyConfigurationClusterClientInitCallback(chip::EndpointId endpoin */ void MatterProxyConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Proxy Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterProxyConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Proxy Configuration Cluster Server Message Sent * * Server Message Sent @@ -5601,14 +5248,6 @@ void emberAfProxyDiscoveryClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterProxyDiscoveryClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Proxy Discovery Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterProxyDiscoveryClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Proxy Discovery Cluster Server Message Sent * * Server Message Sent @@ -5707,14 +5346,6 @@ void emberAfProxyValidClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterProxyValidClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Proxy Valid Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterProxyValidClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Proxy Valid Cluster Server Message Sent * * Server Message Sent @@ -5811,14 +5442,6 @@ void emberAfBooleanStateClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterBooleanStateClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Boolean State Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBooleanStateClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Boolean State Cluster Server Message Sent * * Server Message Sent @@ -5915,14 +5538,6 @@ void emberAfModeSelectClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Mode Select Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterModeSelectClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Mode Select Cluster Server Message Sent * * Server Message Sent @@ -6019,14 +5634,6 @@ void emberAfShadeConfigurationClusterClientInitCallback(chip::EndpointId endpoin */ void MatterShadeConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Shade Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterShadeConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Shade Configuration Cluster Server Message Sent * * Server Message Sent @@ -6123,14 +5730,6 @@ void emberAfDoorLockClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterDoorLockClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Door Lock Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterDoorLockClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Door Lock Cluster Server Message Sent * * Server Message Sent @@ -6227,14 +5826,6 @@ void emberAfWindowCoveringClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterWindowCoveringClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Window Covering Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterWindowCoveringClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Window Covering Cluster Server Message Sent * * Server Message Sent @@ -6333,14 +5924,6 @@ void emberAfBarrierControlClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterBarrierControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Barrier Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBarrierControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Barrier Control Cluster Server Message Sent * * Server Message Sent @@ -6439,14 +6022,6 @@ void emberAfPumpConfigurationAndControlClusterClientInitCallback(chip::EndpointI */ void MatterPumpConfigurationAndControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Pump Configuration and Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPumpConfigurationAndControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Pump Configuration and Control Cluster Server Message Sent * * Server Message Sent @@ -6543,14 +6118,6 @@ void emberAfThermostatClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterThermostatClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Thermostat Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterThermostatClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Thermostat Cluster Server Message Sent * * Server Message Sent @@ -6647,14 +6214,6 @@ void emberAfFanControlClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterFanControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Fan Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterFanControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Fan Control Cluster Server Message Sent * * Server Message Sent @@ -6751,14 +6310,6 @@ void emberAfDehumidificationControlClusterClientInitCallback(chip::EndpointId en */ void MatterDehumidificationControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Dehumidification Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterDehumidificationControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Dehumidification Control Cluster Server Message Sent * * Server Message Sent @@ -6856,15 +6407,6 @@ void emberAfThermostatUserInterfaceConfigurationClusterClientInitCallback(chip:: void MatterThermostatUserInterfaceConfigurationClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Thermostat User Interface Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterThermostatUserInterfaceConfigurationClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Thermostat User Interface Configuration Cluster Server Message Sent * * Server Message Sent @@ -6961,14 +6503,6 @@ void emberAfColorControlClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterColorControlClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Color Control Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterColorControlClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Color Control Cluster Server Message Sent * * Server Message Sent @@ -7065,14 +6599,6 @@ void emberAfBallastConfigurationClusterClientInitCallback(chip::EndpointId endpo */ void MatterBallastConfigurationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Ballast Configuration Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBallastConfigurationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Ballast Configuration Cluster Server Message Sent * * Server Message Sent @@ -7169,14 +6695,6 @@ void emberAfIlluminanceMeasurementClusterClientInitCallback(chip::EndpointId end */ void MatterIlluminanceMeasurementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Illuminance Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterIlluminanceMeasurementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Illuminance Measurement Cluster Server Message Sent * * Server Message Sent @@ -7273,14 +6791,6 @@ void emberAfTemperatureMeasurementClusterClientInitCallback(chip::EndpointId end */ void MatterTemperatureMeasurementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Temperature Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTemperatureMeasurementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Temperature Measurement Cluster Server Message Sent * * Server Message Sent @@ -7377,14 +6887,6 @@ void emberAfPressureMeasurementClusterClientInitCallback(chip::EndpointId endpoi */ void MatterPressureMeasurementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Pressure Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterPressureMeasurementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Pressure Measurement Cluster Server Message Sent * * Server Message Sent @@ -7481,14 +6983,6 @@ void emberAfFlowMeasurementClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterFlowMeasurementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Flow Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterFlowMeasurementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Flow Measurement Cluster Server Message Sent * * Server Message Sent @@ -7587,14 +7081,6 @@ void emberAfRelativeHumidityMeasurementClusterClientInitCallback(chip::EndpointI */ void MatterRelativeHumidityMeasurementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Relative Humidity Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterRelativeHumidityMeasurementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Relative Humidity Measurement Cluster Server Message Sent * * Server Message Sent @@ -7691,14 +7177,6 @@ void emberAfOccupancySensingClusterClientInitCallback(chip::EndpointId endpoint) */ void MatterOccupancySensingClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Occupancy Sensing Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOccupancySensingClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Occupancy Sensing Cluster Server Message Sent * * Server Message Sent @@ -7798,15 +7276,6 @@ void emberAfCarbonMonoxideConcentrationMeasurementClusterClientInitCallback(chip void MatterCarbonMonoxideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Carbon Monoxide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterCarbonMonoxideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Carbon Monoxide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -7904,15 +7373,6 @@ void emberAfCarbonDioxideConcentrationMeasurementClusterClientInitCallback(chip: void MatterCarbonDioxideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Carbon Dioxide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterCarbonDioxideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Carbon Dioxide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8010,15 +7470,6 @@ void emberAfEthyleneConcentrationMeasurementClusterClientInitCallback(chip::Endp void MatterEthyleneConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Ethylene Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterEthyleneConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Ethylene Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8116,15 +7567,6 @@ void emberAfEthyleneOxideConcentrationMeasurementClusterClientInitCallback(chip: void MatterEthyleneOxideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Ethylene Oxide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterEthyleneOxideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Ethylene Oxide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8222,15 +7664,6 @@ void emberAfHydrogenConcentrationMeasurementClusterClientInitCallback(chip::Endp void MatterHydrogenConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Hydrogen Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterHydrogenConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Hydrogen Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8328,15 +7761,6 @@ void emberAfHydrogenSulphideConcentrationMeasurementClusterClientInitCallback(ch void MatterHydrogenSulphideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Hydrogen Sulphide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterHydrogenSulphideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Hydrogen Sulphide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8434,15 +7858,6 @@ void emberAfNitricOxideConcentrationMeasurementClusterClientInitCallback(chip::E void MatterNitricOxideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Nitric Oxide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterNitricOxideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Nitric Oxide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8540,15 +7955,6 @@ void emberAfNitrogenDioxideConcentrationMeasurementClusterClientInitCallback(chi void MatterNitrogenDioxideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Nitrogen Dioxide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterNitrogenDioxideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Nitrogen Dioxide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8646,15 +8052,6 @@ void emberAfOxygenConcentrationMeasurementClusterClientInitCallback(chip::Endpoi void MatterOxygenConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Oxygen Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOxygenConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Oxygen Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8752,15 +8149,6 @@ void emberAfOzoneConcentrationMeasurementClusterClientInitCallback(chip::Endpoin void MatterOzoneConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Ozone Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterOzoneConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Ozone Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8858,15 +8246,6 @@ void emberAfSulfurDioxideConcentrationMeasurementClusterClientInitCallback(chip: void MatterSulfurDioxideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Sulfur Dioxide Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSulfurDioxideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Sulfur Dioxide Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -8964,15 +8343,6 @@ void emberAfDissolvedOxygenConcentrationMeasurementClusterClientInitCallback(chi void MatterDissolvedOxygenConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Dissolved Oxygen Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterDissolvedOxygenConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Dissolved Oxygen Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9070,15 +8440,6 @@ void emberAfBromateConcentrationMeasurementClusterClientInitCallback(chip::Endpo void MatterBromateConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Bromate Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBromateConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Bromate Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9176,15 +8537,6 @@ void emberAfChloraminesConcentrationMeasurementClusterClientInitCallback(chip::E void MatterChloraminesConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Chloramines Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterChloraminesConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Chloramines Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9282,15 +8634,6 @@ void emberAfChlorineConcentrationMeasurementClusterClientInitCallback(chip::Endp void MatterChlorineConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Chlorine Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterChlorineConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Chlorine Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9388,15 +8731,6 @@ void emberAfFecalColiformAndEColiConcentrationMeasurementClusterClientInitCallba void MatterFecalColiformAndEColiConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Fecal coliform and E. Coli Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterFecalColiformAndEColiConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Fecal coliform and E. Coli Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9496,15 +8830,6 @@ void emberAfFluorideConcentrationMeasurementClusterClientInitCallback(chip::Endp void MatterFluorideConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Fluoride Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterFluorideConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Fluoride Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9602,15 +8927,6 @@ void emberAfHaloaceticAcidsConcentrationMeasurementClusterClientInitCallback(chi void MatterHaloaceticAcidsConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Haloacetic Acids Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterHaloaceticAcidsConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Haloacetic Acids Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9708,15 +9024,6 @@ void emberAfTotalTrihalomethanesConcentrationMeasurementClusterClientInitCallbac void MatterTotalTrihalomethanesConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Total Trihalomethanes Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTotalTrihalomethanesConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Total Trihalomethanes Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9816,15 +9123,6 @@ void emberAfTotalColiformBacteriaConcentrationMeasurementClusterClientInitCallba void MatterTotalColiformBacteriaConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Total Coliform Bacteria Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTotalColiformBacteriaConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Total Coliform Bacteria Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -9924,15 +9222,6 @@ void emberAfTurbidityConcentrationMeasurementClusterClientInitCallback(chip::End void MatterTurbidityConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Turbidity Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTurbidityConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Turbidity Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10030,15 +9319,6 @@ void emberAfCopperConcentrationMeasurementClusterClientInitCallback(chip::Endpoi void MatterCopperConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Copper Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterCopperConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Copper Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10136,15 +9416,6 @@ void emberAfLeadConcentrationMeasurementClusterClientInitCallback(chip::Endpoint void MatterLeadConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Lead Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterLeadConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Lead Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10242,15 +9513,6 @@ void emberAfManganeseConcentrationMeasurementClusterClientInitCallback(chip::End void MatterManganeseConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Manganese Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterManganeseConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Manganese Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10348,15 +9610,6 @@ void emberAfSulfateConcentrationMeasurementClusterClientInitCallback(chip::Endpo void MatterSulfateConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Sulfate Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSulfateConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Sulfate Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10454,15 +9707,6 @@ void emberAfBromodichloromethaneConcentrationMeasurementClusterClientInitCallbac void MatterBromodichloromethaneConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Bromodichloromethane Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBromodichloromethaneConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Bromodichloromethane Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10562,15 +9806,6 @@ void emberAfBromoformConcentrationMeasurementClusterClientInitCallback(chip::End void MatterBromoformConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Bromoform Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterBromoformConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Bromoform Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10668,15 +9903,6 @@ void emberAfChlorodibromomethaneConcentrationMeasurementClusterClientInitCallbac void MatterChlorodibromomethaneConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Chlorodibromomethane Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterChlorodibromomethaneConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Chlorodibromomethane Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10776,15 +10002,6 @@ void emberAfChloroformConcentrationMeasurementClusterClientInitCallback(chip::En void MatterChloroformConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Chloroform Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterChloroformConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Chloroform Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10882,15 +10099,6 @@ void emberAfSodiumConcentrationMeasurementClusterClientInitCallback(chip::Endpoi void MatterSodiumConcentrationMeasurementClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Sodium Concentration Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterSodiumConcentrationMeasurementClusterClientAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath); - /** @brief Sodium Concentration Measurement Cluster Server Message Sent * * Server Message Sent @@ -10987,14 +10195,6 @@ void emberAfIasZoneClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterIasZoneClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief IAS Zone Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterIasZoneClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief IAS Zone Cluster Server Message Sent * * Server Message Sent @@ -11091,14 +10291,6 @@ void emberAfIasAceClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterIasAceClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief IAS ACE Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterIasAceClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief IAS ACE Cluster Server Message Sent * * Server Message Sent @@ -11195,14 +10387,6 @@ void emberAfIasWdClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterIasWdClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief IAS WD Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterIasWdClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief IAS WD Cluster Server Message Sent * * Server Message Sent @@ -11299,14 +10483,6 @@ void emberAfWakeOnLanClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterWakeOnLanClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Wake on LAN Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterWakeOnLanClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Wake on LAN Cluster Server Message Sent * * Server Message Sent @@ -11403,14 +10579,6 @@ void emberAfChannelClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterChannelClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Channel Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterChannelClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Channel Cluster Server Message Sent * * Server Message Sent @@ -11507,14 +10675,6 @@ void emberAfTargetNavigatorClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterTargetNavigatorClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Target Navigator Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTargetNavigatorClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Target Navigator Cluster Server Message Sent * * Server Message Sent @@ -11613,14 +10773,6 @@ void emberAfMediaPlaybackClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterMediaPlaybackClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Media Playback Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterMediaPlaybackClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Media Playback Cluster Server Message Sent * * Server Message Sent @@ -11719,14 +10871,6 @@ void emberAfMediaInputClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterMediaInputClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Media Input Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterMediaInputClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Media Input Cluster Server Message Sent * * Server Message Sent @@ -11823,14 +10967,6 @@ void emberAfLowPowerClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterLowPowerClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Low Power Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterLowPowerClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Low Power Cluster Server Message Sent * * Server Message Sent @@ -11927,14 +11063,6 @@ void emberAfKeypadInputClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterKeypadInputClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Keypad Input Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterKeypadInputClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Keypad Input Cluster Server Message Sent * * Server Message Sent @@ -12031,14 +11159,6 @@ void emberAfContentLauncherClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterContentLauncherClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Content Launcher Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterContentLauncherClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Content Launcher Cluster Server Message Sent * * Server Message Sent @@ -12137,14 +11257,6 @@ void emberAfAudioOutputClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterAudioOutputClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Audio Output Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterAudioOutputClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Audio Output Cluster Server Message Sent * * Server Message Sent @@ -12241,14 +11353,6 @@ void emberAfApplicationLauncherClusterClientInitCallback(chip::EndpointId endpoi */ void MatterApplicationLauncherClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Application Launcher Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterApplicationLauncherClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Application Launcher Cluster Server Message Sent * * Server Message Sent @@ -12345,14 +11449,6 @@ void emberAfApplicationBasicClusterClientInitCallback(chip::EndpointId endpoint) */ void MatterApplicationBasicClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Application Basic Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterApplicationBasicClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Application Basic Cluster Server Message Sent * * Server Message Sent @@ -12451,14 +11547,6 @@ void emberAfAccountLoginClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterAccountLoginClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Account Login Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterAccountLoginClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Account Login Cluster Server Message Sent * * Server Message Sent @@ -12555,14 +11643,6 @@ void emberAfTestClusterClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterTestClusterClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Test Cluster Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterTestClusterClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Test Cluster Cluster Server Message Sent * * Server Message Sent @@ -12659,14 +11739,6 @@ void emberAfMessagingClusterClientInitCallback(chip::EndpointId endpoint); */ void MatterMessagingClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Messaging Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterMessagingClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Messaging Cluster Server Message Sent * * Server Message Sent @@ -12763,14 +11835,6 @@ void emberAfApplianceIdentificationClusterClientInitCallback(chip::EndpointId en */ void MatterApplianceIdentificationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Appliance Identification Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterApplianceIdentificationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Appliance Identification Cluster Server Message Sent * * Server Message Sent @@ -12867,14 +11931,6 @@ void emberAfMeterIdentificationClusterClientInitCallback(chip::EndpointId endpoi */ void MatterMeterIdentificationClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Meter Identification Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterMeterIdentificationClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Meter Identification Cluster Server Message Sent * * Server Message Sent @@ -12971,14 +12027,6 @@ void emberAfApplianceEventsAndAlertClusterClientInitCallback(chip::EndpointId en */ void MatterApplianceEventsAndAlertClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Appliance Events and Alert Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterApplianceEventsAndAlertClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Appliance Events and Alert Cluster Server Message Sent * * Server Message Sent @@ -13075,14 +12123,6 @@ void emberAfApplianceStatisticsClusterClientInitCallback(chip::EndpointId endpoi */ void MatterApplianceStatisticsClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Appliance Statistics Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterApplianceStatisticsClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Appliance Statistics Cluster Server Message Sent * * Server Message Sent @@ -13179,14 +12219,6 @@ void emberAfElectricalMeasurementClusterClientInitCallback(chip::EndpointId endp */ void MatterElectricalMeasurementClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Electrical Measurement Cluster Client Attribute Changed - * - * Client Attribute Changed - * - * @param attributePath Concrete attribute path that changed - */ -void MatterElectricalMeasurementClusterClientAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); - /** @brief Electrical Measurement Cluster Server Message Sent * * Server Message Sent @@ -15384,8 +14416,8 @@ void emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks); * restricted by the application implementing this callback. */ EmberAfAttributeWritePermission emberAfAllowNetworkWriteAttributeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, - chip::AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type); + chip::AttributeId attributeId, uint8_t * value, + uint8_t type); /** @brief Attribute Read Access * @@ -15593,8 +14625,7 @@ bool emberAfStartMoveCallback(); * any other code to reject it. */ 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); /** @brief Post Attribute Change * @@ -15602,5 +14633,5 @@ chip::Protocols::InteractionModel::Status MatterPreAttributeChangeCallback(const * attribute value. The value passed into this callback is the value to which * the attribute was set by the framework. */ -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); diff --git a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp index ab9054522de26c..319a43152e3933 100644 --- a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp @@ -213,8 +213,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -284,12 +284,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp index 8bbb59ceac0144..43d9fce595d6bb 100644 --- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp +++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp @@ -557,8 +557,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -628,12 +628,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp b/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp index 38bbf64fb6e20b..1e70ab52a91a1d 100644 --- a/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/light-switch-app/zap-generated/callback-stub.cpp @@ -261,8 +261,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -332,12 +332,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp index 741214a166ed51..20850267856b32 100644 --- a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp @@ -261,8 +261,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -332,12 +332,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/lock-app/zap-generated/callback-stub.cpp b/zzz_generated/lock-app/zap-generated/callback-stub.cpp index 15b215628ecb48..abfd5f59123fd4 100644 --- a/zzz_generated/lock-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/lock-app/zap-generated/callback-stub.cpp @@ -245,8 +245,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -316,12 +316,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/log-source-app/zap-generated/callback-stub.cpp b/zzz_generated/log-source-app/zap-generated/callback-stub.cpp index 89508357beb7ca..5470d69131e3ae 100644 --- a/zzz_generated/log-source-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/log-source-app/zap-generated/callback-stub.cpp @@ -85,8 +85,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -156,12 +156,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp index e5801d09058651..ba55ccb429baf9 100644 --- a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp @@ -125,8 +125,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -196,12 +196,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp index b8f22c14650689..6e9dd891443c5a 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp @@ -141,8 +141,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -212,12 +212,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp index c6cb0bd6bb06d6..96c039753c968a 100644 --- a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp @@ -325,8 +325,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -396,12 +396,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp index c6cb0bd6bb06d6..96c039753c968a 100644 --- a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp @@ -325,8 +325,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -396,12 +396,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/pump-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp index abfe03aaf90896..3148ac54cec69b 100644 --- a/zzz_generated/pump-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-app/zap-generated/callback-stub.cpp @@ -277,8 +277,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -348,12 +348,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp index 04794ba5a09128..b6cc378838cc0b 100644 --- a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp @@ -253,8 +253,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -324,12 +324,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp index 9af34120d7b7dc..cd1b5d59ee6e47 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp @@ -189,8 +189,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -260,12 +260,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/thermostat/zap-generated/callback-stub.cpp b/zzz_generated/thermostat/zap-generated/callback-stub.cpp index 52c37b8f4e4757..bbce02b0dbd3a7 100644 --- a/zzz_generated/thermostat/zap-generated/callback-stub.cpp +++ b/zzz_generated/thermostat/zap-generated/callback-stub.cpp @@ -245,8 +245,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -316,12 +316,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/tv-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-app/zap-generated/callback-stub.cpp index d7dbbfa62d1baf..7ec58577fea388 100644 --- a/zzz_generated/tv-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-app/zap-generated/callback-stub.cpp @@ -333,8 +333,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -404,12 +404,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp index a3e2edc2f6b1c6..66c1e27fc228fa 100644 --- a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp @@ -381,8 +381,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -452,12 +452,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {} diff --git a/zzz_generated/window-app/zap-generated/callback-stub.cpp b/zzz_generated/window-app/zap-generated/callback-stub.cpp index 96080a7bde0556..379b9954ed42e7 100644 --- a/zzz_generated/window-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/window-app/zap-generated/callback-stub.cpp @@ -229,8 +229,8 @@ void __attribute__((weak)) emberAfAddToCurrentAppTasksCallback(EmberAfApplicatio void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks) {} EmberAfAttributeWritePermission __attribute__((weak)) -emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * value, uint8_t type) +emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t * value, + uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } @@ -300,12 +300,12 @@ bool __attribute__((weak)) emberAfStartMoveCallback() } chip::Protocols::InteractionModel::Status __attribute__((weak)) -MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, uint8_t type, uint16_t size, +MatterPreAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size, uint8_t * value) { return chip::Protocols::InteractionModel::Status::Success; } -void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t mask, - uint8_t type, uint16_t size, uint8_t * value) +void __attribute__((weak)) MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, + uint16_t size, uint8_t * value) {}