From 196672294e6d34cd7f27c34f9adae01b71753e3f Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 25 Apr 2022 22:47:16 -0400 Subject: [PATCH] Ensure that read attribute paths are valid paths. (#17664) Disallow out-of-range attribute ids and wildcard cluster with non-wildcard non-global attribute. Fixes https://github.com/project-chip/connectedhomeip/issues/14026 --- .../all-clusters-app.matter | 66 ++--- .../all-clusters-common/all-clusters-app.zap | 66 ++--- src/app/InteractionModelEngine.cpp | 7 +- src/app/MessageDef/StatusIB.cpp | 2 +- src/app/MessageDef/StatusResponseMessage.cpp | 7 +- src/app/ReadHandler.cpp | 38 ++- src/app/tests/TestReadInteraction.cpp | 3 +- src/app/util/mock/Constants.h | 3 +- .../zcl/data-model/chip/test-cluster.xml | 66 ++--- .../data_model/controller-clusters.matter | 66 ++--- .../data_model/controller-clusters.zap | 66 ++--- .../chip/devicecontroller/ChipIdLookup.java | 66 ++--- .../python/chip/clusters/CHIPClusters.py | 132 ++++----- .../python/chip/clusters/Objects.py | 132 ++++----- src/lib/core/DataModelTypes.h | 45 ++- .../zap-generated/endpoint_config.h | 66 ++--- .../app-common/zap-generated/attribute-id.h | 66 ++--- .../app-common/zap-generated/ids/Attributes.h | 66 ++--- .../zap-generated/cluster/Commands.h | 264 +++++++++--------- .../zap-generated/cluster/Commands.h | 198 ++++++------- 20 files changed, 738 insertions(+), 687 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 071bc21949112d..a2755ad226afd3 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -3109,39 +3109,39 @@ server cluster TestCluster = 1295 { attribute boolean timedWriteBoolean = 48; attribute boolean generalErrorBoolean = 49; attribute boolean clusterErrorBoolean = 50; - attribute nullable boolean nullableBoolean = 32768; - attribute nullable Bitmap8MaskMap nullableBitmap8 = 32769; - attribute nullable Bitmap16MaskMap nullableBitmap16 = 32770; - attribute nullable Bitmap32MaskMap nullableBitmap32 = 32771; - attribute nullable Bitmap64MaskMap nullableBitmap64 = 32772; - attribute nullable int8u nullableInt8u = 32773; - attribute nullable int16u nullableInt16u = 32774; - attribute nullable int24u nullableInt24u = 32775; - attribute nullable int32u nullableInt32u = 32776; - attribute nullable int40u nullableInt40u = 32777; - attribute nullable int48u nullableInt48u = 32778; - attribute nullable int56u nullableInt56u = 32779; - attribute nullable int64u nullableInt64u = 32780; - attribute nullable int8s nullableInt8s = 32781; - attribute nullable int16s nullableInt16s = 32782; - attribute nullable int24s nullableInt24s = 32783; - attribute nullable int32s nullableInt32s = 32784; - attribute nullable int40s nullableInt40s = 32785; - attribute nullable int48s nullableInt48s = 32786; - attribute nullable int56s nullableInt56s = 32787; - attribute nullable int64s nullableInt64s = 32788; - attribute nullable enum8 nullableEnum8 = 32789; - attribute nullable enum16 nullableEnum16 = 32790; - attribute nullable single nullableFloatSingle = 32791; - attribute nullable double nullableFloatDouble = 32792; - attribute nullable octet_string<10> nullableOctetString = 32793; - attribute nullable char_string<10> nullableCharString = 32798; - attribute nullable SimpleEnum nullableEnumAttr = 32804; - attribute nullable SimpleStruct nullableStruct = 32805; - attribute nullable int8u nullableRangeRestrictedInt8u = 32806; - attribute nullable int8s nullableRangeRestrictedInt8s = 32807; - attribute nullable int16u nullableRangeRestrictedInt16u = 32808; - attribute nullable int16s nullableRangeRestrictedInt16s = 32809; + attribute nullable boolean nullableBoolean = 16384; + attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385; + attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386; + attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387; + attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388; + attribute nullable int8u nullableInt8u = 16389; + attribute nullable int16u nullableInt16u = 16390; + attribute nullable int24u nullableInt24u = 16391; + attribute nullable int32u nullableInt32u = 16392; + attribute nullable int40u nullableInt40u = 16393; + attribute nullable int48u nullableInt48u = 16394; + attribute nullable int56u nullableInt56u = 16395; + attribute nullable int64u nullableInt64u = 16396; + attribute nullable int8s nullableInt8s = 16397; + attribute nullable int16s nullableInt16s = 16398; + attribute nullable int24s nullableInt24s = 16399; + attribute nullable int32s nullableInt32s = 16400; + attribute nullable int40s nullableInt40s = 16401; + attribute nullable int48s nullableInt48s = 16402; + attribute nullable int56s nullableInt56s = 16403; + attribute nullable int64s nullableInt64s = 16404; + attribute nullable enum8 nullableEnum8 = 16405; + attribute nullable enum16 nullableEnum16 = 16406; + attribute nullable single nullableFloatSingle = 16407; + attribute nullable double nullableFloatDouble = 16408; + attribute nullable octet_string<10> nullableOctetString = 16409; + attribute nullable char_string<10> nullableCharString = 16414; + attribute nullable SimpleEnum nullableEnumAttr = 16420; + attribute nullable SimpleStruct nullableStruct = 16421; + attribute nullable int8u nullableRangeRestrictedInt8u = 16422; + attribute nullable int8s nullableRangeRestrictedInt8s = 16423; + attribute nullable int16u nullableRangeRestrictedInt16u = 16424; + attribute nullable int16s nullableRangeRestrictedInt16s = 16425; readonly attribute int16u clusterRevision = 65533; request struct TestAddArgumentsRequest { diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 1520949f5cb900..f17df8f6086378 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -17613,7 +17613,7 @@ }, { "name": "nullable_boolean", - "code": 32768, + "code": 16384, "mfgCode": null, "side": "server", "included": 1, @@ -17628,7 +17628,7 @@ }, { "name": "nullable_bitmap8", - "code": 32769, + "code": 16385, "mfgCode": null, "side": "server", "included": 1, @@ -17643,7 +17643,7 @@ }, { "name": "nullable_bitmap16", - "code": 32770, + "code": 16386, "mfgCode": null, "side": "server", "included": 1, @@ -17658,7 +17658,7 @@ }, { "name": "nullable_bitmap32", - "code": 32771, + "code": 16387, "mfgCode": null, "side": "server", "included": 1, @@ -17673,7 +17673,7 @@ }, { "name": "nullable_bitmap64", - "code": 32772, + "code": 16388, "mfgCode": null, "side": "server", "included": 1, @@ -17688,7 +17688,7 @@ }, { "name": "nullable_int8u", - "code": 32773, + "code": 16389, "mfgCode": null, "side": "server", "included": 1, @@ -17703,7 +17703,7 @@ }, { "name": "nullable_int16u", - "code": 32774, + "code": 16390, "mfgCode": null, "side": "server", "included": 1, @@ -17718,7 +17718,7 @@ }, { "name": "nullable_int24u", - "code": 32775, + "code": 16391, "mfgCode": null, "side": "server", "included": 1, @@ -17733,7 +17733,7 @@ }, { "name": "nullable_int32u", - "code": 32776, + "code": 16392, "mfgCode": null, "side": "server", "included": 1, @@ -17748,7 +17748,7 @@ }, { "name": "nullable_int40u", - "code": 32777, + "code": 16393, "mfgCode": null, "side": "server", "included": 1, @@ -17763,7 +17763,7 @@ }, { "name": "nullable_int48u", - "code": 32778, + "code": 16394, "mfgCode": null, "side": "server", "included": 1, @@ -17778,7 +17778,7 @@ }, { "name": "nullable_int56u", - "code": 32779, + "code": 16395, "mfgCode": null, "side": "server", "included": 1, @@ -17793,7 +17793,7 @@ }, { "name": "nullable_int64u", - "code": 32780, + "code": 16396, "mfgCode": null, "side": "server", "included": 1, @@ -17808,7 +17808,7 @@ }, { "name": "nullable_int8s", - "code": 32781, + "code": 16397, "mfgCode": null, "side": "server", "included": 1, @@ -17823,7 +17823,7 @@ }, { "name": "nullable_int16s", - "code": 32782, + "code": 16398, "mfgCode": null, "side": "server", "included": 1, @@ -17838,7 +17838,7 @@ }, { "name": "nullable_int24s", - "code": 32783, + "code": 16399, "mfgCode": null, "side": "server", "included": 1, @@ -17853,7 +17853,7 @@ }, { "name": "nullable_int32s", - "code": 32784, + "code": 16400, "mfgCode": null, "side": "server", "included": 1, @@ -17868,7 +17868,7 @@ }, { "name": "nullable_int40s", - "code": 32785, + "code": 16401, "mfgCode": null, "side": "server", "included": 1, @@ -17883,7 +17883,7 @@ }, { "name": "nullable_int48s", - "code": 32786, + "code": 16402, "mfgCode": null, "side": "server", "included": 1, @@ -17898,7 +17898,7 @@ }, { "name": "nullable_int56s", - "code": 32787, + "code": 16403, "mfgCode": null, "side": "server", "included": 1, @@ -17913,7 +17913,7 @@ }, { "name": "nullable_int64s", - "code": 32788, + "code": 16404, "mfgCode": null, "side": "server", "included": 1, @@ -17928,7 +17928,7 @@ }, { "name": "nullable_enum8", - "code": 32789, + "code": 16405, "mfgCode": null, "side": "server", "included": 1, @@ -17943,7 +17943,7 @@ }, { "name": "nullable_enum16", - "code": 32790, + "code": 16406, "mfgCode": null, "side": "server", "included": 1, @@ -17958,7 +17958,7 @@ }, { "name": "nullable_float_single", - "code": 32791, + "code": 16407, "mfgCode": null, "side": "server", "included": 1, @@ -17973,7 +17973,7 @@ }, { "name": "nullable_float_double", - "code": 32792, + "code": 16408, "mfgCode": null, "side": "server", "included": 1, @@ -17988,7 +17988,7 @@ }, { "name": "nullable_octet_string", - "code": 32793, + "code": 16409, "mfgCode": null, "side": "server", "included": 1, @@ -18003,7 +18003,7 @@ }, { "name": "nullable_char_string", - "code": 32798, + "code": 16414, "mfgCode": null, "side": "server", "included": 1, @@ -18018,7 +18018,7 @@ }, { "name": "nullable_enum_attr", - "code": 32804, + "code": 16420, "mfgCode": null, "side": "server", "included": 1, @@ -18033,7 +18033,7 @@ }, { "name": "nullable_struct", - "code": 32805, + "code": 16421, "mfgCode": null, "side": "server", "included": 1, @@ -18048,7 +18048,7 @@ }, { "name": "nullable_range_restricted_int8u", - "code": 32806, + "code": 16422, "mfgCode": null, "side": "server", "included": 1, @@ -18063,7 +18063,7 @@ }, { "name": "nullable_range_restricted_int8s", - "code": 32807, + "code": 16423, "mfgCode": null, "side": "server", "included": 1, @@ -18078,7 +18078,7 @@ }, { "name": "nullable_range_restricted_int16u", - "code": 32808, + "code": 16424, "mfgCode": null, "side": "server", "included": 1, @@ -18093,7 +18093,7 @@ }, { "name": "nullable_range_restricted_int16s", - "code": 32809, + "code": 16425, "mfgCode": null, "side": "server", "included": 1, diff --git a/src/app/InteractionModelEngine.cpp b/src/app/InteractionModelEngine.cpp index 166c86456521f9..f0f4d3925e32de 100644 --- a/src/app/InteractionModelEngine.cpp +++ b/src/app/InteractionModelEngine.cpp @@ -389,14 +389,11 @@ CHIP_ERROR InteractionModelEngine::OnReadInitialRequest(Messaging::ExchangeConte { aStatus = Protocols::InteractionModel::Status::ResourceExhausted; } - else if (err.IsIMStatus()) + else { aStatus = StatusIB(err).mStatus; } - ReturnErrorOnFailure(err); - - aStatus = Protocols::InteractionModel::Status::Success; - return CHIP_NO_ERROR; + return err; } ChipLogProgress(InteractionModel, "no resource for %s interaction", diff --git a/src/app/MessageDef/StatusIB.cpp b/src/app/MessageDef/StatusIB.cpp index 3e956f9246b36e..37fbca49cab78b 100644 --- a/src/app/MessageDef/StatusIB.cpp +++ b/src/app/MessageDef/StatusIB.cpp @@ -82,7 +82,7 @@ CHIP_ERROR StatusIB::Parser::CheckSchemaValidity() const #if CHIP_DETAIL_LOGGING { - uint16_t status; + uint8_t status; ReturnErrorOnFailure(reader.Get(status)); PRETTY_PRINT("\tstatus = " ChipLogFormatIMStatus ",", ChipLogValueIMStatus(static_cast(status))); } diff --git a/src/app/MessageDef/StatusResponseMessage.cpp b/src/app/MessageDef/StatusResponseMessage.cpp index e68d727dd247c0..d0a605e1c47d98 100644 --- a/src/app/MessageDef/StatusResponseMessage.cpp +++ b/src/app/MessageDef/StatusResponseMessage.cpp @@ -16,6 +16,9 @@ #include "StatusResponseMessage.h" #include "MessageDefHelper.h" +#include "protocols/interaction_model/Constants.h" + +using namespace chip::Protocols::InteractionModel; namespace chip { namespace app { @@ -42,9 +45,9 @@ CHIP_ERROR StatusResponseMessage::Parser::CheckSchemaValidity() const VerifyOrReturnError(TLV::kTLVType_UnsignedInteger == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); #if CHIP_DETAIL_LOGGING { - uint16_t status; + uint8_t status; ReturnErrorOnFailure(reader.Get(status)); - PRETTY_PRINT("\tStatus = 0x%x,", status); + PRETTY_PRINT("\tStatus = " ChipLogFormatIMStatus ",", ChipLogValueIMStatus(static_cast(status))); } #endif // CHIP_DETAIL_LOGGING break; diff --git a/src/app/ReadHandler.cpp b/src/app/ReadHandler.cpp index f2ab53d7da2de2..9c4d38748faf30 100644 --- a/src/app/ReadHandler.cpp +++ b/src/app/ReadHandler.cpp @@ -332,7 +332,14 @@ CHIP_ERROR ReadHandler::ProcessReadRequest(System::PacketBufferHandle && aPayloa ReturnErrorOnFailure(readRequestParser.Init(reader)); #if CHIP_CONFIG_IM_ENABLE_SCHEMA_CHECK - ReturnErrorOnFailure(readRequestParser.CheckSchemaValidity()); + err = readRequestParser.CheckSchemaValidity(); + if (err != CHIP_NO_ERROR) + { + // The actual error we want to return to our consumer is an IM "invalid + // action" error, not whatever internal error CheckSchemaValidity + // happens to come up with. + return CHIP_IM_GLOBAL_STATUS(InvalidAction); + } #endif err = readRequestParser.GetAttributeRequests(&attributePathListParser); @@ -405,46 +412,55 @@ CHIP_ERROR ReadHandler::ProcessAttributePathList(AttributePathIBs::Parser & aAtt AttributePathIB::Parser path; err = path.Init(reader); SuccessOrExit(err); - // TODO: MEIs (ClusterId and AttributeId) have a invalid pattern instead of a single invalid value, need to add separate - // functions for checking if we have received valid values. - // TODO: Wildcard cluster id with non-global attributes or wildcard attribute paths should be rejected. + err = path.GetEndpoint(&(attribute.mEndpointId)); if (err == CHIP_NO_ERROR) { - VerifyOrExit(!attribute.HasWildcardEndpointId(), err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrExit(!attribute.HasWildcardEndpointId(), err = CHIP_IM_GLOBAL_STATUS(InvalidAction)); } else if (err == CHIP_END_OF_TLV) { err = CHIP_NO_ERROR; } SuccessOrExit(err); - err = path.GetCluster(&(attribute.mClusterId)); + + ClusterId clusterId = kInvalidClusterId; + err = path.GetCluster(&clusterId); if (err == CHIP_NO_ERROR) { - VerifyOrExit(!attribute.HasWildcardClusterId(), err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrExit(IsValidClusterId(clusterId), err = CHIP_IM_GLOBAL_STATUS(InvalidAction)); + attribute.mClusterId = clusterId; } else if (err == CHIP_END_OF_TLV) { err = CHIP_NO_ERROR; } - SuccessOrExit(err); - err = path.GetAttribute(&(attribute.mAttributeId)); + + AttributeId attributeId = kInvalidAttributeId; + err = path.GetAttribute(&attributeId); if (CHIP_END_OF_TLV == err) { err = CHIP_NO_ERROR; } else if (err == CHIP_NO_ERROR) { - VerifyOrExit(!attribute.HasWildcardAttributeId(), err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + VerifyOrExit(IsValidAttributeId(attributeId), err = CHIP_IM_GLOBAL_STATUS(InvalidAction)); + attribute.mAttributeId = attributeId; } SuccessOrExit(err); + // A wildcard cluster requires that the attribute path either be + // wildcard or a global attribute. + VerifyOrExit(!attribute.HasWildcardClusterId() || attribute.HasWildcardAttributeId() || + IsGlobalAttribute(attribute.mAttributeId), + err = CHIP_IM_GLOBAL_STATUS(InvalidAction)); + err = path.GetListIndex(&(attribute.mListIndex)); if (CHIP_NO_ERROR == err) { VerifyOrExit(!attribute.HasWildcardAttributeId() && !attribute.HasWildcardListIndex(), - err = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + err = CHIP_IM_GLOBAL_STATUS(InvalidAction)); } else if (CHIP_END_OF_TLV == err) { diff --git a/src/app/tests/TestReadInteraction.cpp b/src/app/tests/TestReadInteraction.cpp index 38a6ad998aa2d9..ad0c3c7a2343a3 100644 --- a/src/app/tests/TestReadInteraction.cpp +++ b/src/app/tests/TestReadInteraction.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include @@ -597,7 +598,7 @@ void TestReadInteraction::TestReadHandlerInvalidAttributePath(nlTestSuite * apSu NL_TEST_ASSERT(apSuite, err == CHIP_NO_ERROR); err = readHandler.OnInitialRequest(std::move(readRequestbuf)); - NL_TEST_ASSERT(apSuite, err == CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH); + NL_TEST_ASSERT(apSuite, err == CHIP_IM_GLOBAL_STATUS(InvalidAction)); // // In the call above to OnInitialRequest, the handler will not actually close out the EC since diff --git a/src/app/util/mock/Constants.h b/src/app/util/mock/Constants.h index 26abe2fc6649a0..e1f38dd09913ca 100644 --- a/src/app/util/mock/Constants.h +++ b/src/app/util/mock/Constants.h @@ -42,7 +42,8 @@ constexpr AttributeId MockAttributeId(const uint16_t & id) constexpr ClusterId MockClusterId(const uint16_t & id) { - return (0xFFF1'0000 | id); + // Vendor-specific cluster ids must be at least 0xFC00 + return (0xFFF1'0000 | (0xFC00 + id)); } constexpr EventId MockEventId(const uint16_t & id) diff --git a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml index b5649c56da6d2a..587c282fef8be9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/test-cluster.xml @@ -199,39 +199,39 @@ limitations under the License. cluster_error_boolean - nullable_boolean - nullable_bitmap8 - nullable_bitmap16 - nullable_bitmap32 - nullable_bitmap64 - nullable_int8u - nullable_int16u - nullable_int24u - nullable_int32u - nullable_int40u - nullable_int48u - nullable_int56u - nullable_int64u - nullable_int8s - nullable_int16s - nullable_int24s - nullable_int32s - nullable_int40s - nullable_int48s - nullable_int56s - nullable_int64s - nullable_enum8 - nullable_enum16 - nullable_float_single - nullable_float_double - nullable_octet_string - nullable_char_string - nullable_enum_attr - nullable_struct - nullable_range_restricted_int8u - nullable_range_restricted_int8s - nullable_range_restricted_int16u - nullable_range_restricted_int16s + nullable_boolean + nullable_bitmap8 + nullable_bitmap16 + nullable_bitmap32 + nullable_bitmap64 + nullable_int8u + nullable_int16u + nullable_int24u + nullable_int32u + nullable_int40u + nullable_int48u + nullable_int56u + nullable_int64u + nullable_int8s + nullable_int16s + nullable_int24s + nullable_int32s + nullable_int40s + nullable_int48s + nullable_int56s + nullable_int64s + nullable_enum8 + nullable_enum16 + nullable_float_single + nullable_float_double + nullable_octet_string + nullable_char_string + nullable_enum_attr + nullable_struct + nullable_range_restricted_int8u + nullable_range_restricted_int8s + nullable_range_restricted_int16u + nullable_range_restricted_int16s unsupported diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index dd4d783bb1f491..d95b250f5a6373 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3559,39 +3559,39 @@ client cluster TestCluster = 1295 { attribute boolean generalErrorBoolean = 49; attribute boolean clusterErrorBoolean = 50; attribute boolean unsupported = 255; - attribute nullable boolean nullableBoolean = 32768; - attribute nullable Bitmap8MaskMap nullableBitmap8 = 32769; - attribute nullable Bitmap16MaskMap nullableBitmap16 = 32770; - attribute nullable Bitmap32MaskMap nullableBitmap32 = 32771; - attribute nullable Bitmap64MaskMap nullableBitmap64 = 32772; - attribute nullable int8u nullableInt8u = 32773; - attribute nullable int16u nullableInt16u = 32774; - attribute nullable int24u nullableInt24u = 32775; - attribute nullable int32u nullableInt32u = 32776; - attribute nullable int40u nullableInt40u = 32777; - attribute nullable int48u nullableInt48u = 32778; - attribute nullable int56u nullableInt56u = 32779; - attribute nullable int64u nullableInt64u = 32780; - attribute nullable int8s nullableInt8s = 32781; - attribute nullable int16s nullableInt16s = 32782; - attribute nullable int24s nullableInt24s = 32783; - attribute nullable int32s nullableInt32s = 32784; - attribute nullable int40s nullableInt40s = 32785; - attribute nullable int48s nullableInt48s = 32786; - attribute nullable int56s nullableInt56s = 32787; - attribute nullable int64s nullableInt64s = 32788; - attribute nullable enum8 nullableEnum8 = 32789; - attribute nullable enum16 nullableEnum16 = 32790; - attribute nullable single nullableFloatSingle = 32791; - attribute nullable double nullableFloatDouble = 32792; - attribute nullable octet_string<10> nullableOctetString = 32793; - attribute nullable char_string<10> nullableCharString = 32798; - attribute nullable SimpleEnum nullableEnumAttr = 32804; - attribute nullable SimpleStruct nullableStruct = 32805; - attribute nullable int8u nullableRangeRestrictedInt8u = 32806; - attribute nullable int8s nullableRangeRestrictedInt8s = 32807; - attribute nullable int16u nullableRangeRestrictedInt16u = 32808; - attribute nullable int16s nullableRangeRestrictedInt16s = 32809; + attribute nullable boolean nullableBoolean = 16384; + attribute nullable Bitmap8MaskMap nullableBitmap8 = 16385; + attribute nullable Bitmap16MaskMap nullableBitmap16 = 16386; + attribute nullable Bitmap32MaskMap nullableBitmap32 = 16387; + attribute nullable Bitmap64MaskMap nullableBitmap64 = 16388; + attribute nullable int8u nullableInt8u = 16389; + attribute nullable int16u nullableInt16u = 16390; + attribute nullable int24u nullableInt24u = 16391; + attribute nullable int32u nullableInt32u = 16392; + attribute nullable int40u nullableInt40u = 16393; + attribute nullable int48u nullableInt48u = 16394; + attribute nullable int56u nullableInt56u = 16395; + attribute nullable int64u nullableInt64u = 16396; + attribute nullable int8s nullableInt8s = 16397; + attribute nullable int16s nullableInt16s = 16398; + attribute nullable int24s nullableInt24s = 16399; + attribute nullable int32s nullableInt32s = 16400; + attribute nullable int40s nullableInt40s = 16401; + attribute nullable int48s nullableInt48s = 16402; + attribute nullable int56s nullableInt56s = 16403; + attribute nullable int64s nullableInt64s = 16404; + attribute nullable enum8 nullableEnum8 = 16405; + attribute nullable enum16 nullableEnum16 = 16406; + attribute nullable single nullableFloatSingle = 16407; + attribute nullable double nullableFloatDouble = 16408; + attribute nullable octet_string<10> nullableOctetString = 16409; + attribute nullable char_string<10> nullableCharString = 16414; + attribute nullable SimpleEnum nullableEnumAttr = 16420; + attribute nullable SimpleStruct nullableStruct = 16421; + attribute nullable int8u nullableRangeRestrictedInt8u = 16422; + attribute nullable int8s nullableRangeRestrictedInt8s = 16423; + attribute nullable int16u nullableRangeRestrictedInt16u = 16424; + attribute nullable int16s nullableRangeRestrictedInt16s = 16425; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index ac36c06d0a47cb..ba507ae79d68d9 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -17466,7 +17466,7 @@ }, { "name": "nullable_boolean", - "code": 32768, + "code": 16384, "mfgCode": null, "side": "server", "included": 1, @@ -17481,7 +17481,7 @@ }, { "name": "nullable_bitmap8", - "code": 32769, + "code": 16385, "mfgCode": null, "side": "server", "included": 1, @@ -17496,7 +17496,7 @@ }, { "name": "nullable_bitmap16", - "code": 32770, + "code": 16386, "mfgCode": null, "side": "server", "included": 1, @@ -17511,7 +17511,7 @@ }, { "name": "nullable_bitmap32", - "code": 32771, + "code": 16387, "mfgCode": null, "side": "server", "included": 1, @@ -17526,7 +17526,7 @@ }, { "name": "nullable_bitmap64", - "code": 32772, + "code": 16388, "mfgCode": null, "side": "server", "included": 1, @@ -17541,7 +17541,7 @@ }, { "name": "nullable_int8u", - "code": 32773, + "code": 16389, "mfgCode": null, "side": "server", "included": 1, @@ -17556,7 +17556,7 @@ }, { "name": "nullable_int16u", - "code": 32774, + "code": 16390, "mfgCode": null, "side": "server", "included": 1, @@ -17571,7 +17571,7 @@ }, { "name": "nullable_int24u", - "code": 32775, + "code": 16391, "mfgCode": null, "side": "server", "included": 1, @@ -17586,7 +17586,7 @@ }, { "name": "nullable_int32u", - "code": 32776, + "code": 16392, "mfgCode": null, "side": "server", "included": 1, @@ -17601,7 +17601,7 @@ }, { "name": "nullable_int40u", - "code": 32777, + "code": 16393, "mfgCode": null, "side": "server", "included": 1, @@ -17616,7 +17616,7 @@ }, { "name": "nullable_int48u", - "code": 32778, + "code": 16394, "mfgCode": null, "side": "server", "included": 1, @@ -17631,7 +17631,7 @@ }, { "name": "nullable_int56u", - "code": 32779, + "code": 16395, "mfgCode": null, "side": "server", "included": 1, @@ -17646,7 +17646,7 @@ }, { "name": "nullable_int64u", - "code": 32780, + "code": 16396, "mfgCode": null, "side": "server", "included": 1, @@ -17661,7 +17661,7 @@ }, { "name": "nullable_int8s", - "code": 32781, + "code": 16397, "mfgCode": null, "side": "server", "included": 1, @@ -17676,7 +17676,7 @@ }, { "name": "nullable_int16s", - "code": 32782, + "code": 16398, "mfgCode": null, "side": "server", "included": 1, @@ -17691,7 +17691,7 @@ }, { "name": "nullable_int24s", - "code": 32783, + "code": 16399, "mfgCode": null, "side": "server", "included": 1, @@ -17706,7 +17706,7 @@ }, { "name": "nullable_int32s", - "code": 32784, + "code": 16400, "mfgCode": null, "side": "server", "included": 1, @@ -17721,7 +17721,7 @@ }, { "name": "nullable_int40s", - "code": 32785, + "code": 16401, "mfgCode": null, "side": "server", "included": 1, @@ -17736,7 +17736,7 @@ }, { "name": "nullable_int48s", - "code": 32786, + "code": 16402, "mfgCode": null, "side": "server", "included": 1, @@ -17751,7 +17751,7 @@ }, { "name": "nullable_int56s", - "code": 32787, + "code": 16403, "mfgCode": null, "side": "server", "included": 1, @@ -17766,7 +17766,7 @@ }, { "name": "nullable_int64s", - "code": 32788, + "code": 16404, "mfgCode": null, "side": "server", "included": 1, @@ -17781,7 +17781,7 @@ }, { "name": "nullable_enum8", - "code": 32789, + "code": 16405, "mfgCode": null, "side": "server", "included": 1, @@ -17796,7 +17796,7 @@ }, { "name": "nullable_enum16", - "code": 32790, + "code": 16406, "mfgCode": null, "side": "server", "included": 1, @@ -17811,7 +17811,7 @@ }, { "name": "nullable_float_single", - "code": 32791, + "code": 16407, "mfgCode": null, "side": "server", "included": 1, @@ -17826,7 +17826,7 @@ }, { "name": "nullable_float_double", - "code": 32792, + "code": 16408, "mfgCode": null, "side": "server", "included": 1, @@ -17841,7 +17841,7 @@ }, { "name": "nullable_octet_string", - "code": 32793, + "code": 16409, "mfgCode": null, "side": "server", "included": 1, @@ -17856,7 +17856,7 @@ }, { "name": "nullable_char_string", - "code": 32798, + "code": 16414, "mfgCode": null, "side": "server", "included": 1, @@ -17871,7 +17871,7 @@ }, { "name": "nullable_enum_attr", - "code": 32804, + "code": 16420, "mfgCode": null, "side": "server", "included": 1, @@ -17886,7 +17886,7 @@ }, { "name": "nullable_struct", - "code": 32805, + "code": 16421, "mfgCode": null, "side": "server", "included": 1, @@ -17901,7 +17901,7 @@ }, { "name": "nullable_range_restricted_int8u", - "code": 32806, + "code": 16422, "mfgCode": null, "side": "server", "included": 1, @@ -17916,7 +17916,7 @@ }, { "name": "nullable_range_restricted_int8s", - "code": 32807, + "code": 16423, "mfgCode": null, "side": "server", "included": 1, @@ -17931,7 +17931,7 @@ }, { "name": "nullable_range_restricted_int16u", - "code": 32808, + "code": 16424, "mfgCode": null, "side": "server", "included": 1, @@ -17946,7 +17946,7 @@ }, { "name": "nullable_range_restricted_int16s", - "code": 32809, + "code": 16425, "mfgCode": null, "side": "server", "included": 1, diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index 749f497366904b..fde320d1f4339f 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -2170,103 +2170,103 @@ public static String attributeIdToName(long clusterId, long attributeId) { if (attributeId == 255L) { return "Unsupported"; } - if (attributeId == 32768L) { + if (attributeId == 16384L) { return "NullableBoolean"; } - if (attributeId == 32769L) { + if (attributeId == 16385L) { return "NullableBitmap8"; } - if (attributeId == 32770L) { + if (attributeId == 16386L) { return "NullableBitmap16"; } - if (attributeId == 32771L) { + if (attributeId == 16387L) { return "NullableBitmap32"; } - if (attributeId == 32772L) { + if (attributeId == 16388L) { return "NullableBitmap64"; } - if (attributeId == 32773L) { + if (attributeId == 16389L) { return "NullableInt8u"; } - if (attributeId == 32774L) { + if (attributeId == 16390L) { return "NullableInt16u"; } - if (attributeId == 32775L) { + if (attributeId == 16391L) { return "NullableInt24u"; } - if (attributeId == 32776L) { + if (attributeId == 16392L) { return "NullableInt32u"; } - if (attributeId == 32777L) { + if (attributeId == 16393L) { return "NullableInt40u"; } - if (attributeId == 32778L) { + if (attributeId == 16394L) { return "NullableInt48u"; } - if (attributeId == 32779L) { + if (attributeId == 16395L) { return "NullableInt56u"; } - if (attributeId == 32780L) { + if (attributeId == 16396L) { return "NullableInt64u"; } - if (attributeId == 32781L) { + if (attributeId == 16397L) { return "NullableInt8s"; } - if (attributeId == 32782L) { + if (attributeId == 16398L) { return "NullableInt16s"; } - if (attributeId == 32783L) { + if (attributeId == 16399L) { return "NullableInt24s"; } - if (attributeId == 32784L) { + if (attributeId == 16400L) { return "NullableInt32s"; } - if (attributeId == 32785L) { + if (attributeId == 16401L) { return "NullableInt40s"; } - if (attributeId == 32786L) { + if (attributeId == 16402L) { return "NullableInt48s"; } - if (attributeId == 32787L) { + if (attributeId == 16403L) { return "NullableInt56s"; } - if (attributeId == 32788L) { + if (attributeId == 16404L) { return "NullableInt64s"; } - if (attributeId == 32789L) { + if (attributeId == 16405L) { return "NullableEnum8"; } - if (attributeId == 32790L) { + if (attributeId == 16406L) { return "NullableEnum16"; } - if (attributeId == 32791L) { + if (attributeId == 16407L) { return "NullableFloatSingle"; } - if (attributeId == 32792L) { + if (attributeId == 16408L) { return "NullableFloatDouble"; } - if (attributeId == 32793L) { + if (attributeId == 16409L) { return "NullableOctetString"; } - if (attributeId == 32798L) { + if (attributeId == 16414L) { return "NullableCharString"; } - if (attributeId == 32804L) { + if (attributeId == 16420L) { return "NullableEnumAttr"; } - if (attributeId == 32805L) { + if (attributeId == 16421L) { return "NullableStruct"; } - if (attributeId == 32806L) { + if (attributeId == 16422L) { return "NullableRangeRestrictedInt8u"; } - if (attributeId == 32807L) { + if (attributeId == 16423L) { return "NullableRangeRestrictedInt8s"; } - if (attributeId == 32808L) { + if (attributeId == 16424L) { return "NullableRangeRestrictedInt16u"; } - if (attributeId == 32809L) { + if (attributeId == 16425L) { return "NullableRangeRestrictedInt16s"; } if (attributeId == 65528L) { diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 4876bfd7054a34..6287afcd15ca3d 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -5503,233 +5503,233 @@ class ChipClusters: "reportable": True, "writable": True, }, - 0x00008000: { + 0x00004000: { "attributeName": "NullableBoolean", - "attributeId": 0x00008000, + "attributeId": 0x00004000, "type": "bool", "reportable": True, "writable": True, }, - 0x00008001: { + 0x00004001: { "attributeName": "NullableBitmap8", - "attributeId": 0x00008001, + "attributeId": 0x00004001, "type": "int", "reportable": True, "writable": True, }, - 0x00008002: { + 0x00004002: { "attributeName": "NullableBitmap16", - "attributeId": 0x00008002, + "attributeId": 0x00004002, "type": "int", "reportable": True, "writable": True, }, - 0x00008003: { + 0x00004003: { "attributeName": "NullableBitmap32", - "attributeId": 0x00008003, + "attributeId": 0x00004003, "type": "int", "reportable": True, "writable": True, }, - 0x00008004: { + 0x00004004: { "attributeName": "NullableBitmap64", - "attributeId": 0x00008004, + "attributeId": 0x00004004, "type": "int", "reportable": True, "writable": True, }, - 0x00008005: { + 0x00004005: { "attributeName": "NullableInt8u", - "attributeId": 0x00008005, + "attributeId": 0x00004005, "type": "int", "reportable": True, "writable": True, }, - 0x00008006: { + 0x00004006: { "attributeName": "NullableInt16u", - "attributeId": 0x00008006, + "attributeId": 0x00004006, "type": "int", "reportable": True, "writable": True, }, - 0x00008007: { + 0x00004007: { "attributeName": "NullableInt24u", - "attributeId": 0x00008007, + "attributeId": 0x00004007, "type": "int", "reportable": True, "writable": True, }, - 0x00008008: { + 0x00004008: { "attributeName": "NullableInt32u", - "attributeId": 0x00008008, + "attributeId": 0x00004008, "type": "int", "reportable": True, "writable": True, }, - 0x00008009: { + 0x00004009: { "attributeName": "NullableInt40u", - "attributeId": 0x00008009, + "attributeId": 0x00004009, "type": "int", "reportable": True, "writable": True, }, - 0x0000800A: { + 0x0000400A: { "attributeName": "NullableInt48u", - "attributeId": 0x0000800A, + "attributeId": 0x0000400A, "type": "int", "reportable": True, "writable": True, }, - 0x0000800B: { + 0x0000400B: { "attributeName": "NullableInt56u", - "attributeId": 0x0000800B, + "attributeId": 0x0000400B, "type": "int", "reportable": True, "writable": True, }, - 0x0000800C: { + 0x0000400C: { "attributeName": "NullableInt64u", - "attributeId": 0x0000800C, + "attributeId": 0x0000400C, "type": "int", "reportable": True, "writable": True, }, - 0x0000800D: { + 0x0000400D: { "attributeName": "NullableInt8s", - "attributeId": 0x0000800D, + "attributeId": 0x0000400D, "type": "int", "reportable": True, "writable": True, }, - 0x0000800E: { + 0x0000400E: { "attributeName": "NullableInt16s", - "attributeId": 0x0000800E, + "attributeId": 0x0000400E, "type": "int", "reportable": True, "writable": True, }, - 0x0000800F: { + 0x0000400F: { "attributeName": "NullableInt24s", - "attributeId": 0x0000800F, + "attributeId": 0x0000400F, "type": "int", "reportable": True, "writable": True, }, - 0x00008010: { + 0x00004010: { "attributeName": "NullableInt32s", - "attributeId": 0x00008010, + "attributeId": 0x00004010, "type": "int", "reportable": True, "writable": True, }, - 0x00008011: { + 0x00004011: { "attributeName": "NullableInt40s", - "attributeId": 0x00008011, + "attributeId": 0x00004011, "type": "int", "reportable": True, "writable": True, }, - 0x00008012: { + 0x00004012: { "attributeName": "NullableInt48s", - "attributeId": 0x00008012, + "attributeId": 0x00004012, "type": "int", "reportable": True, "writable": True, }, - 0x00008013: { + 0x00004013: { "attributeName": "NullableInt56s", - "attributeId": 0x00008013, + "attributeId": 0x00004013, "type": "int", "reportable": True, "writable": True, }, - 0x00008014: { + 0x00004014: { "attributeName": "NullableInt64s", - "attributeId": 0x00008014, + "attributeId": 0x00004014, "type": "int", "reportable": True, "writable": True, }, - 0x00008015: { + 0x00004015: { "attributeName": "NullableEnum8", - "attributeId": 0x00008015, + "attributeId": 0x00004015, "type": "int", "reportable": True, "writable": True, }, - 0x00008016: { + 0x00004016: { "attributeName": "NullableEnum16", - "attributeId": 0x00008016, + "attributeId": 0x00004016, "type": "int", "reportable": True, "writable": True, }, - 0x00008017: { + 0x00004017: { "attributeName": "NullableFloatSingle", - "attributeId": 0x00008017, + "attributeId": 0x00004017, "type": "", "reportable": True, "writable": True, }, - 0x00008018: { + 0x00004018: { "attributeName": "NullableFloatDouble", - "attributeId": 0x00008018, + "attributeId": 0x00004018, "type": "", "reportable": True, "writable": True, }, - 0x00008019: { + 0x00004019: { "attributeName": "NullableOctetString", - "attributeId": 0x00008019, + "attributeId": 0x00004019, "type": "bytes", "reportable": True, "writable": True, }, - 0x0000801E: { + 0x0000401E: { "attributeName": "NullableCharString", - "attributeId": 0x0000801E, + "attributeId": 0x0000401E, "type": "str", "reportable": True, "writable": True, }, - 0x00008024: { + 0x00004024: { "attributeName": "NullableEnumAttr", - "attributeId": 0x00008024, + "attributeId": 0x00004024, "type": "int", "reportable": True, "writable": True, }, - 0x00008025: { + 0x00004025: { "attributeName": "NullableStruct", - "attributeId": 0x00008025, + "attributeId": 0x00004025, "type": "", "reportable": True, "writable": True, }, - 0x00008026: { + 0x00004026: { "attributeName": "NullableRangeRestrictedInt8u", - "attributeId": 0x00008026, + "attributeId": 0x00004026, "type": "int", "reportable": True, "writable": True, }, - 0x00008027: { + 0x00004027: { "attributeName": "NullableRangeRestrictedInt8s", - "attributeId": 0x00008027, + "attributeId": 0x00004027, "type": "int", "reportable": True, "writable": True, }, - 0x00008028: { + 0x00004028: { "attributeName": "NullableRangeRestrictedInt16u", - "attributeId": 0x00008028, + "attributeId": 0x00004028, "type": "int", "reportable": True, "writable": True, }, - 0x00008029: { + 0x00004029: { "attributeName": "NullableRangeRestrictedInt16s", - "attributeId": 0x00008029, + "attributeId": 0x00004029, "type": "int", "reportable": True, "writable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index fecb96a7c3f08e..39d7e506a157eb 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -34424,39 +34424,39 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="generalErrorBoolean", Tag=0x00000031, Type=bool), ClusterObjectFieldDescriptor(Label="clusterErrorBoolean", Tag=0x00000032, Type=bool), ClusterObjectFieldDescriptor(Label="unsupported", Tag=0x000000FF, Type=bool), - ClusterObjectFieldDescriptor(Label="nullableBoolean", Tag=0x00008000, Type=typing.Union[Nullable, bool]), - ClusterObjectFieldDescriptor(Label="nullableBitmap8", Tag=0x00008001, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableBitmap16", Tag=0x00008002, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableBitmap32", Tag=0x00008003, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableBitmap64", Tag=0x00008004, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt8u", Tag=0x00008005, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt16u", Tag=0x00008006, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt24u", Tag=0x00008007, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt32u", Tag=0x00008008, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt40u", Tag=0x00008009, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt48u", Tag=0x0000800A, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt56u", Tag=0x0000800B, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt64u", Tag=0x0000800C, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableInt8s", Tag=0x0000800D, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt16s", Tag=0x0000800E, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt24s", Tag=0x0000800F, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt32s", Tag=0x00008010, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt40s", Tag=0x00008011, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt48s", Tag=0x00008012, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt56s", Tag=0x00008013, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableInt64s", Tag=0x00008014, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableEnum8", Tag=0x00008015, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableEnum16", Tag=0x00008016, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableFloatSingle", Tag=0x00008017, Type=typing.Union[Nullable, float32]), - ClusterObjectFieldDescriptor(Label="nullableFloatDouble", Tag=0x00008018, Type=typing.Union[Nullable, float]), - ClusterObjectFieldDescriptor(Label="nullableOctetString", Tag=0x00008019, Type=typing.Union[Nullable, bytes]), - ClusterObjectFieldDescriptor(Label="nullableCharString", Tag=0x0000801E, Type=typing.Union[Nullable, str]), - ClusterObjectFieldDescriptor(Label="nullableEnumAttr", Tag=0x00008024, Type=typing.Union[Nullable, TestCluster.Enums.SimpleEnum]), - ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=0x00008025, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]), - ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8u", Tag=0x00008026, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8s", Tag=0x00008027, Type=typing.Union[Nullable, int]), - ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16u", Tag=0x00008028, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16s", Tag=0x00008029, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableBoolean", Tag=0x00004000, Type=typing.Union[Nullable, bool]), + ClusterObjectFieldDescriptor(Label="nullableBitmap8", Tag=0x00004001, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableBitmap16", Tag=0x00004002, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableBitmap32", Tag=0x00004003, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableBitmap64", Tag=0x00004004, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt8u", Tag=0x00004005, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt16u", Tag=0x00004006, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt24u", Tag=0x00004007, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt32u", Tag=0x00004008, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt40u", Tag=0x00004009, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt48u", Tag=0x0000400A, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt56u", Tag=0x0000400B, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt64u", Tag=0x0000400C, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableInt8s", Tag=0x0000400D, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt16s", Tag=0x0000400E, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt24s", Tag=0x0000400F, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt32s", Tag=0x00004010, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt40s", Tag=0x00004011, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt48s", Tag=0x00004012, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt56s", Tag=0x00004013, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableInt64s", Tag=0x00004014, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableEnum8", Tag=0x00004015, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableEnum16", Tag=0x00004016, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableFloatSingle", Tag=0x00004017, Type=typing.Union[Nullable, float32]), + ClusterObjectFieldDescriptor(Label="nullableFloatDouble", Tag=0x00004018, Type=typing.Union[Nullable, float]), + ClusterObjectFieldDescriptor(Label="nullableOctetString", Tag=0x00004019, Type=typing.Union[Nullable, bytes]), + ClusterObjectFieldDescriptor(Label="nullableCharString", Tag=0x0000401E, Type=typing.Union[Nullable, str]), + ClusterObjectFieldDescriptor(Label="nullableEnumAttr", Tag=0x00004024, Type=typing.Union[Nullable, TestCluster.Enums.SimpleEnum]), + ClusterObjectFieldDescriptor(Label="nullableStruct", Tag=0x00004025, Type=typing.Union[Nullable, TestCluster.Structs.SimpleStruct]), + ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8u", Tag=0x00004026, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt8s", Tag=0x00004027, Type=typing.Union[Nullable, int]), + ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16u", Tag=0x00004028, Type=typing.Union[Nullable, uint]), + ClusterObjectFieldDescriptor(Label="nullableRangeRestrictedInt16s", Tag=0x00004029, Type=typing.Union[Nullable, int]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), @@ -36106,7 +36106,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008000 + return 0x00004000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36122,7 +36122,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008001 + return 0x00004001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36138,7 +36138,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008002 + return 0x00004002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36154,7 +36154,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008003 + return 0x00004003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36170,7 +36170,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008004 + return 0x00004004 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36186,7 +36186,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008005 + return 0x00004005 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36202,7 +36202,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008006 + return 0x00004006 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36218,7 +36218,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008007 + return 0x00004007 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36234,7 +36234,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008008 + return 0x00004008 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36250,7 +36250,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008009 + return 0x00004009 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36266,7 +36266,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000800A + return 0x0000400A @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36282,7 +36282,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000800B + return 0x0000400B @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36298,7 +36298,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000800C + return 0x0000400C @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36314,7 +36314,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000800D + return 0x0000400D @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36330,7 +36330,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000800E + return 0x0000400E @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36346,7 +36346,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000800F + return 0x0000400F @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36362,7 +36362,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008010 + return 0x00004010 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36378,7 +36378,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008011 + return 0x00004011 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36394,7 +36394,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008012 + return 0x00004012 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36410,7 +36410,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008013 + return 0x00004013 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36426,7 +36426,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008014 + return 0x00004014 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36442,7 +36442,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008015 + return 0x00004015 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36458,7 +36458,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008016 + return 0x00004016 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36474,7 +36474,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008017 + return 0x00004017 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36490,7 +36490,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008018 + return 0x00004018 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36506,7 +36506,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008019 + return 0x00004019 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36522,7 +36522,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x0000801E + return 0x0000401E @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36538,7 +36538,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008024 + return 0x00004024 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36554,7 +36554,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008025 + return 0x00004025 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36570,7 +36570,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008026 + return 0x00004026 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36586,7 +36586,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008027 + return 0x00004027 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36602,7 +36602,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008028 + return 0x00004028 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -36618,7 +36618,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00008029 + return 0x00004029 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: diff --git a/src/lib/core/DataModelTypes.h b/src/lib/core/DataModelTypes.h index 3dccb05932e64a..a2aca450784c4f 100644 --- a/src/lib/core/DataModelTypes.h +++ b/src/lib/core/DataModelTypes.h @@ -57,14 +57,47 @@ static constexpr CommandId kInvalidCommandId = 0xFFFF'FFFF; static constexpr EventId kInvalidEventId = 0xFFFF'FFFF; static constexpr FieldId kInvalidFieldId = 0xFFFF'FFFF; +static constexpr uint16_t ExtractIdFromMEI(uint32_t aMEI) +{ + constexpr uint32_t kIdMask = 0x0000'FFFF; + return static_cast(aMEI & kIdMask); +} + +static constexpr uint16_t ExtractVendorFromMEI(uint32_t aMEI) +{ + constexpr uint32_t kVendorMask = 0xFFFF'0000; + constexpr uint32_t kVendorShift = 16; + return static_cast((aMEI & kVendorMask) >> kVendorShift); +} + constexpr bool IsValidClusterId(ClusterId aClusterId) { - const ClusterId kIdMask = 0x0000'FFFF; - const ClusterId kVendorMask = 0xFFFF'0000; - const auto id = aClusterId & kIdMask; - const auto vendor = aClusterId & kVendorMask; - return (vendor == 0x0000'0000 && id <= 0x7FFF) || - (vendor >= 0x0001'0000 && vendor <= 0xFFFE'0000 && id >= 0xFC00 && id <= 0xFFFE); + const auto id = ExtractIdFromMEI(aClusterId); + const auto vendor = ExtractVendorFromMEI(aClusterId); + // Cluster id suffixes in the range 0x0000 to 0x7FFF indicate a standard + // cluster. + // + // Cluster id suffixes in the range 0xFC00 to 0xFFFE indicate an MS cluster. + return (vendor == 0x0000 && id <= 0x7FFF) || (vendor >= 0x0001 && vendor <= 0xFFFE && id >= 0xFC00 && id <= 0xFFFE); +} + +constexpr bool IsGlobalAttribute(AttributeId aAttributeId) +{ + const auto id = ExtractIdFromMEI(aAttributeId); + const auto vendor = ExtractVendorFromMEI(aAttributeId); + // Attribute id suffixes in the range 0xF000 to 0xFFFE indicate a standard + // global attribute. + return (vendor == 0x0000 && id >= 0xF000 && id <= 0xFFFE); +} + +constexpr bool IsValidAttributeId(AttributeId aAttributeId) +{ + const auto id = ExtractIdFromMEI(aAttributeId); + const auto vendor = ExtractVendorFromMEI(aAttributeId); + // Attribute id suffixes in the range 0x0000 to 0x4FFF indicate a non-global + // attribute (standard or MS). The vendor id must not be wildcard in this + // case. + return (id <= 0x4FFF && vendor != 0xFFFF) || IsGlobalAttribute(aAttributeId); } constexpr bool IsValidDeviceTypeId(DeviceTypeId aDeviceTypeId) diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 19d836bb6fb652..eed4701085b38b 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -1877,75 +1877,75 @@ ZAP_EMPTY_DEFAULT() }, /* general_error_boolean */ \ { 0x00000032, ZAP_TYPE(BOOLEAN), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE), \ ZAP_EMPTY_DEFAULT() }, /* cluster_error_boolean */ \ - { 0x00008000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004000, ZAP_TYPE(BOOLEAN), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(false) }, /* nullable_boolean */ \ - { 0x00008001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004001, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap8 */ \ - { 0x00008002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004002, ZAP_TYPE(BITMAP16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_bitmap16 */ \ - { 0x00008003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004003, ZAP_TYPE(BITMAP32), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(541) }, /* nullable_bitmap32 */ \ - { 0x00008004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004004, ZAP_TYPE(BITMAP64), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(545) }, /* nullable_bitmap64 */ \ - { 0x00008005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8u */ \ - { 0x00008006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004006, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16u */ \ - { 0x00008007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004007, ZAP_TYPE(INT24U), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(553) }, /* nullable_int24u */ \ - { 0x00008008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004008, ZAP_TYPE(INT32U), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(556) }, /* nullable_int32u */ \ - { 0x00008009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004009, ZAP_TYPE(INT40U), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(560) }, /* nullable_int40u */ \ - { 0x0000800A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000400A, ZAP_TYPE(INT48U), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(565) }, /* nullable_int48u */ \ - { 0x0000800B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000400B, ZAP_TYPE(INT56U), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(571) }, /* nullable_int56u */ \ - { 0x0000800C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000400C, ZAP_TYPE(INT64U), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(578) }, /* nullable_int64u */ \ - { 0x0000800D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000400D, ZAP_TYPE(INT8S), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int8s */ \ - { 0x0000800E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000400E, ZAP_TYPE(INT16S), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_int16s */ \ - { 0x0000800F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000400F, ZAP_TYPE(INT24S), 3, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(586) }, /* nullable_int24s */ \ - { 0x00008010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004010, ZAP_TYPE(INT32S), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(589) }, /* nullable_int32s */ \ - { 0x00008011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004011, ZAP_TYPE(INT40S), 5, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(593) }, /* nullable_int40s */ \ - { 0x00008012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004012, ZAP_TYPE(INT48S), 6, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(598) }, /* nullable_int48s */ \ - { 0x00008013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004013, ZAP_TYPE(INT56S), 7, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(604) }, /* nullable_int56s */ \ - { 0x00008014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004014, ZAP_TYPE(INT64S), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(611) }, /* nullable_int64s */ \ - { 0x00008015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004015, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum8 */ \ - { 0x00008016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004016, ZAP_TYPE(ENUM16), 2, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_SIMPLE_DEFAULT(0) }, /* nullable_enum16 */ \ - { 0x00008017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004017, ZAP_TYPE(SINGLE), 4, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(619) }, /* nullable_float_single */ \ - { 0x00008018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004018, ZAP_TYPE(DOUBLE), 8, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_LONG_DEFAULTS_INDEX(623) }, /* nullable_float_double */ \ - { 0x00008019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004019, ZAP_TYPE(OCTET_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* nullable_octet_string */ \ - { 0x0000801E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x0000401E, ZAP_TYPE(CHAR_STRING), 11, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* nullable_char_string */ \ - { 0x00008024, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ + { 0x00004024, ZAP_TYPE(ENUM8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* nullable_enum_attr */ \ - { 0x00008025, ZAP_TYPE(STRUCT), 0, \ + { 0x00004025, ZAP_TYPE(STRUCT), 0, \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_EMPTY_DEFAULT() }, /* nullable_struct */ \ - { 0x00008026, ZAP_TYPE(INT8U), 1, \ + { 0x00004026, ZAP_TYPE(INT8U), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(39) }, /* nullable_range_restricted_int8u */ \ - { 0x00008027, ZAP_TYPE(INT8S), 1, \ + { 0x00004027, ZAP_TYPE(INT8S), 1, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(40) }, /* nullable_range_restricted_int8s */ \ - { 0x00008028, ZAP_TYPE(INT16U), 2, \ + { 0x00004028, ZAP_TYPE(INT16U), 2, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(41) }, /* nullable_range_restricted_int16u */ \ - { 0x00008029, ZAP_TYPE(INT16S), 2, \ + { 0x00004029, ZAP_TYPE(INT16S), 2, \ ZAP_ATTRIBUTE_MASK(MIN_MAX) | ZAP_ATTRIBUTE_MASK(WRITABLE) | ZAP_ATTRIBUTE_MASK(NULLABLE), \ ZAP_MIN_MAX_DEFAULTS_INDEX(42) }, /* nullable_range_restricted_int16s */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index 82d1f64332146b..099f517886e0e0 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -1532,39 +1532,39 @@ #define ZCL_GENERAL_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0031) #define ZCL_CLUSTER_ERROR_BOOLEAN_ATTRIBUTE_ID (0x0032) #define ZCL_UNSUPPORTED_ATTRIBUTE_ID (0x00FF) -#define ZCL_NULLABLE_BOOLEAN_ATTRIBUTE_ID (0x8000) -#define ZCL_NULLABLE_BITMAP8_ATTRIBUTE_ID (0x8001) -#define ZCL_NULLABLE_BITMAP16_ATTRIBUTE_ID (0x8002) -#define ZCL_NULLABLE_BITMAP32_ATTRIBUTE_ID (0x8003) -#define ZCL_NULLABLE_BITMAP64_ATTRIBUTE_ID (0x8004) -#define ZCL_NULLABLE_INT8_U_ATTRIBUTE_ID (0x8005) -#define ZCL_NULLABLE_INT16_U_ATTRIBUTE_ID (0x8006) -#define ZCL_NULLABLE_INT24_U_ATTRIBUTE_ID (0x8007) -#define ZCL_NULLABLE_INT32_U_ATTRIBUTE_ID (0x8008) -#define ZCL_NULLABLE_INT40_U_ATTRIBUTE_ID (0x8009) -#define ZCL_NULLABLE_INT48_U_ATTRIBUTE_ID (0x800A) -#define ZCL_NULLABLE_INT56_U_ATTRIBUTE_ID (0x800B) -#define ZCL_NULLABLE_INT64_U_ATTRIBUTE_ID (0x800C) -#define ZCL_NULLABLE_INT8_S_ATTRIBUTE_ID (0x800D) -#define ZCL_NULLABLE_INT16_S_ATTRIBUTE_ID (0x800E) -#define ZCL_NULLABLE_INT24_S_ATTRIBUTE_ID (0x800F) -#define ZCL_NULLABLE_INT32_S_ATTRIBUTE_ID (0x8010) -#define ZCL_NULLABLE_INT40_S_ATTRIBUTE_ID (0x8011) -#define ZCL_NULLABLE_INT48_S_ATTRIBUTE_ID (0x8012) -#define ZCL_NULLABLE_INT56_S_ATTRIBUTE_ID (0x8013) -#define ZCL_NULLABLE_INT64_S_ATTRIBUTE_ID (0x8014) -#define ZCL_NULLABLE_ENUM8_ATTRIBUTE_ID (0x8015) -#define ZCL_NULLABLE_ENUM16_ATTRIBUTE_ID (0x8016) -#define ZCL_NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID (0x8017) -#define ZCL_NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID (0x8018) -#define ZCL_NULLABLE_OCTET_STRING_ATTRIBUTE_ID (0x8019) -#define ZCL_NULLABLE_CHAR_STRING_ATTRIBUTE_ID (0x801E) -#define ZCL_NULLABLE_SIMPLE_ENUM_ATTRIBUTE_ID (0x8024) -#define ZCL_NULLABLE_STRUCT_ATTRIBUTE_ID (0x8025) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x8026) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x8027) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x8028) -#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_S_ATTRIBUTE_ID (0x8029) +#define ZCL_NULLABLE_BOOLEAN_ATTRIBUTE_ID (0x4000) +#define ZCL_NULLABLE_BITMAP8_ATTRIBUTE_ID (0x4001) +#define ZCL_NULLABLE_BITMAP16_ATTRIBUTE_ID (0x4002) +#define ZCL_NULLABLE_BITMAP32_ATTRIBUTE_ID (0x4003) +#define ZCL_NULLABLE_BITMAP64_ATTRIBUTE_ID (0x4004) +#define ZCL_NULLABLE_INT8_U_ATTRIBUTE_ID (0x4005) +#define ZCL_NULLABLE_INT16_U_ATTRIBUTE_ID (0x4006) +#define ZCL_NULLABLE_INT24_U_ATTRIBUTE_ID (0x4007) +#define ZCL_NULLABLE_INT32_U_ATTRIBUTE_ID (0x4008) +#define ZCL_NULLABLE_INT40_U_ATTRIBUTE_ID (0x4009) +#define ZCL_NULLABLE_INT48_U_ATTRIBUTE_ID (0x400A) +#define ZCL_NULLABLE_INT56_U_ATTRIBUTE_ID (0x400B) +#define ZCL_NULLABLE_INT64_U_ATTRIBUTE_ID (0x400C) +#define ZCL_NULLABLE_INT8_S_ATTRIBUTE_ID (0x400D) +#define ZCL_NULLABLE_INT16_S_ATTRIBUTE_ID (0x400E) +#define ZCL_NULLABLE_INT24_S_ATTRIBUTE_ID (0x400F) +#define ZCL_NULLABLE_INT32_S_ATTRIBUTE_ID (0x4010) +#define ZCL_NULLABLE_INT40_S_ATTRIBUTE_ID (0x4011) +#define ZCL_NULLABLE_INT48_S_ATTRIBUTE_ID (0x4012) +#define ZCL_NULLABLE_INT56_S_ATTRIBUTE_ID (0x4013) +#define ZCL_NULLABLE_INT64_S_ATTRIBUTE_ID (0x4014) +#define ZCL_NULLABLE_ENUM8_ATTRIBUTE_ID (0x4015) +#define ZCL_NULLABLE_ENUM16_ATTRIBUTE_ID (0x4016) +#define ZCL_NULLABLE_FLOAT_SINGLE_ATTRIBUTE_ID (0x4017) +#define ZCL_NULLABLE_FLOAT_DOUBLE_ATTRIBUTE_ID (0x4018) +#define ZCL_NULLABLE_OCTET_STRING_ATTRIBUTE_ID (0x4019) +#define ZCL_NULLABLE_CHAR_STRING_ATTRIBUTE_ID (0x401E) +#define ZCL_NULLABLE_SIMPLE_ENUM_ATTRIBUTE_ID (0x4024) +#define ZCL_NULLABLE_STRUCT_ATTRIBUTE_ID (0x4025) +#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x4026) +#define ZCL_NULLABLE_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x4027) +#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x4028) +#define ZCL_NULLABLE_RANGE_RESTRICTED_INT16_S_ATTRIBUTE_ID (0x4029) // Attribute ids for cluster: Messaging diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index d023e14d89f048..07b9b339badc4f 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -6267,135 +6267,135 @@ static constexpr AttributeId Id = 0x000000FF; } // namespace Unsupported namespace NullableBoolean { -static constexpr AttributeId Id = 0x00008000; +static constexpr AttributeId Id = 0x00004000; } // namespace NullableBoolean namespace NullableBitmap8 { -static constexpr AttributeId Id = 0x00008001; +static constexpr AttributeId Id = 0x00004001; } // namespace NullableBitmap8 namespace NullableBitmap16 { -static constexpr AttributeId Id = 0x00008002; +static constexpr AttributeId Id = 0x00004002; } // namespace NullableBitmap16 namespace NullableBitmap32 { -static constexpr AttributeId Id = 0x00008003; +static constexpr AttributeId Id = 0x00004003; } // namespace NullableBitmap32 namespace NullableBitmap64 { -static constexpr AttributeId Id = 0x00008004; +static constexpr AttributeId Id = 0x00004004; } // namespace NullableBitmap64 namespace NullableInt8u { -static constexpr AttributeId Id = 0x00008005; +static constexpr AttributeId Id = 0x00004005; } // namespace NullableInt8u namespace NullableInt16u { -static constexpr AttributeId Id = 0x00008006; +static constexpr AttributeId Id = 0x00004006; } // namespace NullableInt16u namespace NullableInt24u { -static constexpr AttributeId Id = 0x00008007; +static constexpr AttributeId Id = 0x00004007; } // namespace NullableInt24u namespace NullableInt32u { -static constexpr AttributeId Id = 0x00008008; +static constexpr AttributeId Id = 0x00004008; } // namespace NullableInt32u namespace NullableInt40u { -static constexpr AttributeId Id = 0x00008009; +static constexpr AttributeId Id = 0x00004009; } // namespace NullableInt40u namespace NullableInt48u { -static constexpr AttributeId Id = 0x0000800A; +static constexpr AttributeId Id = 0x0000400A; } // namespace NullableInt48u namespace NullableInt56u { -static constexpr AttributeId Id = 0x0000800B; +static constexpr AttributeId Id = 0x0000400B; } // namespace NullableInt56u namespace NullableInt64u { -static constexpr AttributeId Id = 0x0000800C; +static constexpr AttributeId Id = 0x0000400C; } // namespace NullableInt64u namespace NullableInt8s { -static constexpr AttributeId Id = 0x0000800D; +static constexpr AttributeId Id = 0x0000400D; } // namespace NullableInt8s namespace NullableInt16s { -static constexpr AttributeId Id = 0x0000800E; +static constexpr AttributeId Id = 0x0000400E; } // namespace NullableInt16s namespace NullableInt24s { -static constexpr AttributeId Id = 0x0000800F; +static constexpr AttributeId Id = 0x0000400F; } // namespace NullableInt24s namespace NullableInt32s { -static constexpr AttributeId Id = 0x00008010; +static constexpr AttributeId Id = 0x00004010; } // namespace NullableInt32s namespace NullableInt40s { -static constexpr AttributeId Id = 0x00008011; +static constexpr AttributeId Id = 0x00004011; } // namespace NullableInt40s namespace NullableInt48s { -static constexpr AttributeId Id = 0x00008012; +static constexpr AttributeId Id = 0x00004012; } // namespace NullableInt48s namespace NullableInt56s { -static constexpr AttributeId Id = 0x00008013; +static constexpr AttributeId Id = 0x00004013; } // namespace NullableInt56s namespace NullableInt64s { -static constexpr AttributeId Id = 0x00008014; +static constexpr AttributeId Id = 0x00004014; } // namespace NullableInt64s namespace NullableEnum8 { -static constexpr AttributeId Id = 0x00008015; +static constexpr AttributeId Id = 0x00004015; } // namespace NullableEnum8 namespace NullableEnum16 { -static constexpr AttributeId Id = 0x00008016; +static constexpr AttributeId Id = 0x00004016; } // namespace NullableEnum16 namespace NullableFloatSingle { -static constexpr AttributeId Id = 0x00008017; +static constexpr AttributeId Id = 0x00004017; } // namespace NullableFloatSingle namespace NullableFloatDouble { -static constexpr AttributeId Id = 0x00008018; +static constexpr AttributeId Id = 0x00004018; } // namespace NullableFloatDouble namespace NullableOctetString { -static constexpr AttributeId Id = 0x00008019; +static constexpr AttributeId Id = 0x00004019; } // namespace NullableOctetString namespace NullableCharString { -static constexpr AttributeId Id = 0x0000801E; +static constexpr AttributeId Id = 0x0000401E; } // namespace NullableCharString namespace NullableEnumAttr { -static constexpr AttributeId Id = 0x00008024; +static constexpr AttributeId Id = 0x00004024; } // namespace NullableEnumAttr namespace NullableStruct { -static constexpr AttributeId Id = 0x00008025; +static constexpr AttributeId Id = 0x00004025; } // namespace NullableStruct namespace NullableRangeRestrictedInt8u { -static constexpr AttributeId Id = 0x00008026; +static constexpr AttributeId Id = 0x00004026; } // namespace NullableRangeRestrictedInt8u namespace NullableRangeRestrictedInt8s { -static constexpr AttributeId Id = 0x00008027; +static constexpr AttributeId Id = 0x00004027; } // namespace NullableRangeRestrictedInt8s namespace NullableRangeRestrictedInt16u { -static constexpr AttributeId Id = 0x00008028; +static constexpr AttributeId Id = 0x00004028; } // namespace NullableRangeRestrictedInt16u namespace NullableRangeRestrictedInt16s { -static constexpr AttributeId Id = 0x00008029; +static constexpr AttributeId Id = 0x00004029; } // namespace NullableRangeRestrictedInt16s namespace GeneratedCommandList { diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h index 4d220130bae0e6..012f45d40bfa7f 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h @@ -53570,39 +53570,39 @@ class SubscribeAttributeTemperatureMeasurementClusterRevision : public ModelComm | * GeneralErrorBoolean | 0x0031 | | * ClusterErrorBoolean | 0x0032 | | * Unsupported | 0x00FF | -| * NullableBoolean | 0x8000 | -| * NullableBitmap8 | 0x8001 | -| * NullableBitmap16 | 0x8002 | -| * NullableBitmap32 | 0x8003 | -| * NullableBitmap64 | 0x8004 | -| * NullableInt8u | 0x8005 | -| * NullableInt16u | 0x8006 | -| * NullableInt24u | 0x8007 | -| * NullableInt32u | 0x8008 | -| * NullableInt40u | 0x8009 | -| * NullableInt48u | 0x800A | -| * NullableInt56u | 0x800B | -| * NullableInt64u | 0x800C | -| * NullableInt8s | 0x800D | -| * NullableInt16s | 0x800E | -| * NullableInt24s | 0x800F | -| * NullableInt32s | 0x8010 | -| * NullableInt40s | 0x8011 | -| * NullableInt48s | 0x8012 | -| * NullableInt56s | 0x8013 | -| * NullableInt64s | 0x8014 | -| * NullableEnum8 | 0x8015 | -| * NullableEnum16 | 0x8016 | -| * NullableFloatSingle | 0x8017 | -| * NullableFloatDouble | 0x8018 | -| * NullableOctetString | 0x8019 | -| * NullableCharString | 0x801E | -| * NullableEnumAttr | 0x8024 | -| * NullableStruct | 0x8025 | -| * NullableRangeRestrictedInt8u | 0x8026 | -| * NullableRangeRestrictedInt8s | 0x8027 | -| * NullableRangeRestrictedInt16u | 0x8028 | -| * NullableRangeRestrictedInt16s | 0x8029 | +| * NullableBoolean | 0x4000 | +| * NullableBitmap8 | 0x4001 | +| * NullableBitmap16 | 0x4002 | +| * NullableBitmap32 | 0x4003 | +| * NullableBitmap64 | 0x4004 | +| * NullableInt8u | 0x4005 | +| * NullableInt16u | 0x4006 | +| * NullableInt24u | 0x4007 | +| * NullableInt32u | 0x4008 | +| * NullableInt40u | 0x4009 | +| * NullableInt48u | 0x400A | +| * NullableInt56u | 0x400B | +| * NullableInt64u | 0x400C | +| * NullableInt8s | 0x400D | +| * NullableInt16s | 0x400E | +| * NullableInt24s | 0x400F | +| * NullableInt32s | 0x4010 | +| * NullableInt40s | 0x4011 | +| * NullableInt48s | 0x4012 | +| * NullableInt56s | 0x4013 | +| * NullableInt64s | 0x4014 | +| * NullableEnum8 | 0x4015 | +| * NullableEnum16 | 0x4016 | +| * NullableFloatSingle | 0x4017 | +| * NullableFloatDouble | 0x4018 | +| * NullableOctetString | 0x4019 | +| * NullableCharString | 0x401E | +| * NullableEnumAttr | 0x4024 | +| * NullableStruct | 0x4025 | +| * NullableRangeRestrictedInt8u | 0x4026 | +| * NullableRangeRestrictedInt8s | 0x4027 | +| * NullableRangeRestrictedInt16u | 0x4028 | +| * NullableRangeRestrictedInt16s | 0x4029 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * AttributeList | 0xFFFB | @@ -60131,7 +60131,7 @@ class ReadTestClusterNullableBoolean : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008000) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60161,7 +60161,7 @@ class WriteTestClusterNullableBoolean : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008000) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60198,7 +60198,7 @@ class SubscribeAttributeTestClusterNullableBoolean : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008000) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60243,7 +60243,7 @@ class ReadTestClusterNullableBitmap8 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008001) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60273,7 +60273,7 @@ class WriteTestClusterNullableBitmap8 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008001) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60310,7 +60310,7 @@ class SubscribeAttributeTestClusterNullableBitmap8 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008001) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60355,7 +60355,7 @@ class ReadTestClusterNullableBitmap16 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008002) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60385,7 +60385,7 @@ class WriteTestClusterNullableBitmap16 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008002) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60422,7 +60422,7 @@ class SubscribeAttributeTestClusterNullableBitmap16 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008002) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60467,7 +60467,7 @@ class ReadTestClusterNullableBitmap32 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008003) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60497,7 +60497,7 @@ class WriteTestClusterNullableBitmap32 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008003) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60534,7 +60534,7 @@ class SubscribeAttributeTestClusterNullableBitmap32 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008003) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60579,7 +60579,7 @@ class ReadTestClusterNullableBitmap64 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008004) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60609,7 +60609,7 @@ class WriteTestClusterNullableBitmap64 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008004) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60646,7 +60646,7 @@ class SubscribeAttributeTestClusterNullableBitmap64 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008004) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60691,7 +60691,7 @@ class ReadTestClusterNullableInt8u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008005) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60721,7 +60721,7 @@ class WriteTestClusterNullableInt8u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008005) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60757,7 +60757,7 @@ class SubscribeAttributeTestClusterNullableInt8u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008005) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60802,7 +60802,7 @@ class ReadTestClusterNullableInt16u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008006) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004006) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60832,7 +60832,7 @@ class WriteTestClusterNullableInt16u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008006) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004006) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60868,7 +60868,7 @@ class SubscribeAttributeTestClusterNullableInt16u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008006) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004006) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -60913,7 +60913,7 @@ class ReadTestClusterNullableInt24u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008007) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004007) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -60943,7 +60943,7 @@ class WriteTestClusterNullableInt24u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008007) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004007) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -60979,7 +60979,7 @@ class SubscribeAttributeTestClusterNullableInt24u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008007) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004007) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61024,7 +61024,7 @@ class ReadTestClusterNullableInt32u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008008) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004008) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61054,7 +61054,7 @@ class WriteTestClusterNullableInt32u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008008) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004008) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61090,7 +61090,7 @@ class SubscribeAttributeTestClusterNullableInt32u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008008) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004008) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61135,7 +61135,7 @@ class ReadTestClusterNullableInt40u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008009) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004009) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61165,7 +61165,7 @@ class WriteTestClusterNullableInt40u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008009) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004009) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61201,7 +61201,7 @@ class SubscribeAttributeTestClusterNullableInt40u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008009) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004009) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61246,7 +61246,7 @@ class ReadTestClusterNullableInt48u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000800A) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400A) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61276,7 +61276,7 @@ class WriteTestClusterNullableInt48u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000800A) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400A) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61312,7 +61312,7 @@ class SubscribeAttributeTestClusterNullableInt48u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000800A) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400A) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61357,7 +61357,7 @@ class ReadTestClusterNullableInt56u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000800B) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400B) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61387,7 +61387,7 @@ class WriteTestClusterNullableInt56u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000800B) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400B) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61423,7 +61423,7 @@ class SubscribeAttributeTestClusterNullableInt56u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000800B) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400B) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61468,7 +61468,7 @@ class ReadTestClusterNullableInt64u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000800C) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400C) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61498,7 +61498,7 @@ class WriteTestClusterNullableInt64u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000800C) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400C) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61534,7 +61534,7 @@ class SubscribeAttributeTestClusterNullableInt64u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000800C) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400C) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61579,7 +61579,7 @@ class ReadTestClusterNullableInt8s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000800D) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400D) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61609,7 +61609,7 @@ class WriteTestClusterNullableInt8s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000800D) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400D) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61645,7 +61645,7 @@ class SubscribeAttributeTestClusterNullableInt8s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000800D) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400D) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61690,7 +61690,7 @@ class ReadTestClusterNullableInt16s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000800E) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61720,7 +61720,7 @@ class WriteTestClusterNullableInt16s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000800E) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61756,7 +61756,7 @@ class SubscribeAttributeTestClusterNullableInt16s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000800E) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61801,7 +61801,7 @@ class ReadTestClusterNullableInt24s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000800F) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000400F) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61831,7 +61831,7 @@ class WriteTestClusterNullableInt24s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000800F) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000400F) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61867,7 +61867,7 @@ class SubscribeAttributeTestClusterNullableInt24s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000800F) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000400F) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -61912,7 +61912,7 @@ class ReadTestClusterNullableInt32s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008010) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004010) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -61942,7 +61942,7 @@ class WriteTestClusterNullableInt32s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008010) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004010) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -61978,7 +61978,7 @@ class SubscribeAttributeTestClusterNullableInt32s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008010) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004010) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62023,7 +62023,7 @@ class ReadTestClusterNullableInt40s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008011) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004011) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62053,7 +62053,7 @@ class WriteTestClusterNullableInt40s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008011) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004011) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62089,7 +62089,7 @@ class SubscribeAttributeTestClusterNullableInt40s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008011) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004011) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62134,7 +62134,7 @@ class ReadTestClusterNullableInt48s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008012) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004012) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62164,7 +62164,7 @@ class WriteTestClusterNullableInt48s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008012) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004012) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62200,7 +62200,7 @@ class SubscribeAttributeTestClusterNullableInt48s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008012) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004012) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62245,7 +62245,7 @@ class ReadTestClusterNullableInt56s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008013) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004013) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62275,7 +62275,7 @@ class WriteTestClusterNullableInt56s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008013) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004013) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62311,7 +62311,7 @@ class SubscribeAttributeTestClusterNullableInt56s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008013) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004013) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62356,7 +62356,7 @@ class ReadTestClusterNullableInt64s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008014) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004014) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62386,7 +62386,7 @@ class WriteTestClusterNullableInt64s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008014) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004014) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62422,7 +62422,7 @@ class SubscribeAttributeTestClusterNullableInt64s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008014) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004014) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62467,7 +62467,7 @@ class ReadTestClusterNullableEnum8 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008015) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004015) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62497,7 +62497,7 @@ class WriteTestClusterNullableEnum8 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008015) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004015) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62533,7 +62533,7 @@ class SubscribeAttributeTestClusterNullableEnum8 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008015) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004015) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62578,7 +62578,7 @@ class ReadTestClusterNullableEnum16 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008016) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004016) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62608,7 +62608,7 @@ class WriteTestClusterNullableEnum16 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008016) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004016) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62644,7 +62644,7 @@ class SubscribeAttributeTestClusterNullableEnum16 : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008016) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004016) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62689,7 +62689,7 @@ class ReadTestClusterNullableFloatSingle : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008017) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004017) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62719,7 +62719,7 @@ class WriteTestClusterNullableFloatSingle : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008017) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004017) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62756,7 +62756,7 @@ class SubscribeAttributeTestClusterNullableFloatSingle : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008017) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004017) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62802,7 +62802,7 @@ class ReadTestClusterNullableFloatDouble : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008018) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004018) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62832,7 +62832,7 @@ class WriteTestClusterNullableFloatDouble : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008018) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004018) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62869,7 +62869,7 @@ class SubscribeAttributeTestClusterNullableFloatDouble : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008018) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004018) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -62915,7 +62915,7 @@ class ReadTestClusterNullableOctetString : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008019) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004019) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -62945,7 +62945,7 @@ class WriteTestClusterNullableOctetString : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008019) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004019) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -62982,7 +62982,7 @@ class SubscribeAttributeTestClusterNullableOctetString : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008019) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004019) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63028,7 +63028,7 @@ class ReadTestClusterNullableCharString : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000801E) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x0000401E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63058,7 +63058,7 @@ class WriteTestClusterNullableCharString : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000801E) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x0000401E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63097,7 +63097,7 @@ class SubscribeAttributeTestClusterNullableCharString : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000801E) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x0000401E) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63143,7 +63143,7 @@ class ReadTestClusterNullableEnumAttr : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008024) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004024) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63173,7 +63173,7 @@ class WriteTestClusterNullableEnumAttr : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008024) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004024) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63210,7 +63210,7 @@ class SubscribeAttributeTestClusterNullableEnumAttr : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008024) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004024) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63255,7 +63255,7 @@ class ReadTestClusterNullableStruct : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008025) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004025) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63287,7 +63287,7 @@ class WriteTestClusterNullableStruct : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008025) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004025) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63339,7 +63339,7 @@ class SubscribeAttributeTestClusterNullableStruct : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008025) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004025) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63385,7 +63385,7 @@ class ReadTestClusterNullableRangeRestrictedInt8u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008026) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004026) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63416,7 +63416,7 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008026) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004026) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63453,7 +63453,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8u : public ModelCo CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008026) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004026) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63500,7 +63500,7 @@ class ReadTestClusterNullableRangeRestrictedInt8s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008027) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004027) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63531,7 +63531,7 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008027) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004027) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63568,7 +63568,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt8s : public ModelCo CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008027) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004027) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63615,7 +63615,7 @@ class ReadTestClusterNullableRangeRestrictedInt16u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008028) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004028) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63646,7 +63646,7 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008028) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004028) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63684,7 +63684,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16u : public ModelC CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008028) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004028) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; @@ -63732,7 +63732,7 @@ class ReadTestClusterNullableRangeRestrictedInt16s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00008029) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReadAttribute (0x00004029) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; @@ -63763,7 +63763,7 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public ModelCommand { CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00008029) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) WriteAttribute (0x00004029) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIP_ERROR __block chipError = CHIP_NO_ERROR; @@ -63801,7 +63801,7 @@ class SubscribeAttributeTestClusterNullableRangeRestrictedInt16s : public ModelC CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override { - ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00008029) on endpoint %u", endpointId); + ChipLogProgress(chipTool, "Sending cluster (0x0000050F) ReportAttribute (0x00004029) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); CHIPTestCluster * cluster = [[CHIPTestCluster alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; CHIPSubscribeParams * params = [[CHIPSubscribeParams alloc] init]; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 998312228b827f..3d764111bbabc6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -15475,39 +15475,39 @@ class AccountLoginLogout : public ClusterCommand | * GeneralErrorBoolean | 0x0031 | | * ClusterErrorBoolean | 0x0032 | | * Unsupported | 0x00FF | -| * NullableBoolean | 0x8000 | -| * NullableBitmap8 | 0x8001 | -| * NullableBitmap16 | 0x8002 | -| * NullableBitmap32 | 0x8003 | -| * NullableBitmap64 | 0x8004 | -| * NullableInt8u | 0x8005 | -| * NullableInt16u | 0x8006 | -| * NullableInt24u | 0x8007 | -| * NullableInt32u | 0x8008 | -| * NullableInt40u | 0x8009 | -| * NullableInt48u | 0x800A | -| * NullableInt56u | 0x800B | -| * NullableInt64u | 0x800C | -| * NullableInt8s | 0x800D | -| * NullableInt16s | 0x800E | -| * NullableInt24s | 0x800F | -| * NullableInt32s | 0x8010 | -| * NullableInt40s | 0x8011 | -| * NullableInt48s | 0x8012 | -| * NullableInt56s | 0x8013 | -| * NullableInt64s | 0x8014 | -| * NullableEnum8 | 0x8015 | -| * NullableEnum16 | 0x8016 | -| * NullableFloatSingle | 0x8017 | -| * NullableFloatDouble | 0x8018 | -| * NullableOctetString | 0x8019 | -| * NullableCharString | 0x801E | -| * NullableEnumAttr | 0x8024 | -| * NullableStruct | 0x8025 | -| * NullableRangeRestrictedInt8u | 0x8026 | -| * NullableRangeRestrictedInt8s | 0x8027 | -| * NullableRangeRestrictedInt16u | 0x8028 | -| * NullableRangeRestrictedInt16s | 0x8029 | +| * NullableBoolean | 0x4000 | +| * NullableBitmap8 | 0x4001 | +| * NullableBitmap16 | 0x4002 | +| * NullableBitmap32 | 0x4003 | +| * NullableBitmap64 | 0x4004 | +| * NullableInt8u | 0x4005 | +| * NullableInt16u | 0x4006 | +| * NullableInt24u | 0x4007 | +| * NullableInt32u | 0x4008 | +| * NullableInt40u | 0x4009 | +| * NullableInt48u | 0x400A | +| * NullableInt56u | 0x400B | +| * NullableInt64u | 0x400C | +| * NullableInt8s | 0x400D | +| * NullableInt16s | 0x400E | +| * NullableInt24s | 0x400F | +| * NullableInt32s | 0x4010 | +| * NullableInt40s | 0x4011 | +| * NullableInt48s | 0x4012 | +| * NullableInt56s | 0x4013 | +| * NullableInt64s | 0x4014 | +| * NullableEnum8 | 0x4015 | +| * NullableEnum16 | 0x4016 | +| * NullableFloatSingle | 0x4017 | +| * NullableFloatDouble | 0x4018 | +| * NullableOctetString | 0x4019 | +| * NullableCharString | 0x401E | +| * NullableEnumAttr | 0x4024 | +| * NullableStruct | 0x4025 | +| * NullableRangeRestrictedInt8u | 0x4026 | +| * NullableRangeRestrictedInt8s | 0x4027 | +| * NullableRangeRestrictedInt16u | 0x4028 | +| * NullableRangeRestrictedInt16s | 0x4029 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * AttributeList | 0xFFFB | @@ -17537,12 +17537,12 @@ class WriteTestClusterNullableBoolean : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008000, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004000, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008000, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004000, mValue); } private: @@ -17564,12 +17564,12 @@ class WriteTestClusterNullableBitmap8 : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008001, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004001, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008001, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004001, mValue); } private: @@ -17591,12 +17591,12 @@ class WriteTestClusterNullableBitmap16 : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008002, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004002, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008002, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004002, mValue); } private: @@ -17618,12 +17618,12 @@ class WriteTestClusterNullableBitmap32 : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008003, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004003, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008003, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004003, mValue); } private: @@ -17645,12 +17645,12 @@ class WriteTestClusterNullableBitmap64 : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008004, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004004, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008004, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004004, mValue); } private: @@ -17671,12 +17671,12 @@ class WriteTestClusterNullableInt8u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008005, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004005, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008005, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004005, mValue); } private: @@ -17698,12 +17698,12 @@ class WriteTestClusterNullableInt16u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008006, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004006, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008006, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004006, mValue); } private: @@ -17725,12 +17725,12 @@ class WriteTestClusterNullableInt24u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008007, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004007, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008007, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004007, mValue); } private: @@ -17752,12 +17752,12 @@ class WriteTestClusterNullableInt32u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008008, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004008, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008008, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004008, mValue); } private: @@ -17779,12 +17779,12 @@ class WriteTestClusterNullableInt40u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008009, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004009, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008009, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004009, mValue); } private: @@ -17806,12 +17806,12 @@ class WriteTestClusterNullableInt48u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000800A, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400A, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000800A, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400A, mValue); } private: @@ -17833,12 +17833,12 @@ class WriteTestClusterNullableInt56u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000800B, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400B, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000800B, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400B, mValue); } private: @@ -17860,12 +17860,12 @@ class WriteTestClusterNullableInt64u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000800C, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400C, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000800C, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400C, mValue); } private: @@ -17886,12 +17886,12 @@ class WriteTestClusterNullableInt8s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000800D, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400D, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000800D, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400D, mValue); } private: @@ -17913,12 +17913,12 @@ class WriteTestClusterNullableInt16s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000800E, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400E, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000800E, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400E, mValue); } private: @@ -17940,12 +17940,12 @@ class WriteTestClusterNullableInt24s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000800F, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000400F, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000800F, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000400F, mValue); } private: @@ -17967,12 +17967,12 @@ class WriteTestClusterNullableInt32s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008010, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004010, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008010, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004010, mValue); } private: @@ -17994,12 +17994,12 @@ class WriteTestClusterNullableInt40s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008011, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004011, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008011, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004011, mValue); } private: @@ -18021,12 +18021,12 @@ class WriteTestClusterNullableInt48s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008012, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004012, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008012, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004012, mValue); } private: @@ -18048,12 +18048,12 @@ class WriteTestClusterNullableInt56s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008013, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004013, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008013, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004013, mValue); } private: @@ -18075,12 +18075,12 @@ class WriteTestClusterNullableInt64s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008014, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004014, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008014, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004014, mValue); } private: @@ -18101,12 +18101,12 @@ class WriteTestClusterNullableEnum8 : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008015, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004015, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008015, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004015, mValue); } private: @@ -18128,12 +18128,12 @@ class WriteTestClusterNullableEnum16 : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008016, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004016, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008016, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004016, mValue); } private: @@ -18155,12 +18155,12 @@ class WriteTestClusterNullableFloatSingle : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008017, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004017, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008017, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004017, mValue); } private: @@ -18182,12 +18182,12 @@ class WriteTestClusterNullableFloatDouble : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008018, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004018, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008018, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004018, mValue); } private: @@ -18209,12 +18209,12 @@ class WriteTestClusterNullableOctetString : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008019, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004019, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008019, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004019, mValue); } private: @@ -18236,12 +18236,12 @@ class WriteTestClusterNullableCharString : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000801E, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x0000401E, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000801E, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x0000401E, mValue); } private: @@ -18263,12 +18263,12 @@ class WriteTestClusterNullableEnumAttr : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008024, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004024, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008024, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004024, mValue); } private: @@ -18290,12 +18290,12 @@ class WriteTestClusterNullableStruct : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008025, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004025, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008025, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004025, mValue); } private: @@ -18318,12 +18318,12 @@ class WriteTestClusterNullableRangeRestrictedInt8u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008026, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004026, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008026, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004026, mValue); } private: @@ -18345,12 +18345,12 @@ class WriteTestClusterNullableRangeRestrictedInt8s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008027, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004027, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008027, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004027, mValue); } private: @@ -18372,12 +18372,12 @@ class WriteTestClusterNullableRangeRestrictedInt16u : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008028, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004028, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008028, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004028, mValue); } private: @@ -18399,12 +18399,12 @@ class WriteTestClusterNullableRangeRestrictedInt16s : public WriteAttribute CHIP_ERROR SendCommand(ChipDevice * device, std::vector endpointIds) override { - return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00008029, mValue); + return WriteAttribute::SendCommand(device, endpointIds.at(0), 0x0000050F, 0x00004029, mValue); } CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override { - return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00008029, mValue); + return WriteAttribute::SendGroupCommand(groupId, fabricIndex, 0x0000050F, 0x00004029, mValue); } private: