From 0e990f7fb4d523888c805731b7438e151affc19c Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Thu, 6 May 2021 11:35:21 +0200 Subject: [PATCH 1/2] Update mobile-device-test.py endpoint to 0 instead of 1 and use constants instead of raw numbers --- src/controller/python/test/mobile-device-test.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/controller/python/test/mobile-device-test.py b/src/controller/python/test/mobile-device-test.py index ed5edd03f9b712..b9e16427ae27b4 100755 --- a/src/controller/python/test/mobile-device-test.py +++ b/src/controller/python/test/mobile-device-test.py @@ -32,6 +32,9 @@ # Network id, for the thread network, current a const value, will be changed to XPANID of the thread network. TEST_THREAD_NETWORK_ID = "fedcba9876543210" +ENDPOINT_ID = 0 +GROUP_ID = 0 + def TestFail(message): logger.fatal("Testfail: {}".format(message)) @@ -86,7 +89,7 @@ def TestKeyExchange(self, ip: str, setuppin: int, nodeid: int): def TestNetworkCommissioning(self, nodeid: int): self.logger.info("Commissioning network to device {}".format(nodeid)) try: - self.devCtrl.ZCLSend("NetworkCommissioning", "AddThreadNetwork", nodeid, 1, 0, { + self.devCtrl.ZCLSend("NetworkCommissioning", "AddThreadNetwork", nodeid, ENDPOINT_ID, GROUP_ID, { "operationalDataset": bytes.fromhex(TEST_THREAD_NETWORK_DATASET_TLV), "breadcrumb": 0, "timeoutMs": 1000}) @@ -95,7 +98,7 @@ def TestNetworkCommissioning(self, nodeid: int): return False self.logger.info("Send EnableNetwork command to device {}".format(nodeid)) try: - self.devCtrl.ZCLSend("NetworkCommissioning", "EnableNetwork", nodeid, 1, 0, { + self.devCtrl.ZCLSend("NetworkCommissioning", "EnableNetwork", nodeid, ENDPOINT_ID, GROUP_ID, { "networkID": bytes.fromhex(TEST_THREAD_NETWORK_ID), "breadcrumb": 0, "timeoutMs": 1000}) @@ -107,12 +110,12 @@ def TestNetworkCommissioning(self, nodeid: int): def TestOnOffCluster(self, nodeid: int): self.logger.info("Sending On/Off commands to device {}".format(nodeid)) try: - self.devCtrl.ZCLSend("OnOff", "On", nodeid, 1, 0, {}) + self.devCtrl.ZCLSend("OnOff", "On", nodeid, ENDPOINT_ID, GROUP_ID, {}) except Exception as ex: self.logger.exception("Failed to send On command") return False try: - self.devCtrl.ZCLSend("OnOff", "Off", nodeid, 1, 0, {}) + self.devCtrl.ZCLSend("OnOff", "Off", nodeid, ENDPOINT_ID, GROUP_ID, {}) except Exception as ex: self.logger.exception("Failed to send Off command") return False From 33c057b8a01e7e0428562391092c4d5b320bad9c Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Thu, 6 May 2021 12:32:09 +0200 Subject: [PATCH 2/2] Update emberAfPostAttributeChangeCallback in examples/ to use uint16_t for size --- examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp | 2 +- examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp | 2 +- .../all-clusters-app/esp32/main/include/CHIPDeviceManager.h | 2 +- examples/all-clusters-app/esp32/main/include/DeviceCallbacks.h | 2 +- examples/all-clusters-app/linux/main.cpp | 2 +- examples/bridge-app/linux/main.cpp | 2 +- examples/lighting-app/efr32/src/ZclCallbacks.cpp | 2 +- examples/lighting-app/k32w/main/ZclCallbacks.cpp | 2 +- examples/lighting-app/linux/main.cpp | 2 +- examples/lighting-app/nrfconnect/main/LightingManager.cpp | 2 +- examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp | 2 +- examples/lighting-app/nrfconnect/main/include/LightingManager.h | 2 +- examples/lighting-app/qpg6100/include/LightingManager.h | 2 +- examples/lighting-app/qpg6100/src/LightingManager.cpp | 2 +- examples/lighting-app/qpg6100/src/ZclCallbacks.cpp | 2 +- examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp | 2 +- examples/lock-app/esp32/main/CHIPDeviceManager.cpp | 2 +- examples/lock-app/esp32/main/DeviceCallbacks.cpp | 2 +- examples/lock-app/esp32/main/include/CHIPDeviceManager.h | 2 +- examples/lock-app/esp32/main/include/DeviceCallbacks.h | 2 +- examples/lock-app/k32w/main/ZclCallbacks.cpp | 2 +- examples/lock-app/nrfconnect/main/ZclCallbacks.cpp | 2 +- examples/lock-app/qpg6100/src/ZclCallbacks.cpp | 2 +- .../esp32/main/CHIPDeviceManager.cpp | 2 +- .../temperature-measurement-app/esp32/main/DeviceCallbacks.cpp | 2 +- .../esp32/main/include/CHIPDeviceManager.h | 2 +- .../esp32/main/include/DeviceCallbacks.h | 2 +- examples/tv-app/linux/include/cluster-change-attribute.cpp | 2 +- examples/window-app/efr32/src/ZclCallbacks.cpp | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp b/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp index 9c2c2f4d56f83a..7ae9ed906db227 100644 --- a/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/all-clusters-app/esp32/main/CHIPDeviceManager.cpp @@ -96,7 +96,7 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace chip void emberAfPostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); diff --git a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp index 3181015fe2de0f..bbff7eeb50ad30 100644 --- a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp @@ -77,7 +77,7 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ } void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, 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/all-clusters-app/esp32/main/include/CHIPDeviceManager.h b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h index 8270de21f628fd..d30f21a449b383 100644 --- a/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/all-clusters-app/esp32/main/include/CHIPDeviceManager.h @@ -73,7 +73,7 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param value pointer to the new value */ virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint8_t mask, uint16_t manufacturerCode, 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 2b8aa5e89e1cac..0be901539a58fd 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, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value); + uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value); private: void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event); diff --git a/examples/all-clusters-app/linux/main.cpp b/examples/all-clusters-app/linux/main.cpp index 66c9b6af1f58ab..f062b2a9b180f3 100644 --- a/examples/all-clusters-app/linux/main.cpp +++ b/examples/all-clusters-app/linux/main.cpp @@ -43,7 +43,7 @@ using namespace chip::Transport; using namespace chip::DeviceLayer; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) {} bool emberAfBasicClusterMfgSpecificPingCallback(chip::app::Command * commandObj) diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index 6d5493c57faeee..ef96b6fb2adb93 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -45,7 +45,7 @@ using namespace chip::Transport; using namespace chip::DeviceLayer; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lighting-app/efr32/src/ZclCallbacks.cpp b/examples/lighting-app/efr32/src/ZclCallbacks.cpp index 5c2d98b383f10e..6b7be876a15cbf 100644 --- a/examples/lighting-app/efr32/src/ZclCallbacks.cpp +++ b/examples/lighting-app/efr32/src/ZclCallbacks.cpp @@ -31,7 +31,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lighting-app/k32w/main/ZclCallbacks.cpp b/examples/lighting-app/k32w/main/ZclCallbacks.cpp index 2f8f82a0748f13..19f8805a80a8d3 100644 --- a/examples/lighting-app/k32w/main/ZclCallbacks.cpp +++ b/examples/lighting-app/k32w/main/ZclCallbacks.cpp @@ -29,7 +29,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lighting-app/linux/main.cpp b/examples/lighting-app/linux/main.cpp index 2c4481520983fe..03d9fa0e38f207 100644 --- a/examples/lighting-app/linux/main.cpp +++ b/examples/lighting-app/linux/main.cpp @@ -42,7 +42,7 @@ using namespace chip; using namespace chip::DeviceLayer; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lighting-app/nrfconnect/main/LightingManager.cpp b/examples/lighting-app/nrfconnect/main/LightingManager.cpp index 668afd53d83c71..b1d9b061e126aa 100644 --- a/examples/lighting-app/nrfconnect/main/LightingManager.cpp +++ b/examples/lighting-app/nrfconnect/main/LightingManager.cpp @@ -54,7 +54,7 @@ void LightingManager::SetCallbacks(LightingCallback_fn aActionInitiated_CB, Ligh mActionCompleted_CB = aActionCompleted_CB; } -bool LightingManager::InitiateAction(Action_t aAction, int32_t aActor, uint8_t size, uint8_t * value) +bool LightingManager::InitiateAction(Action_t aAction, int32_t aActor, uint16_t size, uint8_t * value) { // TODO: this function is called InitiateAction because we want to implement some features such as ramping up here. bool action_initiated = false; diff --git a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp index fe8533991d6781..0cb2889fd7a361 100644 --- a/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lighting-app/nrfconnect/main/ZclCallbacks.cpp @@ -30,7 +30,7 @@ using namespace chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { ChipLogProgress(Zcl, "Cluster callback: %d", clusterId); diff --git a/examples/lighting-app/nrfconnect/main/include/LightingManager.h b/examples/lighting-app/nrfconnect/main/include/LightingManager.h index 3b22e113e73d4e..da066cf3eaf284 100644 --- a/examples/lighting-app/nrfconnect/main/include/LightingManager.h +++ b/examples/lighting-app/nrfconnect/main/include/LightingManager.h @@ -46,7 +46,7 @@ class LightingManager int Init(const device * pwmDevice, uint32_t pwmChannel); bool IsTurnedOn() const { return mState == kState_On; } uint8_t GetLevel() const { return mLevel; } - bool InitiateAction(Action_t aAction, int32_t aActor, uint8_t size, uint8_t * value); + bool InitiateAction(Action_t aAction, int32_t aActor, uint16_t size, uint8_t * value); void SetCallbacks(LightingCallback_fn aActionInitiated_CB, LightingCallback_fn aActionCompleted_CB); private: diff --git a/examples/lighting-app/qpg6100/include/LightingManager.h b/examples/lighting-app/qpg6100/include/LightingManager.h index 333183a9080409..e0acb6c0fb5746 100644 --- a/examples/lighting-app/qpg6100/include/LightingManager.h +++ b/examples/lighting-app/qpg6100/include/LightingManager.h @@ -48,7 +48,7 @@ class LightingManager int Init(); bool IsTurnedOn(); uint8_t GetLevel(); - bool InitiateAction(Action_t aAction, int32_t aActor, uint8_t size, uint8_t * value); + bool InitiateAction(Action_t aAction, int32_t aActor, uint16_t size, uint8_t * value); using LightingCallback_fn = std::function; diff --git a/examples/lighting-app/qpg6100/src/LightingManager.cpp b/examples/lighting-app/qpg6100/src/LightingManager.cpp index 8989187439d4a9..c7a233b4729335 100644 --- a/examples/lighting-app/qpg6100/src/LightingManager.cpp +++ b/examples/lighting-app/qpg6100/src/LightingManager.cpp @@ -46,7 +46,7 @@ void LightingManager::SetCallbacks(LightingCallback_fn aActionInitiated_CB, Ligh mActionCompleted_CB = aActionCompleted_CB; } -bool LightingManager::InitiateAction(Action_t aAction, int32_t aActor, uint8_t size, uint8_t * value) +bool LightingManager::InitiateAction(Action_t aAction, int32_t aActor, uint16_t size, uint8_t * value) { // TODO: this function is called InitiateAction because we want to implement some features such as ramping up here. bool action_initiated = false; diff --git a/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp b/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp index 1a8638293cb55b..290018bc064ad5 100644 --- a/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp +++ b/examples/lighting-app/qpg6100/src/ZclCallbacks.cpp @@ -33,7 +33,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId == ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp b/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp index 08e8b78a690334..2a45e4ecb40057 100644 --- a/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp +++ b/examples/lock-app/cc13x2x7_26x2x7/main/ZclCallbacks.cpp @@ -30,7 +30,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lock-app/esp32/main/CHIPDeviceManager.cpp b/examples/lock-app/esp32/main/CHIPDeviceManager.cpp index d5a481326b66a2..c88cdc44246c5e 100644 --- a/examples/lock-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/lock-app/esp32/main/CHIPDeviceManager.cpp @@ -93,7 +93,7 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace chip void emberAfPostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); diff --git a/examples/lock-app/esp32/main/DeviceCallbacks.cpp b/examples/lock-app/esp32/main/DeviceCallbacks.cpp index 1cd319614e5f86..0b867e8def2b76 100644 --- a/examples/lock-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/lock-app/esp32/main/DeviceCallbacks.cpp @@ -54,7 +54,7 @@ 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, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, 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 cfe9ff49944cd3..ccf6e4c7b0dbf1 100644 --- a/examples/lock-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/lock-app/esp32/main/include/CHIPDeviceManager.h @@ -73,7 +73,7 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param value pointer to the new value */ virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint8_t mask, uint16_t manufacturerCode, 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 21b473646332af..bd6b116af032cf 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, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value); + uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value); private: void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event); diff --git a/examples/lock-app/k32w/main/ZclCallbacks.cpp b/examples/lock-app/k32w/main/ZclCallbacks.cpp index b47057336f9255..57c844b1517208 100644 --- a/examples/lock-app/k32w/main/ZclCallbacks.cpp +++ b/examples/lock-app/k32w/main/ZclCallbacks.cpp @@ -29,7 +29,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp index de40630440a774..10a438e1c264bb 100644 --- a/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp +++ b/examples/lock-app/nrfconnect/main/ZclCallbacks.cpp @@ -30,7 +30,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/lock-app/qpg6100/src/ZclCallbacks.cpp b/examples/lock-app/qpg6100/src/ZclCallbacks.cpp index e82e3e6fe9b4e9..95fafc0dd06bf1 100644 --- a/examples/lock-app/qpg6100/src/ZclCallbacks.cpp +++ b/examples/lock-app/qpg6100/src/ZclCallbacks.cpp @@ -32,7 +32,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_ON_OFF_CLUSTER_ID) { diff --git a/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp b/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp index 9c2c2f4d56f83a..7ae9ed906db227 100644 --- a/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp +++ b/examples/temperature-measurement-app/esp32/main/CHIPDeviceManager.cpp @@ -96,7 +96,7 @@ CHIP_ERROR CHIPDeviceManager::Init(CHIPDeviceManagerCallbacks * cb) } // namespace chip void emberAfPostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { chip::DeviceManager::CHIPDeviceManagerCallbacks * cb = chip::DeviceManager::CHIPDeviceManager::GetInstance().GetCHIPDeviceManagerCallbacks(); diff --git a/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp b/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp index c232b7e4ec5c63..843b0503d864cb 100644 --- a/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp +++ b/examples/temperature-measurement-app/esp32/main/DeviceCallbacks.cpp @@ -54,7 +54,7 @@ void DeviceCallbacks::DeviceEventCallback(const ChipDeviceEvent * event, intptr_ } void DeviceCallbacks::PostAttributeChangeCallback(EndpointId endpointId, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, 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 6c1e0aa413296d..0eefdb2bb05904 100644 --- a/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h +++ b/examples/temperature-measurement-app/esp32/main/include/CHIPDeviceManager.h @@ -74,7 +74,7 @@ class DLL_EXPORT CHIPDeviceManagerCallbacks * @param value pointer to the new value */ virtual void PostAttributeChangeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, - uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint8_t mask, uint16_t manufacturerCode, 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 09fec64de37031..502f6af30f6455 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, uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value); + uint8_t mask, uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value); private: void OnInternetConnectivityChange(const chip::DeviceLayer::ChipDeviceEvent * event); diff --git a/examples/tv-app/linux/include/cluster-change-attribute.cpp b/examples/tv-app/linux/include/cluster-change-attribute.cpp index 0ea165efa5002a..ac45627fb864fc 100644 --- a/examples/tv-app/linux/include/cluster-change-attribute.cpp +++ b/examples/tv-app/linux/include/cluster-change-attribute.cpp @@ -45,7 +45,7 @@ void runTvCommand(TvCommand command) } void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId == ZCL_ON_OFF_CLUSTER_ID && attributeId == ZCL_ON_OFF_ATTRIBUTE_ID) { diff --git a/examples/window-app/efr32/src/ZclCallbacks.cpp b/examples/window-app/efr32/src/ZclCallbacks.cpp index 1afad581174237..66af8cf0d7b897 100644 --- a/examples/window-app/efr32/src/ZclCallbacks.cpp +++ b/examples/window-app/efr32/src/ZclCallbacks.cpp @@ -30,7 +30,7 @@ using namespace ::chip; void emberAfPostAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t type, uint8_t size, uint8_t * value) + uint16_t manufacturerCode, uint8_t type, uint16_t size, uint8_t * value) { if (clusterId != ZCL_WINDOW_COVERING_CLUSTER_ID) {