From 51e41b5592f15e13071699f74f2c0fec5a34ea85 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 14 Jan 2022 10:44:54 -0500 Subject: [PATCH] Remove manufacturer code from attribute-table APIs. (#13560) --- examples/bridge-app/esp32/main/main.cpp | 8 +- examples/bridge-app/linux/main.cpp | 14 +- src/app/reporting/reporting.h | 2 +- src/app/util/af.h | 77 +------ src/app/util/attribute-table.cpp | 208 ++---------------- src/app/util/attribute-table.h | 13 +- .../util/ember-compatibility-functions.cpp | 5 +- src/app/util/util.cpp | 27 +-- src/app/util/util.h | 2 - .../templates/app/callback-stub-src.zapt | 2 +- .../zap-templates/templates/app/callback.zapt | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../app-common/zap-generated/callback.h | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../lock-app/zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../app1/zap-generated/callback-stub.cpp | 2 +- .../app2/zap-generated/callback-stub.cpp | 2 +- .../pump-app/zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../tv-app/zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- .../zap-generated/callback-stub.cpp | 2 +- 30 files changed, 65 insertions(+), 333 deletions(-) diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp index 33aee02b2d2900..b80795b56c7821 100644 --- a/examples/bridge-app/esp32/main/main.cpp +++ b/examples/bridge-app/esp32/main/main.cpp @@ -308,7 +308,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, 0, ZCL_BOOLEAN_ATTRIBUTE_TYPE, + ZCL_REACHABLE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &reachable); } @@ -316,7 +316,7 @@ void HandleDeviceStatusChanged(Device * dev, Device::Changed_t itemChangedMask) { uint8_t isOn = dev->IsOn() ? 1 : 0; MatterReportingAttributeChangeCallback(dev->GetEndpointId(), ZCL_ON_OFF_CLUSTER_ID, ZCL_ON_OFF_ATTRIBUTE_ID, - CLUSTER_MASK_SERVER, 0, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); + CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); } if (itemChangedMask & Device::kChanged_Name) @@ -324,7 +324,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, 0, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, + ZCL_NODE_LABEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, zclName); } if (itemChangedMask & Device::kChanged_Location) @@ -337,7 +337,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, 0, ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); + CLUSTER_MASK_SERVER, ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); } } diff --git a/examples/bridge-app/linux/main.cpp b/examples/bridge-app/linux/main.cpp index f6d7814d38f250..fa250dc4c276fb 100644 --- a/examples/bridge-app/linux/main.cpp +++ b/examples/bridge-app/linux/main.cpp @@ -259,7 +259,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, 0, ZCL_BOOLEAN_ATTRIBUTE_TYPE, + ZCL_REACHABLE_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &reachable); } @@ -269,7 +269,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, 0, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, + ZCL_NODE_LABEL_ATTRIBUTE_ID, CLUSTER_MASK_SERVER, ZCL_CHAR_STRING_ATTRIBUTE_TYPE, zclNameSpan.data()); } @@ -283,7 +283,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, 0, ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); + CLUSTER_MASK_SERVER, ZCL_ARRAY_ATTRIBUTE_TYPE, buffer); } } @@ -298,7 +298,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, 0, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); + CLUSTER_MASK_SERVER, ZCL_BOOLEAN_ATTRIBUTE_TYPE, &isOn); } } @@ -313,21 +313,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, 0, ZCL_INT8U_ATTRIBUTE_TYPE, &numberOfPositions); + CLUSTER_MASK_SERVER, 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, 0, ZCL_INT8U_ATTRIBUTE_TYPE, ¤tPosition); + CLUSTER_MASK_SERVER, 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, 0, ZCL_INT8U_ATTRIBUTE_TYPE, &multiPressMax); + CLUSTER_MASK_SERVER, ZCL_INT8U_ATTRIBUTE_TYPE, &multiPressMax); } } diff --git a/src/app/reporting/reporting.h b/src/app/reporting/reporting.h index f6294c0455cee7..c1bda681fbade5 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, uint16_t manufacturerCode, EmberAfAttributeType type, uint8_t * data); + uint8_t mask, 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 1f45e318abddc7..3174acfbd8925f 100644 --- a/src/app/util/af.h +++ b/src/app/util/af.h @@ -153,8 +153,6 @@ bool emberAfContainsClient(chip::EndpointId endpoint, chip::ClusterId clusterId) * to perform the given operation. * * @see emberAfWriteClientAttribute, emberAfWriteServerAttribute, - * emberAfWriteManufacturerSpecificClientAttribute, - * emberAfWriteManufacturerSpecificServerAttribute */ EmberAfStatus emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, EmberAfAttributeType dataType); @@ -168,8 +166,6 @@ EmberAfStatus emberAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId c * is used frequently throughout the framework * * @see emberAfWriteClientAttribute, - * emberAfWriteManufacturerSpecificClientAttribute, - * emberAfWriteManufacturerSpecificServerAttribute */ EmberAfStatus emberAfWriteServerAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * dataPtr, EmberAfAttributeType dataType); @@ -183,44 +179,10 @@ EmberAfStatus emberAfWriteServerAttribute(chip::EndpointId endpoint, chip::Clust * is used frequently throughout the framework * * @see emberAfWriteServerAttribute, - * emberAfWriteManufacturerSpecificClientAttribute, - * emberAfWriteManufacturerSpecificServerAttribute */ EmberAfStatus emberAfWriteClientAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * dataPtr, EmberAfAttributeType dataType); -/** - * @brief write a manufacturer specific server attribute. - * - * This function is the same as emberAfWriteAttribute - * except that it saves having to pass the cluster mask - * and allows passing of a manufacturer code. - * This is useful for code savings since write attribute - * is used frequently throughout the framework - * - * @see emberAfWriteClientAttribute, emberAfWriteServerAttribute, - * emberAfWriteManufacturerSpecificClientAttribute - */ -EmberAfStatus emberAfWriteManufacturerSpecificServerAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, - chip::AttributeId attributeID, uint16_t manufacturerCode, - uint8_t * dataPtr, EmberAfAttributeType dataType); - -/** - * @brief write a manufacturer specific client attribute. - * - * This function is the same as emberAfWriteAttribute - * except that it saves having to pass the cluster mask. - * and allows passing of a manufacturer code. - * This is useful for code savings since write attribute - * is used frequently throughout the framework - * - * @see emberAfWriteClientAttribute, emberAfWriteServerAttribute, - * emberAfWriteManufacturerSpecificServerAttribute - */ -EmberAfStatus emberAfWriteManufacturerSpecificClientAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, - chip::AttributeId attributeID, uint16_t manufacturerCode, - uint8_t * dataPtr, EmberAfAttributeType dataType); - /** * @brief Function that test the success of attribute write. * @@ -236,8 +198,7 @@ EmberAfStatus emberAfWriteManufacturerSpecificClientAttribute(chip::EndpointId e * @param dataType ZCL attribute type. */ EmberAfStatus emberAfVerifyAttributeWrite(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t mask, uint16_t manufacturerCode, uint8_t * dataPtr, - EmberAfAttributeType dataType); + uint8_t mask, uint8_t * dataPtr, EmberAfAttributeType dataType); /** * @brief Read the attribute value, performing all the checks. @@ -248,8 +209,6 @@ EmberAfStatus emberAfVerifyAttributeWrite(chip::EndpointId endpoint, chip::Clust * value or type is not desired. * * @see emberAfReadClientAttribute, emberAfReadServerAttribute, - * emberAfReadManufacturerSpecificClientAttribute, - * emberAfReadManufacturerSpecificServerAttribute */ EmberAfStatus emberAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType); @@ -263,8 +222,6 @@ EmberAfStatus emberAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cl * value or type is not desired. * * @see emberAfReadClientAttribute, - * emberAfReadManufacturerSpecificClientAttribute, - * emberAfReadManufacturerSpecificServerAttribute */ EmberAfStatus emberAfReadServerAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * dataPtr, uint16_t readLength); @@ -278,42 +235,10 @@ EmberAfStatus emberAfReadServerAttribute(chip::EndpointId endpoint, chip::Cluste * value or type is not desired. * * @see emberAfReadServerAttribute, - * emberAfReadManufacturerSpecificClientAttribute, - * emberAfReadManufacturerSpecificServerAttribute */ EmberAfStatus emberAfReadClientAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t * dataPtr, uint16_t readLength); -/** - * @brief Read the manufacturer-specific server attribute value, performing all 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, emberAfReadServerAttribute, - * emberAfReadManufacturerSpecificClientAttribute - */ -EmberAfStatus emberAfReadManufacturerSpecificServerAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, - chip::AttributeId attributeID, uint16_t manufacturerCode, - uint8_t * dataPtr, uint16_t readLength); - -/** - * @brief Read the manufacturer-specific client attribute value, performing all 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, emberAfReadServerAttribute, - * emberAfReadManufacturerSpecificServerAttribute - */ -EmberAfStatus emberAfReadManufacturerSpecificClientAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, - chip::AttributeId attributeID, uint16_t manufacturerCode, - uint8_t * dataPtr, uint16_t readLength); - /** * @brief this function returns the size of the ZCL data in bytes. * diff --git a/src/app/util/attribute-table.cpp b/src/app/util/attribute-table.cpp index 28f58cd504b91e..d3c2473e8ff64a 100644 --- a/src/app/util/attribute-table.cpp +++ b/src/app/util/attribute-table.cpp @@ -69,17 +69,17 @@ using namespace chip; // Globals EmberAfStatus emberAfWriteAttributeExternal(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, - uint16_t manufacturerCode, uint8_t * dataPtr, EmberAfAttributeType dataType) + uint8_t * dataPtr, EmberAfAttributeType dataType) { EmberAfAttributeWritePermission extWritePermission = - emberAfAllowNetworkWriteAttributeCallback(endpoint, cluster, attributeID, mask, manufacturerCode, dataPtr, dataType); + emberAfAllowNetworkWriteAttributeCallback(endpoint, cluster, attributeID, mask, 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, manufacturerCode, dataPtr, dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, mask, dataPtr, dataType, (extWritePermission == EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_OF_READ_ONLY), false); default: return (EmberAfStatus) extWritePermission; @@ -90,7 +90,7 @@ EmberAfStatus emberAfWriteAttributeExternal(EndpointId endpoint, ClusterId clust EmberAfStatus emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, EmberAfAttributeType dataType) { - return emAfWriteAttribute(endpoint, cluster, attributeID, mask, EMBER_AF_NULL_MANUFACTURER_CODE, dataPtr, dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, mask, dataPtr, dataType, true, // override read-only? false); // just test? } @@ -98,8 +98,7 @@ EmberAfStatus emberAfWriteAttribute(EndpointId endpoint, ClusterId cluster, Attr EmberAfStatus emberAfWriteClientAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, EmberAfAttributeType dataType) { - return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, EMBER_AF_NULL_MANUFACTURER_CODE, dataPtr, - dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, dataPtr, dataType, true, // override read-only? false); // just test? } @@ -107,34 +106,15 @@ EmberAfStatus emberAfWriteClientAttribute(EndpointId endpoint, ClusterId cluster EmberAfStatus emberAfWriteServerAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, EmberAfAttributeType dataType) { - return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_SERVER, EMBER_AF_NULL_MANUFACTURER_CODE, dataPtr, - dataType, - true, // override read-only? - false); // just test? -} - -EmberAfStatus emberAfWriteManufacturerSpecificClientAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, - uint16_t manufacturerCode, uint8_t * dataPtr, - EmberAfAttributeType dataType) -{ - return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, manufacturerCode, dataPtr, dataType, - true, // override read-only? - false); // just test? -} - -EmberAfStatus emberAfWriteManufacturerSpecificServerAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, - uint16_t manufacturerCode, uint8_t * dataPtr, - EmberAfAttributeType dataType) -{ - return emAfWriteAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_SERVER, manufacturerCode, dataPtr, 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, - uint16_t manufacturerCode, uint8_t * dataPtr, EmberAfAttributeType dataType) + uint8_t * dataPtr, EmberAfAttributeType dataType) { - return emAfWriteAttribute(endpoint, cluster, attributeID, mask, manufacturerCode, dataPtr, dataType, + return emAfWriteAttribute(endpoint, cluster, attributeID, mask, dataPtr, dataType, false, // override read-only? true); // just test? } @@ -142,39 +122,25 @@ EmberAfStatus emberAfVerifyAttributeWrite(EndpointId endpoint, ClusterId cluster EmberAfStatus emberAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType) { - return emAfReadAttribute(endpoint, cluster, attributeID, mask, EMBER_AF_NULL_MANUFACTURER_CODE, dataPtr, readLength, dataType); + 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, EMBER_AF_NULL_MANUFACTURER_CODE, dataPtr, - readLength, NULL); + return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_SERVER, dataPtr, readLength, NULL); } EmberAfStatus emberAfReadClientAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t * dataPtr, uint16_t readLength) { - return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, EMBER_AF_NULL_MANUFACTURER_CODE, dataPtr, - readLength, NULL); + return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, dataPtr, readLength, NULL); } -EmberAfStatus emberAfReadManufacturerSpecificServerAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, - uint16_t manufacturerCode, uint8_t * dataPtr, uint16_t readLength) -{ - return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_SERVER, manufacturerCode, dataPtr, readLength, NULL); -} - -EmberAfStatus emberAfReadManufacturerSpecificClientAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, - uint16_t manufacturerCode, uint8_t * dataPtr, uint16_t readLength) -{ - return emAfReadAttribute(endpoint, cluster, attributeID, CLUSTER_MASK_CLIENT, manufacturerCode, dataPtr, readLength, NULL); -} - -static void emberAfAttributeDecodeAndPrintCluster(ClusterId cluster, uint16_t mfgCode) +static void emberAfAttributeDecodeAndPrintCluster(ClusterId cluster) { #if defined(EMBER_AF_PRINT_ENABLE) && defined(EMBER_AF_PRINT_ATTRIBUTES) - uint16_t index = emberAfFindClusterNameIndexWithMfgCode(cluster, mfgCode); + uint16_t index = emberAfFindClusterNameIndex(cluster); if (index != 0xFFFF) { emberAfAttributesPrintln("(%p)", zclClusterNames[index].name); @@ -219,8 +185,8 @@ void emberAfPrintAttributeTable(void) (metaData->IsNonVolatile() ? " nonvolatile " : (metaData->IsExternal() ? " extern " : " RAM "))); emberAfAttributesFlush(); status = emAfReadAttribute(ep->endpoint, cluster->clusterId, metaData->attributeId, - (emberAfAttributeIsClient(metaData) ? CLUSTER_MASK_CLIENT : CLUSTER_MASK_SERVER), - EMBER_AF_NULL_MANUFACTURER_CODE, data, ATTRIBUTE_LARGEST, NULL); + (emberAfAttributeIsClient(metaData) ? CLUSTER_MASK_CLIENT : CLUSTER_MASK_SERVER), data, + ATTRIBUTE_LARGEST, NULL); if (status == EMBER_ZCL_STATUS_UNSUPPORTED_ATTRIBUTE) { emberAfAttributesPrintln("Unsupported"); @@ -243,7 +209,7 @@ void emberAfPrintAttributeTable(void) UNUSED_VAR(length); emberAfAttributesPrintBuffer(data, length, true); emberAfAttributesFlush(); - emberAfAttributeDecodeAndPrintCluster(cluster->clusterId, EMBER_AF_NULL_MANUFACTURER_CODE); + emberAfAttributeDecodeAndPrintCluster(cluster->clusterId); } } } @@ -251,137 +217,6 @@ void emberAfPrintAttributeTable(void) } } -// given a clusterId and an attribute to read, this crafts the response -// and places it in the response buffer. Response is one of two items: -// 1) unsupported: [attrId:2] [status:1] -// 2) supported: [attrId:2] [status:1] [type:1] [data:n] -// -void emberAfRetrieveAttributeAndCraftResponse(EndpointId endpoint, ClusterId clusterId, AttributeId attrId, uint8_t mask, - uint16_t manufacturerCode, uint16_t readLength) -{ - EmberAfStatus status; - uint8_t data[ATTRIBUTE_LARGEST]; - uint8_t dataType; - uint16_t dataLen; - - // account for at least one byte of data - if (readLength < 5) - { - return; - } - - emberAfAttributesPrintln("OTA READ: ep:%" PRIx16 " cid:" ChipLogFormatMEI " attid:" ChipLogFormatMEI " msk:%x mfcode:%2x", - endpoint, ChipLogValueMEI(clusterId), ChipLogValueMEI(attrId), mask, manufacturerCode); - - // lookup the attribute in our table - status = emAfReadAttribute(endpoint, clusterId, attrId, mask, manufacturerCode, data, ATTRIBUTE_LARGEST, &dataType); - if (status == EMBER_ZCL_STATUS_SUCCESS) - { - dataLen = emberAfAttributeValueSize(clusterId, attrId, dataType, data); - if ((readLength - 4) < dataLen) - { // Not enough space for attribute. - return; - } - } - else - { - emberAfPutInt32uInResp(attrId); - emberAfPutStatusInResp(status); - emberAfAttributesPrintln("READ: clus " ChipLogFormatMEI ", attr " ChipLogFormatMEI " failed %x", ChipLogValueMEI(clusterId), - ChipLogValueMEI(attrId), status); - emberAfAttributesFlush(); - return; - } - - // put attribute in least sig byte first - emberAfPutInt32uInResp(attrId); - - // attribute is found, so copy in the status and the data type - emberAfPutInt8uInResp(EMBER_ZCL_STATUS_SUCCESS); - emberAfPutInt8uInResp(dataType); - - if (dataLen < (EMBER_AF_RESPONSE_BUFFER_LEN - appResponseLength)) - { -#if (BIGENDIAN_CPU) - // strings go over the air as length byte and then in human - // readable format. These should not be flipped. Other attributes - // need to be flipped so they go little endian OTA - if (isThisDataTypeSentLittleEndianOTA(dataType)) - { - uint8_t i; - for (i = 0; i < dataLen; i++) - { - appResponseData[appResponseLength + i] = data[dataLen - i - 1]; - } - } - else - { - memmove(&(appResponseData[appResponseLength]), data, dataLen); - } -#else //(BIGENDIAN_CPU) - memmove(&(appResponseData[appResponseLength]), data, dataLen); -#endif //(BIGENDIAN_CPU) - // TODO: How do we know this does not overflow? - appResponseLength = static_cast(appResponseLength + dataLen); - } - - emberAfAttributesPrintln("READ: clus " ChipLogFormatMEI ", attr " ChipLogFormatMEI ", dataLen: %x, OK", - ChipLogValueMEI(clusterId), ChipLogValueMEI(attrId), dataLen); - emberAfAttributesFlush(); -} - -// This function appends the attribute report fields for the given endpoint, -// cluster, and attribute to the buffer starting at the index. If there is -// insufficient space in the buffer or an error occurs, buffer and bufIndex will -// remain unchanged. Otherwise, bufIndex will be incremented appropriately and -// the fields will be written to the buffer. -EmberAfStatus emberAfAppendAttributeReportFields(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint8_t * buffer, uint8_t bufLen, uint8_t * bufIndex) -{ - EmberAfStatus status; - EmberAfAttributeType type; - uint16_t size; - uint16_t bufLen16 = (uint16_t) bufLen; - uint8_t data[ATTRIBUTE_LARGEST]; - - status = emberAfReadAttribute(endpoint, clusterId, attributeId, mask, data, sizeof(data), &type); - if (status != EMBER_ZCL_STATUS_SUCCESS) - { - goto kickout; - } - - size = emberAfAttributeValueSize(clusterId, attributeId, type, data); - if (bufLen16 - *bufIndex < 3 || size > bufLen16 - (*bufIndex + 3)) - { - status = EMBER_ZCL_STATUS_INSUFFICIENT_SPACE; - goto kickout; - } - - buffer[(*bufIndex)++] = EMBER_LOW_BYTE(attributeId); - buffer[(*bufIndex)++] = EMBER_HIGH_BYTE(attributeId); - buffer[(*bufIndex)++] = type; -#if (BIGENDIAN_CPU) - if (isThisDataTypeSentLittleEndianOTA(type)) - { - emberReverseMemCopy(buffer + *bufIndex, data, size); - } - else - { - memmove(buffer + *bufIndex, data, size); - } -#else - memmove(buffer + *bufIndex, data, size); -#endif - *bufIndex = static_cast(*bufIndex + size); - -kickout: - emberAfAttributesPrintln("REPORT: clus " ChipLogFormatMEI ", attr " ChipLogFormatMEI ": 0x%x", ChipLogValueMEI(clusterId), - ChipLogValueMEI(attributeId), status); - emberAfAttributesFlush(); - - return status; -} - //------------------------------------------------------------------------------ // Internal Functions @@ -462,9 +297,8 @@ 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, - uint16_t manufacturerCode, uint8_t * data, EmberAfAttributeType dataType, - bool overrideReadOnlyAndDataType, bool justTest) +EmberAfStatus emAfWriteAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * data, + EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, bool justTest) { EmberAfAttributeMetadata * metadata = NULL; EmberAfAttributeSearchRecord record; @@ -583,7 +417,7 @@ 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, manufacturerCode, dataType, data); + MatterReportingAttributeChangeCallback(endpoint, cluster, attributeID, mask, dataType, data); // Post write attribute callback for all attributes changes, regardless // of cluster. @@ -608,8 +442,8 @@ 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, - uint16_t manufacturerCode, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType) +EmberAfStatus emAfReadAttribute(EndpointId endpoint, ClusterId cluster, AttributeId attributeID, uint8_t mask, uint8_t * dataPtr, + uint16_t readLength, EmberAfAttributeType * dataType) { EmberAfAttributeMetadata * metadata = NULL; EmberAfAttributeSearchRecord record; diff --git a/src/app/util/attribute-table.h b/src/app/util/attribute-table.h index d623b2543b2d43..fbae46ac559be6 100644 --- a/src/app/util/attribute-table.h +++ b/src/app/util/attribute-table.h @@ -47,19 +47,12 @@ // Remote devices writing attributes of local device EmberAfStatus emberAfWriteAttributeExternal(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, - uint8_t mask, uint16_t manufacturerCode, uint8_t * dataPtr, - EmberAfAttributeType dataType); + uint8_t mask, uint8_t * dataPtr, EmberAfAttributeType dataType); -void emberAfRetrieveAttributeAndCraftResponse(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attrId, - uint8_t mask, uint16_t manufacturerCode, uint16_t readLength); -EmberAfStatus emberAfAppendAttributeReportFields(chip::EndpointId endpoint, chip::ClusterId clusterId, - chip::AttributeId attributeId, uint8_t mask, uint8_t * buffer, uint8_t bufLen, - uint8_t * bufIndex); void emberAfPrintAttributeTable(void); EmberAfStatus emAfWriteAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, - uint16_t manufacturerCode, uint8_t * data, EmberAfAttributeType dataType, - bool overrideReadOnlyAndDataType, bool justTest); + uint8_t * data, EmberAfAttributeType dataType, bool overrideReadOnlyAndDataType, bool justTest); EmberAfStatus emAfReadAttribute(chip::EndpointId endpoint, chip::ClusterId cluster, chip::AttributeId attributeID, uint8_t mask, - uint16_t manufacturerCode, uint8_t * dataPtr, uint16_t readLength, EmberAfAttributeType * dataType); + 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 3b76151fb3d863..369f3d0c343e55 100644 --- a/src/app/util/ember-compatibility-functions.cpp +++ b/src/app/util/ember-compatibility-functions.cpp @@ -894,7 +894,7 @@ CHIP_ERROR WriteSingleClusterData(const SubjectDescriptor & aSubjectDescriptor, } auto status = ToInteractionModelStatus(emberAfWriteAttributeExternal(aPath.mEndpointId, aPath.mClusterId, aPath.mAttributeId, - CLUSTER_MASK_SERVER, 0, attributeData, + CLUSTER_MASK_SERVER, attributeData, attributeMetadata->attributeType)); return apWriteHandler->AddStatus(attributePathParams, status); } @@ -903,9 +903,8 @@ CHIP_ERROR WriteSingleClusterData(const SubjectDescriptor & aSubjectDescriptor, } // namespace chip void MatterReportingAttributeChangeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, EmberAfAttributeType type, uint8_t * data) + EmberAfAttributeType type, uint8_t * data) { - IgnoreUnusedVariable(manufacturerCode); IgnoreUnusedVariable(type); IgnoreUnusedVariable(data); IgnoreUnusedVariable(mask); diff --git a/src/app/util/util.cpp b/src/app/util/util.cpp index 06add3f7ee01d4..55850c493e80ea 100644 --- a/src/app/util/util.cpp +++ b/src/app/util/util.cpp @@ -325,20 +325,13 @@ void emberAfStackDown(void) // Print out information about each cluster // **************************************** -uint16_t emberAfFindClusterNameIndexWithMfgCode(ClusterId cluster, uint16_t mfgCode) +uint16_t emberAfFindClusterNameIndex(ClusterId cluster) { static_assert(sizeof(ClusterId) == 4, "May need to adjust our index type or somehow define it in terms of cluster id type"); uint16_t index = 0; while (zclClusterNames[index].id != ZCL_NULL_CLUSTER_ID) { - if (zclClusterNames[index].id == cluster - // This check sees if its a standard cluster, in which mfgCode is ignored - // due to the name being well defined. - // If it is manufacturer specific, then we try to check to see if we - // know the name of the cluster within the list. - // If the mfgCode we are given is null, then we just ignore it for backward - // compatibility reasons - && (cluster < 0xFC00 || zclClusterNames[index].mfgCode == mfgCode || mfgCode == EMBER_AF_NULL_MANUFACTURER_CODE)) + if (zclClusterNames[index].id == cluster) { return index; } @@ -347,16 +340,11 @@ uint16_t emberAfFindClusterNameIndexWithMfgCode(ClusterId cluster, uint16_t mfgC return 0xFFFF; } -uint16_t emberAfFindClusterNameIndex(ClusterId cluster) -{ - return emberAfFindClusterNameIndexWithMfgCode(cluster, EMBER_AF_NULL_MANUFACTURER_CODE); -} - // This function parses into the cluster name table, and tries to find -// the index in the table that has the two keys: cluster + mfgcode. -void emberAfDecodeAndPrintClusterWithMfgCode(ClusterId cluster, uint16_t mfgCode) +// the index in the table that has the right cluster id. +void emberAfDecodeAndPrintCluster(ClusterId cluster) { - uint16_t index = emberAfFindClusterNameIndexWithMfgCode(cluster, mfgCode); + uint16_t index = emberAfFindClusterNameIndex(cluster); if (index == 0xFFFF) { static_assert(sizeof(ClusterId) == 4, "Adjust the print formatting"); @@ -368,11 +356,6 @@ void emberAfDecodeAndPrintClusterWithMfgCode(ClusterId cluster, uint16_t mfgCode } } -void emberAfDecodeAndPrintCluster(ClusterId cluster) -{ - emberAfDecodeAndPrintClusterWithMfgCode(cluster, EMBER_AF_NULL_MANUFACTURER_CODE); -} - // This function makes the assumption that // emberAfCurrentCommand will either be NULL // when invalid, or will have a valid mfgCode diff --git a/src/app/util/util.h b/src/app/util/util.h index 84def0875d2335..0ebbc750a45c38 100644 --- a/src/app/util/util.h +++ b/src/app/util/util.h @@ -145,11 +145,9 @@ uint16_t emberAfGetMfgCodeFromCurrentCommand(void); void emberAfInit(chip::Messaging::ExchangeManager * exchangeContext); void emberAfTick(void); uint16_t emberAfFindClusterNameIndex(chip::ClusterId cluster); -uint16_t emberAfFindClusterNameIndexWithMfgCode(chip::ClusterId cluster, uint16_t mfgCode); void emberAfStackDown(void); void emberAfDecodeAndPrintCluster(chip::ClusterId cluster); -void emberAfDecodeAndPrintClusterWithMfgCode(chip::ClusterId cluster, uint16_t mfgCode); /** * Retrieves the difference between the two passed values. 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 a3b874658246c6..129caa153d22eb 100644 --- a/src/app/zap-templates/templates/app/callback-stub-src.zapt +++ b/src/app/zap-templates/templates/app/callback-stub-src.zapt @@ -42,7 +42,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback( EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/src/app/zap-templates/templates/app/callback.zapt b/src/app/zap-templates/templates/app/callback.zapt index adfdb0553fff5e..7528d1d4130843 100644 --- a/src/app/zap-templates/templates/app/callback.zapt +++ b/src/app/zap-templates/templates/app/callback.zapt @@ -213,7 +213,7 @@ void emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks); */ EmberAfAttributeWritePermission emberAfAllowNetworkWriteAttributeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type); + uint8_t * value, uint8_t type); /** @brief Attribute Read Access * 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 3d5bf0ef4e2b03..669aad0bc0eb0c 100644 --- a/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/callback-stub.cpp @@ -542,7 +542,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 11d7eb7a353b61..9d208dd4b77cb9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -15285,7 +15285,7 @@ void emberAfRemoveFromCurrentAppTasksCallback(EmberAfApplicationTask tasks); */ EmberAfAttributeWritePermission emberAfAllowNetworkWriteAttributeCallback(chip::EndpointId endpoint, chip::ClusterId clusterId, chip::AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type); + uint8_t * value, uint8_t type); /** @brief Attribute Read Access * diff --git a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp index db808e845ccbf2..80238761f1dba6 100644 --- a/zzz_generated/bridge-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/bridge-app/zap-generated/callback-stub.cpp @@ -190,7 +190,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp index 553c4b2eace656..614b3f60bbfb8e 100644 --- a/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp +++ b/zzz_generated/controller-clusters/zap-generated/callback-stub.cpp @@ -534,7 +534,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/door-lock-app/zap-generated/callback-stub.cpp b/zzz_generated/door-lock-app/zap-generated/callback-stub.cpp index 91e0e39bba160a..c017282ef1cbe1 100644 --- a/zzz_generated/door-lock-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/door-lock-app/zap-generated/callback-stub.cpp @@ -190,7 +190,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp index 978e166c1c419c..174b1ba630740f 100644 --- a/zzz_generated/lighting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/lighting-app/zap-generated/callback-stub.cpp @@ -238,7 +238,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/lock-app/zap-generated/callback-stub.cpp b/zzz_generated/lock-app/zap-generated/callback-stub.cpp index 0ff68ab589c5c0..476be726134688 100644 --- a/zzz_generated/lock-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/lock-app/zap-generated/callback-stub.cpp @@ -190,7 +190,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 28ea38411726b0..b41bc5cc2758f5 100644 --- a/zzz_generated/log-source-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/log-source-app/zap-generated/callback-stub.cpp @@ -78,7 +78,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 970d17d71a9bb9..66285f85447034 100644 --- a/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/ota-provider-app/zap-generated/callback-stub.cpp @@ -102,7 +102,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 500c51e856ba69..468a654cb7820f 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/ota-requestor-app/zap-generated/callback-stub.cpp @@ -118,7 +118,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp index 0b4cea00e38d0d..8f969cda28131c 100644 --- a/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app1/zap-generated/callback-stub.cpp @@ -142,7 +142,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp index 0b4cea00e38d0d..8f969cda28131c 100644 --- a/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp +++ b/zzz_generated/placeholder/app2/zap-generated/callback-stub.cpp @@ -142,7 +142,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/pump-app/zap-generated/callback-stub.cpp b/zzz_generated/pump-app/zap-generated/callback-stub.cpp index 56c234f67b6905..c7b27ef1c08073 100644 --- a/zzz_generated/pump-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-app/zap-generated/callback-stub.cpp @@ -198,7 +198,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 b3ada25d6ddec5..ff093a6a8b0735 100644 --- a/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/callback-stub.cpp @@ -214,7 +214,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 ecf1610feb98f7..f00da99a372601 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/temperature-measurement-app/zap-generated/callback-stub.cpp @@ -166,7 +166,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/thermostat/zap-generated/callback-stub.cpp b/zzz_generated/thermostat/zap-generated/callback-stub.cpp index 5b349786749461..6639804cde08ba 100644 --- a/zzz_generated/thermostat/zap-generated/callback-stub.cpp +++ b/zzz_generated/thermostat/zap-generated/callback-stub.cpp @@ -222,7 +222,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/tv-app/zap-generated/callback-stub.cpp b/zzz_generated/tv-app/zap-generated/callback-stub.cpp index 84e72526be3645..020e1eb2ea2a00 100644 --- a/zzz_generated/tv-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-app/zap-generated/callback-stub.cpp @@ -310,7 +310,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } 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 5e6947d605ad84..53e5806d7842f2 100644 --- a/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/callback-stub.cpp @@ -438,7 +438,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default } diff --git a/zzz_generated/window-app/zap-generated/callback-stub.cpp b/zzz_generated/window-app/zap-generated/callback-stub.cpp index b92b84140138dc..5415ccc97ce01e 100644 --- a/zzz_generated/window-app/zap-generated/callback-stub.cpp +++ b/zzz_generated/window-app/zap-generated/callback-stub.cpp @@ -182,7 +182,7 @@ void __attribute__((weak)) emberAfRemoveFromCurrentAppTasksCallback(EmberAfAppli EmberAfAttributeWritePermission __attribute__((weak)) emberAfAllowNetworkWriteAttributeCallback(EndpointId endpoint, ClusterId clusterId, AttributeId attributeId, uint8_t mask, - uint16_t manufacturerCode, uint8_t * value, uint8_t type) + uint8_t * value, uint8_t type) { return EMBER_ZCL_ATTRIBUTE_WRITE_PERMISSION_ALLOW_WRITE_NORMAL; // Default }