From 27088201fb7791716939d82458e8cff57ed6f534 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Sun, 19 Mar 2023 23:57:03 -0400 Subject: [PATCH] Revert "Add ProductAppearance attribute support. (#24415)" (#25740) This reverts commit 7f8dfe87aa8166c4ea5e8f9dd4ea0ebc85954c38. This attribute is not in the spec yet, and the PR should not have been merged. --- .../all-clusters-app.matter | 42 +- .../all-clusters-common/all-clusters-app.zap | 21 +- .../all-clusters-app/linux/main-common.cpp | 63 - .../all-clusters-minimal-app.matter | 33 - .../bridge-common/bridge-app.matter | 33 - ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 33 - ...de_colortemperaturelight_hbUnzYVeyn.matter | 33 - .../rootnode_contactsensor_lFAGG1bfRO.matter | 33 - .../rootnode_dimmablelight_bCwGYSDpoe.matter | 33 - .../rootnode_doorlock_aNKYAreMXE.matter | 33 - ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 33 - .../devices/rootnode_fan_7N2TobIlOX.matter | 33 - .../rootnode_flowsensor_1zVxHedlaV.matter | 33 - ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 33 - .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 33 - .../rootnode_lightsensor_lZQycTFcJK.matter | 33 - ...rootnode_occupancysensor_iHyVgifZuo.matter | 33 - .../rootnode_onofflight_bbs1b7IaOV.matter | 33 - ...ootnode_onofflightswitch_FsPlMr090Q.matter | 33 - ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 33 - .../rootnode_pressuresensor_s0qC9wLH4k.matter | 33 - .../rootnode_speaker_RpzeXdimqA.matter | 33 - ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 33 - .../rootnode_thermostat_bm3fb8dhYi.matter | 33 - .../rootnode_windowcovering_RLCxaGi9Yx.matter | 33 - .../contact-sensor-app.matter | 33 - .../bridge-common/bridge-app.matter | 33 - .../light-switch-app.matter | 33 - .../lighting-common/lighting-app.matter | 33 - .../nxp/zap/lighting-on-off.matter | 33 - .../data_model/lighting-thread-app.matter | 33 - .../efr32/data_model/lighting-wifi-app.matter | 33 - examples/lock-app/lock-common/lock-app.matter | 33 - examples/lock-app/nxp/zap/lock-app.matter | 33 - .../ota-provider-app.matter | 33 - .../ota-requestor-app.matter | 33 - .../placeholder/linux/apps/app1/config.matter | 33 - .../placeholder/linux/apps/app2/config.matter | 33 - examples/pump-app/pump-common/pump-app.matter | 33 - .../pump-controller-app.matter | 33 - .../temperature-measurement.matter | 33 - .../thermostat-common/thermostat.matter | 33 - examples/tv-app/tv-common/tv-app.matter | 33 - .../tv-casting-common/tv-casting-app.matter | 33 - examples/window-app/common/window-app.matter | 33 - .../basic-information/basic-information.cpp | 33 - .../tests/suites/TestBasicInformation.yaml | 8 - .../certification/Test_TC_BINFO_1_1.yaml | 2 +- .../chip/basic-information-cluster.xml | 44 +- .../data_model/controller-clusters.matter | 33 - .../chip/devicecontroller/ChipStructs.java | 25 - .../python/chip/clusters/Objects.py | 73 - .../CHIP/templates/availability.yaml | 53 - .../MTRAttributeTLVValueDecoder.mm | 17 - .../CHIP/zap-generated/MTRBaseClusters.h | 46 - .../CHIP/zap-generated/MTRBaseClusters.mm | 48 - .../CHIP/zap-generated/MTRCallbackBridge.h | 177 --- .../CHIP/zap-generated/MTRCallbackBridge.mm | 129 -- .../CHIP/zap-generated/MTRClusterConstants.h | 1 - .../CHIP/zap-generated/MTRClusters.h | 2 - .../CHIP/zap-generated/MTRClusters.mm | 8 - .../CHIP/zap-generated/MTRStructsObjc.h | 5 - .../CHIP/zap-generated/MTRStructsObjc.mm | 31 - .../platform/DeviceInstanceInfoProvider.h | 25 - .../app-common/zap-generated/attribute-id.h | 1239 ----------------- .../zap-generated/cluster-enums-check.h | 48 - .../app-common/zap-generated/cluster-enums.h | 50 +- .../zap-generated/cluster-objects.cpp | 47 - .../zap-generated/cluster-objects.h | 36 - .../app-common/zap-generated/ids/Attributes.h | 4 - .../zap-generated/cluster/Commands.h | 5 - .../cluster/ComplexArgumentParser.cpp | 31 - .../cluster/ComplexArgumentParser.h | 4 - .../cluster/logging/DataModelLogger.cpp | 30 - .../cluster/logging/DataModelLogger.h | 2 - .../chip-tool/zap-generated/test/Commands.h | 33 +- .../zap-generated/cluster/Commands.h | 74 - .../zap-generated/test/Commands.h | 53 +- 78 files changed, 22 insertions(+), 3906 deletions(-) delete mode 100644 zzz_generated/app-common/app-common/zap-generated/attribute-id.h 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 eee92ead8259cb..0624c2d2eca7fd 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 @@ -659,49 +659,11 @@ server cluster Actions = 37 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; } - struct ProductAppearanceStruct { - ProductFinishEnum finish = 0; - nullable ColorEnum primaryColor = 1; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } @@ -737,7 +699,6 @@ server cluster BasicInformation = 40 { readonly attribute boolean reachable = 17; readonly attribute char_string<32> uniqueID = 18; readonly attribute CapabilityMinimaStruct capabilityMinima = 19; - readonly attribute ProductAppearanceStruct productAppearance = 20; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -4509,9 +4470,8 @@ endpoint 0 { ram attribute reachable default = 1; callback attribute uniqueID; callback attribute capabilityMinima; - callback attribute productAppearance; ram attribute featureMap; - ram attribute clusterRevision default = 2; + ram attribute clusterRevision default = 1; } server cluster OtaSoftwareUpdateRequestor { 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 8c645de17c904b..7bdd60bf91a82f 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 @@ -1508,22 +1508,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "ProductAppearance", - "code": 20, - "mfgCode": null, - "side": "server", - "type": "ProductAppearanceStruct", - "included": 1, - "storageOption": "External", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "FeatureMap", "code": 65532, @@ -1550,7 +1534,7 @@ "storageOption": "RAM", "singleton": 1, "bounded": 0, - "defaultValue": "2", + "defaultValue": "1", "reportable": 1, "minInterval": 0, "maxInterval": 65344, @@ -25514,6 +25498,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/all-clusters-app/linux/main-common.cpp b/examples/all-clusters-app/linux/main-common.cpp index 39a4bf381a710b..b4724ad6f7cb45 100644 --- a/examples/all-clusters-app/linux/main-common.cpp +++ b/examples/all-clusters-app/linux/main-common.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include #include #include @@ -139,61 +138,6 @@ Clusters::NetworkCommissioning::Instance sWiFiNetworkCommissioningInstance(kNetw #endif Clusters::NetworkCommissioning::Instance sEthernetNetworkCommissioningInstance(kNetworkCommissioningEndpointMain, &sEthernetDriver); - -class ExampleDeviceInstanceInfoProvider : public DeviceInstanceInfoProvider -{ -public: - void Init(DeviceInstanceInfoProvider * defaultProvider) { mDefaultProvider = defaultProvider; } - - CHIP_ERROR GetVendorName(char * buf, size_t bufSize) override { return mDefaultProvider->GetVendorName(buf, bufSize); } - CHIP_ERROR GetVendorId(uint16_t & vendorId) override { return mDefaultProvider->GetVendorId(vendorId); } - CHIP_ERROR GetProductName(char * buf, size_t bufSize) override { return mDefaultProvider->GetProductName(buf, bufSize); } - CHIP_ERROR GetProductId(uint16_t & productId) override { return mDefaultProvider->GetProductId(productId); } - CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override { return mDefaultProvider->GetPartNumber(buf, bufSize); } - CHIP_ERROR GetProductURL(char * buf, size_t bufSize) override { return mDefaultProvider->GetPartNumber(buf, bufSize); } - CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override { return mDefaultProvider->GetProductLabel(buf, bufSize); } - CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override { return mDefaultProvider->GetSerialNumber(buf, bufSize); } - CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override - { - return mDefaultProvider->GetManufacturingDate(year, month, day); - } - CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override - { - return mDefaultProvider->GetHardwareVersion(hardwareVersion); - } - CHIP_ERROR GetHardwareVersionString(char * buf, size_t bufSize) override - { - return mDefaultProvider->GetHardwareVersionString(buf, bufSize); - } - CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) override - { - return mDefaultProvider->GetRotatingDeviceIdUniqueId(uniqueIdSpan); - } - CHIP_ERROR GetProductFinish(Clusters::BasicInformation::ProductFinishEnum * finish) override; - CHIP_ERROR GetProductPrimaryColor(Clusters::BasicInformation::ColorEnum * primaryColor) override; - -private: - DeviceInstanceInfoProvider * mDefaultProvider; -}; - -CHIP_ERROR ExampleDeviceInstanceInfoProvider::GetProductFinish(Clusters::BasicInformation::ProductFinishEnum * finish) -{ - // Our example device claims to have a Satin finish for now. We can make - // this configurable as needed. - *finish = Clusters::BasicInformation::ProductFinishEnum::kSatin; - return CHIP_NO_ERROR; -} - -CHIP_ERROR ExampleDeviceInstanceInfoProvider::GetProductPrimaryColor(Clusters::BasicInformation::ColorEnum * primaryColor) -{ - // Our example device claims to have a nice purple color for now. We can - // make this configurable as needed. - *primaryColor = Clusters::BasicInformation::ColorEnum::kPurple; - return CHIP_NO_ERROR; -} - -ExampleDeviceInstanceInfoProvider gExampleDeviceInstanceInfoProvider; - } // namespace void ApplicationInit() @@ -257,13 +201,6 @@ void ApplicationInit() ChipLogError(NotSpecified, "Failed to start CHIP NamedPipeCommands"); sChipNamedPipeCommands.Stop(); } - - auto * defaultProvider = GetDeviceInstanceInfoProvider(); - if (defaultProvider != &gExampleDeviceInstanceInfoProvider) - { - gExampleDeviceInstanceInfoProvider.Init(defaultProvider); - SetDeviceInstanceInfoProvider(&gExampleDeviceInstanceInfoProvider); - } } void ApplicationExit() diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index d2b905df283eb8..0b9400d1f4c62b 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -552,39 +552,6 @@ server cluster Actions = 37 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index ea8b1a418bde62..464416e0943658 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -462,39 +462,6 @@ server cluster Actions = 37 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index df552042e925c5..2666156dd67cec 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -354,39 +354,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 58ac39e947075f..73f0fad8aa24b5 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -357,39 +357,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index c7dcb2671fd3a1..d69ad8d02016c8 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -207,39 +207,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 7c75ad30357ec9..9a1eb55c3db7cd 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -354,39 +354,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 94037aab0ccdb8..0dda840f15e723 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -207,39 +207,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 50159733cac1d5..8e42c417cef86f 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -354,39 +354,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 49912ee097e7d7..af6104234a63ff 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -198,39 +198,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 225c05871a6a17..004787645dcf69 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -221,39 +221,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 7b5e26ab03855a..9eddfdffe475d9 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -347,39 +347,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 9f3bf4eb76ff00..7a45ce19377ed4 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -221,39 +221,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 78ff7fbaebb6b4..b49f38eb025857 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -221,39 +221,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index f4d35fc2e8913b..4e218927f80eee 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -221,39 +221,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 7cc826a2cb8988..5c079a5eafd9e2 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -354,39 +354,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index f4418eb8d70f0f..8dcd107506e0d8 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -293,39 +293,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 07794ad8a51c04..2c7d1b9e16bab8 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -254,39 +254,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 72daf307f92fda..146e6d58ad75f3 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -226,39 +226,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 2ba9698315418e..0c1041f3c77441 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -348,39 +348,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index d497ee4c9e38f3..951abb3781f2b6 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -221,39 +221,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index fa23c2a363aed9..8652dac6608b56 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -207,39 +207,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 72b49efb0b0cb3..7eb2860ebe40b4 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -207,39 +207,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - critical event StartUp = 0 { INT32U softwareVersion = 0; } diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 9547c182734ac0..7b59e70d22e86c 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -203,39 +203,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 7fbfd0010626f7..b84898e28a475f 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -462,39 +462,6 @@ server cluster Actions = 37 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 8d75340de5329f..4a92de568eadd7 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -417,39 +417,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 6750248fcc5c51..73f3b486a12dbd 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -371,39 +371,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 50d895af566e33..0dba423775462d 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -353,39 +353,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter index 8906dd5a2a7f33..34ecc1a58681f0 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter @@ -371,39 +371,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter index d6eb49f896be05..0ca16845849b6a 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter @@ -371,39 +371,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 9455e5a0d9d8b5..3f175fc88bea6a 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -180,39 +180,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index b37549f9021f83..de2ea9558dcf6a 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -128,39 +128,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index b27341c921d816..2bb77fc4bd7a03 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -163,39 +163,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 04c94c14b59d77..aa541eeaf95d44 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -264,39 +264,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 55a4fd5d1c7494..3ee30cec25fc4f 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -617,39 +617,6 @@ server cluster Actions = 37 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 9f8c82e5cefe73..6f6e953460ce36 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -617,39 +617,6 @@ server cluster Actions = 37 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 611748ecfd6a12..b5388fb518d90c 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -287,39 +287,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index c825cfcdb3387a..cbdbae0544ff1b 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -189,39 +189,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index 8e664bdfc12a20..231209600fca32 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -94,39 +94,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 131b1fe5b3d0b0..14a7a104b6c205 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -376,39 +376,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 856d5765d59b46..ad38b6dca1023b 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -285,39 +285,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index fef3c4e2609edd..ae80a0051bf8ca 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -669,39 +669,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index a1ba105d13d9f0..76f47712d12acc 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -319,39 +319,6 @@ server cluster AccessControl = 31 { } server cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/src/app/clusters/basic-information/basic-information.cpp b/src/app/clusters/basic-information/basic-information.cpp index 57f297f1e1c4ad..3e98375670d513 100644 --- a/src/app/clusters/basic-information/basic-information.cpp +++ b/src/app/clusters/basic-information/basic-information.cpp @@ -58,7 +58,6 @@ class BasicAttrAccess : public AttributeAccessInterface CHIP_ERROR ReadDataModelRevision(AttributeValueEncoder & aEncoder); CHIP_ERROR ReadLocation(AttributeValueEncoder & aEncoder); CHIP_ERROR WriteLocation(AttributeValueDecoder & aDecoder); - CHIP_ERROR ReadProductAppearance(AttributeValueEncoder & aEncoder); }; BasicAttrAccess gAttrAccess; @@ -282,11 +281,6 @@ CHIP_ERROR BasicAttrAccess::Read(const ConcreteReadAttributePath & aPath, Attrib break; } - case ProductAppearance::Id: { - status = ReadProductAppearance(aEncoder); - break; - } - default: // We did not find a processing path, the caller will delegate elsewhere. break; @@ -349,33 +343,6 @@ CHIP_ERROR BasicAttrAccess::WriteLocation(AttributeValueDecoder & aDecoder) return DeviceLayer::ConfigurationMgr().StoreCountryCode(location.data(), location.size()); } -CHIP_ERROR BasicAttrAccess::ReadProductAppearance(AttributeValueEncoder & aEncoder) -{ - auto * provider = GetDeviceInstanceInfoProvider(); - ProductFinishEnum finish; - ReturnErrorOnFailure(provider->GetProductFinish(&finish)); - - ColorEnum color; - CHIP_ERROR colorStatus = provider->GetProductPrimaryColor(&color); - if (colorStatus != CHIP_NO_ERROR && colorStatus != CHIP_ERROR_NOT_IMPLEMENTED) - { - return colorStatus; - } - - Structs::ProductAppearanceStruct::Type productAppearance; - productAppearance.finish = finish; - if (colorStatus == CHIP_NO_ERROR) - { - productAppearance.primaryColor.SetNonNull(color); - } - else - { - productAppearance.primaryColor.SetNull(); - } - - return aEncoder.Encode(productAppearance); -} - class PlatformMgrDelegate : public DeviceLayer::PlatformManagerDelegate { void OnStartUp(uint32_t softwareVersion) override diff --git a/src/app/tests/suites/TestBasicInformation.yaml b/src/app/tests/suites/TestBasicInformation.yaml index cd33c7360fa112..8dce39f49b6d89 100644 --- a/src/app/tests/suites/TestBasicInformation.yaml +++ b/src/app/tests/suites/TestBasicInformation.yaml @@ -77,7 +77,6 @@ tests: 17, 18, 19, - 20, 0xFFF8, # GeneratedCommandList 0xFFF9, # AcceptedCommandList 0xFFFB, # AttributeList @@ -156,10 +155,3 @@ tests: attribute: "LocalConfigDisabled" arguments: value: false - - - label: "Read the ProductApppearance value" - command: "readAttribute" - attribute: "ProductAppearance" - response: - # For now all-clusters-app is a satin purple. - value: { Finish: 1, PrimaryColor: 5 } diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml index 670f5e2972122e..c21058ce983913 100644 --- a/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BINFO_1_1.yaml @@ -38,7 +38,7 @@ tests: command: "readAttribute" attribute: "ClusterRevision" response: - value: 2 + value: 1 constraints: type: int16u diff --git a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml index eb348dfd5f36a1..cfe5e82dca20fa 100644 --- a/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/basic-information-cluster.xml @@ -23,47 +23,6 @@ limitations under the License. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Basic Information CHIP @@ -72,7 +31,7 @@ limitations under the License. This cluster provides attributes and events for determining basic information about Nodes, which supports both Commissioning and operational determination of Node characteristics, such as Vendor ID, Product ID and serial number, which apply to the whole Node. Also allows setting user device information such as location. - + DataModelRevision VendorName @@ -106,7 +65,6 @@ limitations under the License. Reachable UniqueID CapabilityMinima - ProductAppearance The StartUp event SHALL be emitted by a Node as soon as reasonable after completing a boot or reboot process. diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 79d83cb4bcef8f..cb4df8c85b8b09 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -695,39 +695,6 @@ client cluster Actions = 37 { } client cluster BasicInformation = 40 { - enum ColorEnum : ENUM8 { - kBlack = 0; - kNavy = 1; - kGreen = 2; - kTeal = 3; - kMaroon = 4; - kPurple = 5; - kOlive = 6; - kGray = 7; - kBlue = 8; - kLime = 9; - kAqua = 10; - kRed = 11; - kFuchsia = 12; - kYellow = 13; - kWhite = 14; - kNickel = 15; - kChrome = 16; - kBrass = 17; - kCopper = 18; - kSilver = 19; - kGold = 20; - } - - enum ProductFinishEnum : ENUM8 { - kMatte = 0; - kSatin = 1; - kPolished = 2; - kRugged = 3; - kFabric = 4; - kOther = 255; - } - struct CapabilityMinimaStruct { int16u caseSessionsPerFabric = 0; int16u subscriptionsPerFabric = 1; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index 5e250a4b5a394c..56810ab1fb2871 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -350,31 +350,6 @@ public String toString() { } } - public static class BasicInformationClusterProductAppearanceStruct { - public Integer finish; - public @Nullable Integer primaryColor; - - public BasicInformationClusterProductAppearanceStruct( - Integer finish, @Nullable Integer primaryColor) { - this.finish = finish; - this.primaryColor = primaryColor; - } - - @Override - public String toString() { - StringBuilder output = new StringBuilder(); - output.append("BasicInformationClusterProductAppearanceStruct {\n"); - output.append("\tfinish: "); - output.append(finish); - output.append("\n"); - output.append("\tprimaryColor: "); - output.append(primaryColor); - output.append("\n"); - output.append("}\n"); - return output.toString(); - } - } - public static class OtaSoftwareUpdateRequestorClusterProviderLocation { public Long providerNodeID; public Integer endpoint; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 99b05323d08f4a..61079f4c51d42f 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -4021,7 +4021,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="reachable", Tag=0x00000011, Type=typing.Optional[bool]), ClusterObjectFieldDescriptor(Label="uniqueID", Tag=0x00000012, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="capabilityMinima", Tag=0x00000013, Type=BasicInformation.Structs.CapabilityMinimaStruct), - ClusterObjectFieldDescriptor(Label="productAppearance", Tag=0x00000014, Type=typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -4050,7 +4049,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: reachable: 'typing.Optional[bool]' = None uniqueID: 'typing.Optional[str]' = None capabilityMinima: 'BasicInformation.Structs.CapabilityMinimaStruct' = None - productAppearance: 'typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None eventList: 'typing.List[uint]' = None @@ -4058,48 +4056,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: featureMap: 'uint' = None clusterRevision: 'uint' = None - class Enums: - class ColorEnum(MatterIntEnum): - kBlack = 0x00 - kNavy = 0x01 - kGreen = 0x02 - kTeal = 0x03 - kMaroon = 0x04 - kPurple = 0x05 - kOlive = 0x06 - kGray = 0x07 - kBlue = 0x08 - kLime = 0x09 - kAqua = 0x0A - kRed = 0x0B - kFuchsia = 0x0C - kYellow = 0x0D - kWhite = 0x0E - kNickel = 0x0F - kChrome = 0x10 - kBrass = 0x11 - kCopper = 0x12 - kSilver = 0x13 - kGold = 0x14 - # All received enum values that are not listed above will be mapped - # to kUnknownEnumValue. This is a helper enum value that should only - # be used by code to process how it handles receiving and unknown - # enum value. This specific should never be transmitted. - kUnknownEnumValue = 21, - - class ProductFinishEnum(MatterIntEnum): - kMatte = 0x00 - kSatin = 0x01 - kPolished = 0x02 - kRugged = 0x03 - kFabric = 0x04 - kOther = 0xFF - # All received enum values that are not listed above will be mapped - # to kUnknownEnumValue. This is a helper enum value that should only - # be used by code to process how it handles receiving and unknown - # enum value. This specific should never be transmitted. - kUnknownEnumValue = 5, - class Structs: @dataclass class CapabilityMinimaStruct(ClusterObject): @@ -4114,19 +4070,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: caseSessionsPerFabric: 'uint' = 0 subscriptionsPerFabric: 'uint' = 0 - @dataclass - class ProductAppearanceStruct(ClusterObject): - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="finish", Tag=0, Type=BasicInformation.Enums.ProductFinishEnum), - ClusterObjectFieldDescriptor(Label="primaryColor", Tag=1, Type=typing.Union[Nullable, BasicInformation.Enums.ColorEnum]), - ]) - - finish: 'BasicInformation.Enums.ProductFinishEnum' = 0 - primaryColor: 'typing.Union[Nullable, BasicInformation.Enums.ColorEnum]' = NullValue - class Commands: @dataclass class MfgSpecificPing(ClusterCommand): @@ -4462,22 +4405,6 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'BasicInformation.Structs.CapabilityMinimaStruct' = field(default_factory=lambda: BasicInformation.Structs.CapabilityMinimaStruct()) - @dataclass - class ProductAppearance(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0028 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000014 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]) - - value: 'typing.Optional[BasicInformation.Structs.ProductAppearanceStruct]' = None - @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): @ChipUtility.classproperty diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index b80f67f8fb9dd4..eb5db2f33878fb 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -6546,8 +6546,6 @@ attributes: TimeSynchronization: - DSTOffset - BasicInformation: - - ProductAppearance command fields: DiagnosticLogs: RetrieveLogsRequest: @@ -6557,8 +6555,6 @@ TimeSynchronization: - DSTOffsetStruct - TimeZoneStruct - BasicInformation: - - ProductAppearanceStruct struct fields: TimeSynchronization: DSTOffsetStruct: @@ -6569,10 +6565,6 @@ - offset - validAt - name - BasicInformation: - ProductAppearanceStruct: - - finish - - primaryColor enums: DiagnosticLogs: - IntentEnum @@ -6589,9 +6581,6 @@ PowerSource: - BatCommonDesignationEnum - BatApprovedChemistryEnum - BasicInformation: - - ColorEnum - - ProductFinishEnum enum values: DoorLock: LockDataTypeEnum: @@ -6762,36 +6751,6 @@ - SodiumSulfur - ZincBromide - ZincCerium - BasicInformation: - ColorEnum: - - Black - - Navy - - Green - - Teal - - Maroon - - Purple - - Olive - - Gray - - Blue - - Lime - - Aqua - - Red - - Fuchsia - - Yellow - - White - - Nickel - - Chrome - - Brass - - Copper - - Silver - - Gold - ProductFinishEnum: - - Matte - - Satin - - Polished - - Rugged - - Fabric - - Other bitmaps: OccupancySensing: - OccupancyBitmap @@ -6856,9 +6815,6 @@ # EventList is provisional for now. - EventList attributes: - # The ProductAppearance bits never happend for the old Basic cluster name. - Basic: - - ProductAppearance # EventList is provisional for now. Scenes: - EventList @@ -7002,15 +6958,6 @@ - EventList FaultInjection: - EventList - structs: - # The ProductAppearance bits never happend for the old Basic cluster name. - Basic: - - ProductAppearanceStruct - enums: - # The ProductAppearance bits never happend for the old Basic cluster name. - Basic: - - ProductFinishEnum - - ColorEnum enum values: DoorLock: DlLockDataType: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index eb93f53a327e63..568ea996ca72d5 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -2307,23 +2307,6 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value.subscriptionsPerFabric = [NSNumber numberWithUnsignedShort:cppValue.subscriptionsPerFabric]; return value; } - case Attributes::ProductAppearance::Id: { - using TypeInfo = Attributes::ProductAppearance::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) { - return nil; - } - MTRBasicInformationClusterProductAppearanceStruct * _Nonnull value; - value = [MTRBasicInformationClusterProductAppearanceStruct new]; - value.finish = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.finish)]; - if (cppValue.primaryColor.IsNull()) { - value.primaryColor = nil; - } else { - value.primaryColor = [NSNumber numberWithUnsignedChar:chip::to_underlying(cppValue.primaryColor.Value())]; - } - return value; - } case Attributes::GeneratedCommandList::Id: { using TypeInfo = Attributes::GeneratedCommandList::TypeInfo; TypeInfo::DecodableType cppValue; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index d2cc27b5095f2a..eca788035a6645 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -2400,19 +2400,6 @@ API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); -- (void)readAttributeProductAppearanceWithCompletion:(void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, - NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; -- (void)subscribeAttributeProductAppearanceWithParams:(MTRSubscribeParams *)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, - NSError * _Nullable error))reportHandler MTR_NEWLY_AVAILABLE; -+ (void)readAttributeProductAppearanceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completion: - (void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, - NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params @@ -18988,39 +18975,6 @@ typedef NS_OPTIONS(uint16_t, MTRActionsCommandBits) { MTRActionsCommandBitsDisableActionWithDuration API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x800, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -typedef NS_ENUM(uint8_t, MTRBasicInformationColor) { - MTRBasicInformationColorBlack MTR_NEWLY_AVAILABLE = 0x00, - MTRBasicInformationColorNavy MTR_NEWLY_AVAILABLE = 0x01, - MTRBasicInformationColorGreen MTR_NEWLY_AVAILABLE = 0x02, - MTRBasicInformationColorTeal MTR_NEWLY_AVAILABLE = 0x03, - MTRBasicInformationColorMaroon MTR_NEWLY_AVAILABLE = 0x04, - MTRBasicInformationColorPurple MTR_NEWLY_AVAILABLE = 0x05, - MTRBasicInformationColorOlive MTR_NEWLY_AVAILABLE = 0x06, - MTRBasicInformationColorGray MTR_NEWLY_AVAILABLE = 0x07, - MTRBasicInformationColorBlue MTR_NEWLY_AVAILABLE = 0x08, - MTRBasicInformationColorLime MTR_NEWLY_AVAILABLE = 0x09, - MTRBasicInformationColorAqua MTR_NEWLY_AVAILABLE = 0x0A, - MTRBasicInformationColorRed MTR_NEWLY_AVAILABLE = 0x0B, - MTRBasicInformationColorFuchsia MTR_NEWLY_AVAILABLE = 0x0C, - MTRBasicInformationColorYellow MTR_NEWLY_AVAILABLE = 0x0D, - MTRBasicInformationColorWhite MTR_NEWLY_AVAILABLE = 0x0E, - MTRBasicInformationColorNickel MTR_NEWLY_AVAILABLE = 0x0F, - MTRBasicInformationColorChrome MTR_NEWLY_AVAILABLE = 0x10, - MTRBasicInformationColorBrass MTR_NEWLY_AVAILABLE = 0x11, - MTRBasicInformationColorCopper MTR_NEWLY_AVAILABLE = 0x12, - MTRBasicInformationColorSilver MTR_NEWLY_AVAILABLE = 0x13, - MTRBasicInformationColorGold MTR_NEWLY_AVAILABLE = 0x14, -} MTR_NEWLY_AVAILABLE; - -typedef NS_ENUM(uint8_t, MTRBasicInformationProductFinish) { - MTRBasicInformationProductFinishMatte MTR_NEWLY_AVAILABLE = 0x00, - MTRBasicInformationProductFinishSatin MTR_NEWLY_AVAILABLE = 0x01, - MTRBasicInformationProductFinishPolished MTR_NEWLY_AVAILABLE = 0x02, - MTRBasicInformationProductFinishRugged MTR_NEWLY_AVAILABLE = 0x03, - MTRBasicInformationProductFinishFabric MTR_NEWLY_AVAILABLE = 0x04, - MTRBasicInformationProductFinishOther MTR_NEWLY_AVAILABLE = 0xFF, -} MTR_NEWLY_AVAILABLE; - typedef NS_ENUM(uint8_t, MTROTASoftwareUpdateProviderOTAApplyUpdateAction) { MTROTASoftwareUpdateProviderOTAApplyUpdateActionProceed API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00, MTROTASoftwareUpdateProviderOTAApplyUpdateActionAwaitNextAction API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index c8852ad44e027c..86a9e2d3c69d75 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -14127,54 +14127,6 @@ + (void)readAttributeCapabilityMinimaWithClusterStateCache:(MTRClusterStateCache }); } -- (void)readAttributeProductAppearanceWithCompletion:(void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, - NSError * _Nullable error))completion -{ - MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = BasicInformation::Attributes::ProductAppearance::TypeInfo; - return MTRReadAttribute( - params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); -} - -- (void)subscribeAttributeProductAppearanceWithParams:(MTRSubscribeParams * _Nonnull)params - subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished - reportHandler:(void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, - NSError * _Nullable error))reportHandler -{ - using TypeInfo = BasicInformation::Attributes::ProductAppearance::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, - self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); -} - -+ (void)readAttributeProductAppearanceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completion: - (void (^)(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, - NSError * _Nullable error))completion -{ - auto * bridge = new MTRBasicInformationProductAppearanceStructAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(BasicInformationProductAppearanceStructAttributeCallback successCb, MTRErrorCallback failureCb) { - if (clusterStateCacheContainer.cppClusterStateCache) { - chip::app::ConcreteAttributePath path; - using TypeInfo = BasicInformation::Attributes::ProductAppearance::TypeInfo; - path.mEndpointId = static_cast([endpoint unsignedShortValue]); - path.mClusterId = TypeInfo::GetClusterId(); - path.mAttributeId = TypeInfo::GetAttributeId(); - TypeInfo::DecodableType value; - CHIP_ERROR err = clusterStateCacheContainer.cppClusterStateCache->Get(path, value); - if (err == CHIP_NO_ERROR) { - successCb(bridge, value); - } - return err; - } - return CHIP_ERROR_NOT_FOUND; - }); -} - - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 8b1077077e0f4d..f3a7deead776d0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -191,13 +191,6 @@ typedef void (*NullableActionsClusterActionTypeEnumAttributeCallback)( typedef void (*ActionsClusterEndpointListTypeEnumAttributeCallback)(void *, chip::app::Clusters::Actions::EndpointListTypeEnum); typedef void (*NullableActionsClusterEndpointListTypeEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*BasicInformationClusterColorEnumAttributeCallback)(void *, chip::app::Clusters::BasicInformation::ColorEnum); -typedef void (*NullableBasicInformationClusterColorEnumAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*BasicInformationClusterProductFinishEnumAttributeCallback)(void *, - chip::app::Clusters::BasicInformation::ProductFinishEnum); -typedef void (*NullableBasicInformationClusterProductFinishEnumAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); typedef void (*OTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallback)( void *, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction); typedef void (*NullableOTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallback)( @@ -651,8 +644,6 @@ typedef void (*ActionsAttributeListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*BasicInformationCapabilityMinimaStructAttributeCallback)( void *, const chip::app::Clusters::BasicInformation::Structs::CapabilityMinimaStruct::DecodableType &); -typedef void (*BasicInformationProductAppearanceStructAttributeCallback)( - void *, const chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType &); typedef void (*BasicInformationGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*BasicInformationAcceptedCommandListListAttributeCallback)( @@ -3398,40 +3389,6 @@ class MTRBasicInformationCapabilityMinimaStructAttributeCallbackSubscriptionBrid MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRBasicInformationProductAppearanceStructAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRBasicInformationProductAppearanceStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRBasicInformationProductAppearanceStructAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType & value); -}; - -class MTRBasicInformationProductAppearanceStructAttributeCallbackSubscriptionBridge - : public MTRBasicInformationProductAppearanceStructAttributeCallbackBridge -{ -public: - MTRBasicInformationProductAppearanceStructAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRBasicInformationProductAppearanceStructAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRBasicInformationProductAppearanceStructAttributeCallbackBridge::KeepAliveOnCallback; - using MTRBasicInformationProductAppearanceStructAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - class MTRBasicInformationGeneratedCommandListListAttributeCallbackBridge : public MTRCallbackBridge { @@ -12854,140 +12811,6 @@ class MTRNullableActionsClusterEndpointListTypeEnumAttributeCallbackSubscription MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRBasicInformationClusterColorEnumAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRBasicInformationClusterColorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRBasicInformationClusterColorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::BasicInformation::ColorEnum value); -}; - -class MTRBasicInformationClusterColorEnumAttributeCallbackSubscriptionBridge - : public MTRBasicInformationClusterColorEnumAttributeCallbackBridge -{ -public: - MTRBasicInformationClusterColorEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRBasicInformationClusterColorEnumAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRBasicInformationClusterColorEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTRBasicInformationClusterColorEnumAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableBasicInformationClusterColorEnumAttributeCallbackSubscriptionBridge - : public MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge -{ -public: - MTRNullableBasicInformationClusterColorEnumAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, chip::app::Clusters::BasicInformation::ProductFinishEnum value); -}; - -class MTRBasicInformationClusterProductFinishEnumAttributeCallbackSubscriptionBridge - : public MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge -{ -public: - MTRBasicInformationClusterProductFinishEnumAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - -class MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge - : public MTRCallbackBridge -{ -public: - MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; - - MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); -}; - -class MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackSubscriptionBridge - : public MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge -{ -public: - MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackSubscriptionBridge( - dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge(queue, handler, action), - mEstablishedHandler(establishedHandler) - {} - - void OnSubscriptionEstablished(); - using MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge::OnDone; - -private: - MTRSubscriptionEstablishedHandler mEstablishedHandler; -}; - class MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge : public MTRCallbackBridge { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 3646451475a1d2..2dd1e11290d64c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -2461,35 +2461,6 @@ } } -void MTRBasicInformationProductAppearanceStructAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType & value) -{ - MTRBasicInformationClusterProductAppearanceStruct * _Nonnull objCValue; - objCValue = [MTRBasicInformationClusterProductAppearanceStruct new]; - objCValue.finish = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.finish)]; - if (value.primaryColor.IsNull()) { - objCValue.primaryColor = nil; - } else { - objCValue.primaryColor = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.primaryColor.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRBasicInformationProductAppearanceStructAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - void MTRBasicInformationGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { @@ -13948,106 +13919,6 @@ } } -void MTRBasicInformationClusterColorEnumAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::BasicInformation::ColorEnum value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRBasicInformationClusterColorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRNullableBasicInformationClusterColorEnumAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableBasicInformationClusterColorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRBasicInformationClusterProductFinishEnumAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::BasicInformation::ProductFinishEnum value) -{ - NSNumber * _Nonnull objCValue; - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; - DispatchSuccess(context, objCValue); -}; - -void MTRBasicInformationClusterProductFinishEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - -void MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) -{ - NSNumber * _Nullable objCValue; - if (value.IsNull()) { - objCValue = nil; - } else { - objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value.Value())]; - } - DispatchSuccess(context, objCValue); -}; - -void MTRNullableBasicInformationClusterProductFinishEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() -{ - if (!mQueue) { - return; - } - - if (mEstablishedHandler != nil) { - dispatch_async(mQueue, mEstablishedHandler); - // On failure, mEstablishedHandler will be cleaned up by our destructor, - // but we can clean it up earlier on successful subscription - // establishment. - mEstablishedHandler = nil; - } -} - void MTROTASoftwareUpdateProviderClusterOTAApplyUpdateActionAttributeCallbackBridge::OnSuccessFn( void * context, chip::app::Clusters::OtaSoftwareUpdateProvider::OTAApplyUpdateAction value) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index fa0f8589305d43..51c82c20020b44 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -1194,7 +1194,6 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterBasicInformationAttributeCapabilityMinimaID API_AVAILABLE( ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000013, - MTRAttributeIDTypeClusterBasicInformationAttributeProductAppearanceID MTR_NEWLY_AVAILABLE = 0x00000014, MTRAttributeIDTypeClusterBasicInformationAttributeGeneratedCommandListID API_AVAILABLE( ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 1f9dbd8807decf..9d1d401fe294aa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -1013,8 +1013,6 @@ API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) - (NSDictionary *)readAttributeCapabilityMinimaWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); -- (NSDictionary *)readAttributeProductAppearanceWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; - - (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 99984b06930d0b..f87fef144fa28e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -5916,14 +5916,6 @@ - (void)writeAttributeLocalConfigDisabledWithValue:(NSDictionary params:params]; } -- (NSDictionary *)readAttributeProductAppearanceWithParams:(MTRReadParams * _Nullable)params -{ - return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeBasicInformationID) - attributeID:@(MTRAttributeIDTypeClusterBasicInformationAttributeProductAppearanceID) - params:params]; -} - - (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 9c7a17100bd0d4..0427a0fa659114 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -155,11 +155,6 @@ MTR_DEPRECATED("Please use MTRBasicInformationClusterCapabilityMinimaStruct", io tvos(16.1, 16.4)) @interface MTRBasicClusterCapabilityMinimaStruct : MTRBasicInformationClusterCapabilityMinimaStruct @end -MTR_NEWLY_AVAILABLE -@interface MTRBasicInformationClusterProductAppearanceStruct : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull finish MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nullable primaryColor MTR_NEWLY_AVAILABLE; -@end API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) @interface MTRBasicInformationClusterStartUpEvent : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 7a2f09fd44e9fd..f1022f235eaede 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -565,37 +565,6 @@ - (NSString *)description @implementation MTRBasicClusterCapabilityMinimaStruct : MTRBasicInformationClusterCapabilityMinimaStruct @end -@implementation MTRBasicInformationClusterProductAppearanceStruct -- (instancetype)init -{ - if (self = [super init]) { - - _finish = @(0); - - _primaryColor = nil; - } - return self; -} - -- (id)copyWithZone:(NSZone * _Nullable)zone -{ - auto other = [[MTRBasicInformationClusterProductAppearanceStruct alloc] init]; - - other.finish = self.finish; - other.primaryColor = self.primaryColor; - - return other; -} - -- (NSString *)description -{ - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: finish:%@; primaryColor:%@; >", NSStringFromClass([self class]), _finish, _primaryColor]; - return descriptionString; -} - -@end - @implementation MTRBasicInformationClusterStartUpEvent - (instancetype)init { diff --git a/src/include/platform/DeviceInstanceInfoProvider.h b/src/include/platform/DeviceInstanceInfoProvider.h index c072df6b55a999..16e431ae432fff 100644 --- a/src/include/platform/DeviceInstanceInfoProvider.h +++ b/src/include/platform/DeviceInstanceInfoProvider.h @@ -17,7 +17,6 @@ #pragma once #include -#include #include namespace chip { @@ -170,30 +169,6 @@ class DeviceInstanceInfoProvider * if access fails. */ virtual CHIP_ERROR GetRotatingDeviceIdUniqueId(MutableByteSpan & uniqueIdSpan) = 0; - - /** - * @brief Obtain the product's finish from the device's factory data. - * - * If the product finish is not available, this should return - * CHIP_ERROR_NOT_IMPLEMENTED, and the Basic Information ProductAppearance attribute should - * not be implemented for the device. - */ - virtual CHIP_ERROR GetProductFinish(app::Clusters::BasicInformation::ProductFinishEnum * finish) - { - return CHIP_ERROR_NOT_IMPLEMENTED; - } - - /** - * @brief Obtain the product's primary color from the device's factory data. - * - * If the primary color finish is not available or does not exist (e.g. the - * device wants to return null for the color in the Basic Information - * ProductAppearance attribute), this should return CHIP_ERROR_NOT_IMPLEMENTED. - */ - virtual CHIP_ERROR GetProductPrimaryColor(app::Clusters::BasicInformation::ColorEnum * primaryColor) - { - return CHIP_ERROR_NOT_IMPLEMENTED; - } }; /** 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 deleted file mode 100644 index 6035aac8b4b0b0..00000000000000 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ /dev/null @@ -1,1239 +0,0 @@ -/* - * - * Copyright (c) 2022 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -// THIS FILE IS GENERATED BY ZAP - -// Prevent multiple inclusion -#pragma once - -// Global cluster attribute ids -#define ZCL_GENERATED_COMMAND_LIST_ATTRIBUTE_ID (0xFFF8) -#define ZCL_ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID (0xFFF9) -#define ZCL_ATTRIBUTE_LIST_SERVER_ATTRIBUTE_ID (0xFFFB) -#define ZCL_FEATURE_MAP_CLIENT_ATTRIBUTE_ID (0xFFFC) -#define ZCL_FEATURE_MAP_SERVER_ATTRIBUTE_ID (0xFFFC) -#define ZCL_CLUSTER_REVISION_CLIENT_ATTRIBUTE_ID (0xFFFD) -#define ZCL_CLUSTER_REVISION_SERVER_ATTRIBUTE_ID (0xFFFD) - -// Attribute ids for cluster: Identify - -// Client attributes - -// Server attributes -#define ZCL_IDENTIFY_TIME_ATTRIBUTE_ID (0x0000) -#define ZCL_IDENTIFY_TYPE_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Groups - -// Client attributes - -// Server attributes -#define ZCL_GROUP_NAME_SUPPORT_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Scenes - -// Client attributes - -// Server attributes -#define ZCL_SCENE_COUNT_ATTRIBUTE_ID (0x0000) -#define ZCL_CURRENT_SCENE_ATTRIBUTE_ID (0x0001) -#define ZCL_CURRENT_GROUP_ATTRIBUTE_ID (0x0002) -#define ZCL_SCENE_VALID_ATTRIBUTE_ID (0x0003) -#define ZCL_SCENE_NAME_SUPPORT_ATTRIBUTE_ID (0x0004) -#define ZCL_LAST_CONFIGURED_BY_ATTRIBUTE_ID (0x0005) - -// Attribute ids for cluster: On/Off - -// Client attributes - -// Server attributes -#define ZCL_ON_OFF_ATTRIBUTE_ID (0x0000) -#define ZCL_GLOBAL_SCENE_CONTROL_ATTRIBUTE_ID (0x4000) -#define ZCL_ON_TIME_ATTRIBUTE_ID (0x4001) -#define ZCL_OFF_WAIT_TIME_ATTRIBUTE_ID (0x4002) -#define ZCL_START_UP_ON_OFF_ATTRIBUTE_ID (0x4003) - -// Attribute ids for cluster: On/off Switch Configuration - -// Client attributes - -// Server attributes -#define ZCL_SWITCH_TYPE_ATTRIBUTE_ID (0x0000) -#define ZCL_SWITCH_ACTIONS_ATTRIBUTE_ID (0x0010) - -// Attribute ids for cluster: Level Control - -// Client attributes - -// Server attributes -#define ZCL_CURRENT_LEVEL_ATTRIBUTE_ID (0x0000) -#define ZCL_LEVEL_CONTROL_REMAINING_TIME_ATTRIBUTE_ID (0x0001) -#define ZCL_MINIMUM_LEVEL_ATTRIBUTE_ID (0x0002) -#define ZCL_MAXIMUM_LEVEL_ATTRIBUTE_ID (0x0003) -#define ZCL_CURRENT_FREQUENCY_ATTRIBUTE_ID (0x0004) -#define ZCL_MIN_FREQUENCY_ATTRIBUTE_ID (0x0005) -#define ZCL_MAX_FREQUENCY_ATTRIBUTE_ID (0x0006) -#define ZCL_OPTIONS_ATTRIBUTE_ID (0x000F) -#define ZCL_ON_OFF_TRANSITION_TIME_ATTRIBUTE_ID (0x0010) -#define ZCL_ON_LEVEL_ATTRIBUTE_ID (0x0011) -#define ZCL_ON_TRANSITION_TIME_ATTRIBUTE_ID (0x0012) -#define ZCL_OFF_TRANSITION_TIME_ATTRIBUTE_ID (0x0013) -#define ZCL_DEFAULT_MOVE_RATE_ATTRIBUTE_ID (0x0014) -#define ZCL_START_UP_CURRENT_LEVEL_ATTRIBUTE_ID (0x4000) - -// Attribute ids for cluster: Binary Input (Basic) - -// Client attributes - -// Server attributes -#define ZCL_ACTIVE_TEXT_ATTRIBUTE_ID (0x0004) -#define ZCL_DESCRIPTION_ATTRIBUTE_ID (0x001C) -#define ZCL_INACTIVE_TEXT_ATTRIBUTE_ID (0x002E) -#define ZCL_OUT_OF_SERVICE_ATTRIBUTE_ID (0x0051) -#define ZCL_POLARITY_ATTRIBUTE_ID (0x0054) -#define ZCL_PRESENT_VALUE_ATTRIBUTE_ID (0x0055) -#define ZCL_RELIABILITY_ATTRIBUTE_ID (0x0067) -#define ZCL_STATUS_FLAGS_ATTRIBUTE_ID (0x006F) -#define ZCL_APPLICATION_TYPE_ATTRIBUTE_ID (0x0100) - -// Attribute ids for cluster: Pulse Width Modulation - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Descriptor - -// Client attributes - -// Server attributes -#define ZCL_DEVICE_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_SERVER_LIST_ATTRIBUTE_ID (0x0001) -#define ZCL_CLIENT_LIST_ATTRIBUTE_ID (0x0002) -#define ZCL_PARTS_LIST_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Binding - -// Client attributes - -// Server attributes -#define ZCL_BINDING_LIST_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Access Control - -// Client attributes - -// Server attributes -#define ZCL_ACL_ATTRIBUTE_ID (0x0000) -#define ZCL_EXTENSION_ATTRIBUTE_ID (0x0001) -#define ZCL_SUBJECTS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID (0x0002) -#define ZCL_TARGETS_PER_ACCESS_CONTROL_ENTRY_ATTRIBUTE_ID (0x0003) -#define ZCL_ACCESS_CONTROL_ENTRIES_PER_FABRIC_ATTRIBUTE_ID (0x0004) - -// Attribute ids for cluster: Actions - -// Client attributes - -// Server attributes -#define ZCL_ACTION_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_ENDPOINT_LIST_ATTRIBUTE_ID (0x0001) -#define ZCL_SETUP_URL_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Basic Information - -// Client attributes - -// Server attributes -#define ZCL_DATA_MODEL_REVISION_ATTRIBUTE_ID (0x0000) -#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0001) -#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0002) -#define ZCL_PRODUCT_NAME_ATTRIBUTE_ID (0x0003) -#define ZCL_PRODUCT_ID_ATTRIBUTE_ID (0x0004) -#define ZCL_NODE_LABEL_ATTRIBUTE_ID (0x0005) -#define ZCL_LOCATION_ATTRIBUTE_ID (0x0006) -#define ZCL_HARDWARE_VERSION_ATTRIBUTE_ID (0x0007) -#define ZCL_HARDWARE_VERSION_STRING_ATTRIBUTE_ID (0x0008) -#define ZCL_SOFTWARE_VERSION_ATTRIBUTE_ID (0x0009) -#define ZCL_SOFTWARE_VERSION_STRING_ATTRIBUTE_ID (0x000A) -#define ZCL_MANUFACTURING_DATE_ATTRIBUTE_ID (0x000B) -#define ZCL_PART_NUMBER_ATTRIBUTE_ID (0x000C) -#define ZCL_PRODUCT_URL_ATTRIBUTE_ID (0x000D) -#define ZCL_PRODUCT_LABEL_ATTRIBUTE_ID (0x000E) -#define ZCL_SERIAL_NUMBER_ATTRIBUTE_ID (0x000F) -#define ZCL_LOCAL_CONFIG_DISABLED_ATTRIBUTE_ID (0x0010) -#define ZCL_REACHABLE_ATTRIBUTE_ID (0x0011) -#define ZCL_UNIQUE_ID_ATTRIBUTE_ID (0x0012) -#define ZCL_CAPABILITY_MINIMA_ATTRIBUTE_ID (0x0013) -#define ZCL_PRODUCT_APPEARANCE_ATTRIBUTE_ID (0x0014) - -// Attribute ids for cluster: OTA Software Update Provider - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: OTA Software Update Requestor - -// Client attributes - -// Server attributes -#define ZCL_DEFAULT_OTA_PROVIDERS_ATTRIBUTE_ID (0x0000) -#define ZCL_UPDATE_POSSIBLE_ATTRIBUTE_ID (0x0001) -#define ZCL_UPDATE_STATE_ATTRIBUTE_ID (0x0002) -#define ZCL_UPDATE_STATE_PROGRESS_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Localization Configuration - -// Client attributes - -// Server attributes -#define ZCL_ACTIVE_LOCALE_ATTRIBUTE_ID (0x0000) -#define ZCL_SUPPORTED_LOCALES_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Time Format Localization - -// Client attributes - -// Server attributes -#define ZCL_HOUR_FORMAT_ATTRIBUTE_ID (0x0000) -#define ZCL_ACTIVE_CALENDAR_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_SUPPORTED_CALENDAR_TYPES_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Unit Localization - -// Client attributes - -// Server attributes -#define ZCL_TEMPERATURE_UNIT_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Power Source Configuration - -// Client attributes - -// Server attributes -#define ZCL_SOURCES_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Power Source - -// Client attributes - -// Server attributes -#define ZCL_POWER_SOURCE_STATUS_ATTRIBUTE_ID (0x0000) -#define ZCL_POWER_SOURCE_ORDER_ATTRIBUTE_ID (0x0001) -#define ZCL_POWER_SOURCE_DESCRIPTION_ATTRIBUTE_ID (0x0002) -#define ZCL_POWER_SOURCE_WIRED_ASSESSED_INPUT_VOLTAGE_ATTRIBUTE_ID (0x0003) -#define ZCL_POWER_SOURCE_WIRED_ASSESSED_INPUT_FREQUENCY_ATTRIBUTE_ID (0x0004) -#define ZCL_POWER_SOURCE_WIRED_CURRENT_TYPE_ATTRIBUTE_ID (0x0005) -#define ZCL_POWER_SOURCE_WIRED_ASSESSED_CURRENT_ATTRIBUTE_ID (0x0006) -#define ZCL_POWER_SOURCE_WIRED_NOMINAL_VOLTAGE_ATTRIBUTE_ID (0x0007) -#define ZCL_POWER_SOURCE_WIRED_MAXIMUM_CURRENT_ATTRIBUTE_ID (0x0008) -#define ZCL_POWER_SOURCE_WIRED_PRESENT_ATTRIBUTE_ID (0x0009) -#define ZCL_POWER_SOURCE_ACTIVE_WIRED_FAULTS_ATTRIBUTE_ID (0x000A) -#define ZCL_POWER_SOURCE_BAT_VOLTAGE_ATTRIBUTE_ID (0x000B) -#define ZCL_POWER_SOURCE_BAT_PERCENT_REMAINING_ATTRIBUTE_ID (0x000C) -#define ZCL_POWER_SOURCE_BAT_TIME_REMAINING_ATTRIBUTE_ID (0x000D) -#define ZCL_POWER_SOURCE_BAT_CHARGE_LEVEL_ATTRIBUTE_ID (0x000E) -#define ZCL_POWER_SOURCE_BAT_REPLACEMENT_NEEDED_ATTRIBUTE_ID (0x000F) -#define ZCL_POWER_SOURCE_BAT_REPLACEABILITY_ATTRIBUTE_ID (0x0010) -#define ZCL_POWER_SOURCE_BAT_PRESENT_ATTRIBUTE_ID (0x0011) -#define ZCL_POWER_SOURCE_ACTIVE_BAT_FAULTS_ATTRIBUTE_ID (0x0012) -#define ZCL_POWER_SOURCE_BAT_REPLACEMENT_DESCRIPTION_ATTRIBUTE_ID (0x0013) -#define ZCL_POWER_SOURCE_BAT_COMMON_DESIGNATION_ATTRIBUTE_ID (0x0014) -#define ZCL_POWER_SOURCE_BAT_ANSI_DESIGNATION_ATTRIBUTE_ID (0x0015) -#define ZCL_POWER_SOURCE_BAT_IEC_DESIGNATION_ATTRIBUTE_ID (0x0016) -#define ZCL_POWER_SOURCE_BAT_APPROVED_CHEMISTRY_ATTRIBUTE_ID (0x0017) -#define ZCL_POWER_SOURCE_BAT_CAPACITY_ATTRIBUTE_ID (0x0018) -#define ZCL_POWER_SOURCE_BAT_QUANTITY_ATTRIBUTE_ID (0x0019) -#define ZCL_POWER_SOURCE_BAT_CHARGE_STATE_ATTRIBUTE_ID (0x001A) -#define ZCL_POWER_SOURCE_BAT_TIME_TO_FULL_CHARGE_ATTRIBUTE_ID (0x001B) -#define ZCL_POWER_SOURCE_BAT_FUNCTIONAL_WHILE_CHARGING_ATTRIBUTE_ID (0x001C) -#define ZCL_POWER_SOURCE_BAT_CHARGING_CURRENT_ATTRIBUTE_ID (0x001D) -#define ZCL_POWER_SOURCE_ACTIVE_BAT_CHARGE_FAULTS_ATTRIBUTE_ID (0x001E) - -// Attribute ids for cluster: General Commissioning - -// Client attributes - -// Server attributes -#define ZCL_BREADCRUMB_ATTRIBUTE_ID (0x0000) -#define ZCL_BASIC_COMMISSIONING_INFO_ATTRIBUTE_ID (0x0001) -#define ZCL_REGULATORY_CONFIG_ATTRIBUTE_ID (0x0002) -#define ZCL_LOCATION_CAPABILITY_ATTRIBUTE_ID (0x0003) -#define ZCL_SUPPORTS_CONCURRENT_CONNECTION_ATTRIBUTE_ID (0x0004) - -// Attribute ids for cluster: Network Commissioning - -// Client attributes - -// Server attributes -#define ZCL_MAX_NETWORKS_ATTRIBUTE_ID (0x0000) -#define ZCL_NETWORKS_ATTRIBUTE_ID (0x0001) -#define ZCL_SCAN_MAX_TIME_SECONDS_ATTRIBUTE_ID (0x0002) -#define ZCL_CONNECT_MAX_TIME_SECONDS_ATTRIBUTE_ID (0x0003) -#define ZCL_INTERFACE_ENABLED_ATTRIBUTE_ID (0x0004) -#define ZCL_LAST_NETWORKING_STATUS_ATTRIBUTE_ID (0x0005) -#define ZCL_LAST_NETWORK_ID_ATTRIBUTE_ID (0x0006) -#define ZCL_LAST_CONNECT_ERROR_VALUE_ATTRIBUTE_ID (0x0007) - -// Attribute ids for cluster: Diagnostic Logs - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: General Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_NETWORK_INTERFACES_ATTRIBUTE_ID (0x0000) -#define ZCL_REBOOT_COUNT_ATTRIBUTE_ID (0x0001) -#define ZCL_UP_TIME_ATTRIBUTE_ID (0x0002) -#define ZCL_TOTAL_OPERATIONAL_HOURS_ATTRIBUTE_ID (0x0003) -#define ZCL_BOOT_REASONS_ATTRIBUTE_ID (0x0004) -#define ZCL_ACTIVE_HARDWARE_FAULTS_ATTRIBUTE_ID (0x0005) -#define ZCL_ACTIVE_RADIO_FAULTS_ATTRIBUTE_ID (0x0006) -#define ZCL_ACTIVE_NETWORK_FAULTS_ATTRIBUTE_ID (0x0007) -#define ZCL_TEST_EVENT_TRIGGERS_ENABLED_ATTRIBUTE_ID (0x0008) - -// Attribute ids for cluster: Software Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_THREAD_METRICS_ATTRIBUTE_ID (0x0000) -#define ZCL_CURRENT_HEAP_FREE_ATTRIBUTE_ID (0x0001) -#define ZCL_CURRENT_HEAP_USED_ATTRIBUTE_ID (0x0002) -#define ZCL_CURRENT_HEAP_HIGH_WATERMARK_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Thread Network Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_CHANNEL_ATTRIBUTE_ID (0x0000) -#define ZCL_ROUTING_ROLE_ATTRIBUTE_ID (0x0001) -#define ZCL_NETWORK_NAME_ATTRIBUTE_ID (0x0002) -#define ZCL_DIAG_PAN_ID_ATTRIBUTE_ID (0x0003) -#define ZCL_DIAG_EXTENDED_PAN_ID_ATTRIBUTE_ID (0x0004) -#define ZCL_MESH_LOCAL_PREFIX_ATTRIBUTE_ID (0x0005) -#define ZCL_DIAG_OVERRUN_COUNT_ATTRIBUTE_ID (0x0006) -#define ZCL_NEIGHBOR_TABLE_ATTRIBUTE_ID (0x0007) -#define ZCL_ROUTE_TABLE_ATTRIBUTE_ID (0x0008) -#define ZCL_PARTITION_ID_ATTRIBUTE_ID (0x0009) -#define ZCL_WEIGHTING_ATTRIBUTE_ID (0x000A) -#define ZCL_DATA_VERSION_ATTRIBUTE_ID (0x000B) -#define ZCL_STABLE_DATA_VERSION_ATTRIBUTE_ID (0x000C) -#define ZCL_LEADER_ROUTER_ID_ATTRIBUTE_ID (0x000D) -#define ZCL_DETACHED_ROLE_COUNT_ATTRIBUTE_ID (0x000E) -#define ZCL_CHILD_ROLE_COUNT_ATTRIBUTE_ID (0x000F) -#define ZCL_ROUTER_ROLE_COUNT_ATTRIBUTE_ID (0x0010) -#define ZCL_LEADER_ROLE_COUNT_ATTRIBUTE_ID (0x0011) -#define ZCL_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID (0x0012) -#define ZCL_PARTITION_ID_CHANGE_COUNT_ATTRIBUTE_ID (0x0013) -#define ZCL_BETTER_PARTITION_ATTACH_ATTEMPT_COUNT_ATTRIBUTE_ID (0x0014) -#define ZCL_PARENT_CHANGE_COUNT_ATTRIBUTE_ID (0x0015) -#define ZCL_TX_TOTAL_COUNT_ATTRIBUTE_ID (0x0016) -#define ZCL_TX_UNICAST_COUNT_ATTRIBUTE_ID (0x0017) -#define ZCL_TX_BROADCAST_COUNT_ATTRIBUTE_ID (0x0018) -#define ZCL_TX_ACK_REQUESTED_COUNT_ATTRIBUTE_ID (0x0019) -#define ZCL_TX_ACKED_COUNT_ATTRIBUTE_ID (0x001A) -#define ZCL_TX_NO_ACK_REQUESTED_COUNT_ATTRIBUTE_ID (0x001B) -#define ZCL_TX_DATA_COUNT_ATTRIBUTE_ID (0x001C) -#define ZCL_TX_DATA_POLL_COUNT_ATTRIBUTE_ID (0x001D) -#define ZCL_TX_BEACON_COUNT_ATTRIBUTE_ID (0x001E) -#define ZCL_TX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID (0x001F) -#define ZCL_TX_OTHER_COUNT_ATTRIBUTE_ID (0x0020) -#define ZCL_TX_RETRY_COUNT_ATTRIBUTE_ID (0x0021) -#define ZCL_TX_DIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID (0x0022) -#define ZCL_TX_INDIRECT_MAX_RETRY_EXPIRY_COUNT_ATTRIBUTE_ID (0x0023) -#define ZCL_TX_ERR_CCA_COUNT_ATTRIBUTE_ID (0x0024) -#define ZCL_TX_ERR_ABORT_COUNT_ATTRIBUTE_ID (0x0025) -#define ZCL_TX_ERR_BUSY_CHANNEL_COUNT_ATTRIBUTE_ID (0x0026) -#define ZCL_RX_TOTAL_COUNT_ATTRIBUTE_ID (0x0027) -#define ZCL_RX_UNICAST_COUNT_ATTRIBUTE_ID (0x0028) -#define ZCL_RX_BROADCAST_COUNT_ATTRIBUTE_ID (0x0029) -#define ZCL_RX_DATA_COUNT_ATTRIBUTE_ID (0x002A) -#define ZCL_RX_DATA_POLL_COUNT_ATTRIBUTE_ID (0x002B) -#define ZCL_RX_BEACON_COUNT_ATTRIBUTE_ID (0x002C) -#define ZCL_RX_BEACON_REQUEST_COUNT_ATTRIBUTE_ID (0x002D) -#define ZCL_RX_OTHER_COUNT_ATTRIBUTE_ID (0x002E) -#define ZCL_RX_ADDRESS_FILTERED_COUNT_ATTRIBUTE_ID (0x002F) -#define ZCL_RX_DESTADDR_FILTERED_COUNT_ATTRIBUTE_ID (0x0030) -#define ZCL_RX_DUPLICATED_COUNT_ATTRIBUTE_ID (0x0031) -#define ZCL_RX_ERR_NO_FRAME_COUNT_ATTRIBUTE_ID (0x0032) -#define ZCL_RX_ERR_UNKNOWN_NEIGHBOR_COUNT_ATTRIBUTE_ID (0x0033) -#define ZCL_RX_ERR_INVALID_SRC_ADDR_COUNT_ATTRIBUTE_ID (0x0034) -#define ZCL_RX_ERR_SEC_COUNT_ATTRIBUTE_ID (0x0035) -#define ZCL_RX_ERR_FCS_COUNT_ATTRIBUTE_ID (0x0036) -#define ZCL_RX_ERR_OTHER_COUNT_ATTRIBUTE_ID (0x0037) -#define ZCL_ACTIVE_TIMESTAMP_ATTRIBUTE_ID (0x0038) -#define ZCL_PENDING_TIMESTAMP_ATTRIBUTE_ID (0x0039) -#define ZCL_DELAY_ATTRIBUTE_ID (0x003A) -#define ZCL_SECURITY_POLICY_ATTRIBUTE_ID (0x003B) -#define ZCL_DIAG_CHANNEL_MASK_ATTRIBUTE_ID (0x003C) -#define ZCL_OPERATIONAL_DATASET_COMPONENTS_ATTRIBUTE_ID (0x003D) -#define ZCL_ACTIVE_THREAD_NETWORK_FAULTS_ATTRIBUTE_ID (0x003E) - -// Attribute ids for cluster: WiFi Network Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_BSSID_ATTRIBUTE_ID (0x0000) -#define ZCL_SECURITY_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_WIFI_VERSION_ATTRIBUTE_ID (0x0002) -#define ZCL_CHANNEL_NUMBER_ATTRIBUTE_ID (0x0003) -#define ZCL_RSSI_ATTRIBUTE_ID (0x0004) -#define ZCL_BEACON_LOST_COUNT_ATTRIBUTE_ID (0x0005) -#define ZCL_BEACON_RX_COUNT_ATTRIBUTE_ID (0x0006) -#define ZCL_PACKET_MULTICAST_RX_COUNT_ATTRIBUTE_ID (0x0007) -#define ZCL_PACKET_MULTICAST_TX_COUNT_ATTRIBUTE_ID (0x0008) -#define ZCL_PACKET_UNICAST_RX_COUNT_ATTRIBUTE_ID (0x0009) -#define ZCL_PACKET_UNICAST_TX_COUNT_ATTRIBUTE_ID (0x000A) -#define ZCL_CURRENT_MAX_RATE_ATTRIBUTE_ID (0x000B) -#define ZCL_OVERRUN_COUNT_ATTRIBUTE_ID (0x000C) - -// Attribute ids for cluster: Ethernet Network Diagnostics - -// Client attributes - -// Server attributes -#define ZCL_PHY_RATE_ATTRIBUTE_ID (0x0000) -#define ZCL_FULL_DUPLEX_ATTRIBUTE_ID (0x0001) -#define ZCL_PACKET_RX_COUNT_ATTRIBUTE_ID (0x0002) -#define ZCL_PACKET_TX_COUNT_ATTRIBUTE_ID (0x0003) -#define ZCL_TX_ERR_COUNT_ATTRIBUTE_ID (0x0004) -#define ZCL_COLLISION_COUNT_ATTRIBUTE_ID (0x0005) -#define ZCL_ETHERNET_OVERRUN_COUNT_ATTRIBUTE_ID (0x0006) -#define ZCL_CARRIER_DETECT_ATTRIBUTE_ID (0x0007) -#define ZCL_TIME_SINCE_RESET_ATTRIBUTE_ID (0x0008) - -// Attribute ids for cluster: Time Synchronization - -// Client attributes - -// Server attributes -#define ZCL_UTC_TIME_ATTRIBUTE_ID (0x0000) -#define ZCL_GRANULARITY_ATTRIBUTE_ID (0x0001) -#define ZCL_TIME_SOURCE_ATTRIBUTE_ID (0x0002) -#define ZCL_TRUSTED_TIME_NODE_ID_ATTRIBUTE_ID (0x0003) -#define ZCL_DEFAULT_NTP_ATTRIBUTE_ID (0x0004) -#define ZCL_TIME_ZONE_ATTRIBUTE_ID (0x0005) -#define ZCL_DST_OFFSET_ATTRIBUTE_ID (0x0006) -#define ZCL_LOCAL_TIME_ATTRIBUTE_ID (0x0007) -#define ZCL_TIME_ZONE_DATABASE_ATTRIBUTE_ID (0x0008) -#define ZCL_NTP_SERVER_PORT_ATTRIBUTE_ID (0x0009) - -// Attribute ids for cluster: Bridged Device Basic Information - -// Client attributes - -// Server attributes -#define ZCL_VENDOR_NAME_ATTRIBUTE_ID (0x0001) -#define ZCL_VENDOR_ID_ATTRIBUTE_ID (0x0002) -#define ZCL_PRODUCT_NAME_ATTRIBUTE_ID (0x0003) -#define ZCL_NODE_LABEL_ATTRIBUTE_ID (0x0005) -#define ZCL_HARDWARE_VERSION_ATTRIBUTE_ID (0x0007) -#define ZCL_HARDWARE_VERSION_STRING_ATTRIBUTE_ID (0x0008) -#define ZCL_SOFTWARE_VERSION_ATTRIBUTE_ID (0x0009) -#define ZCL_SOFTWARE_VERSION_STRING_ATTRIBUTE_ID (0x000A) -#define ZCL_MANUFACTURING_DATE_ATTRIBUTE_ID (0x000B) -#define ZCL_PART_NUMBER_ATTRIBUTE_ID (0x000C) -#define ZCL_PRODUCT_URL_ATTRIBUTE_ID (0x000D) -#define ZCL_PRODUCT_LABEL_ATTRIBUTE_ID (0x000E) -#define ZCL_SERIAL_NUMBER_ATTRIBUTE_ID (0x000F) -#define ZCL_REACHABLE_ATTRIBUTE_ID (0x0011) -#define ZCL_UNIQUE_ID_ATTRIBUTE_ID (0x0012) - -// Attribute ids for cluster: Switch - -// Client attributes - -// Server attributes -#define ZCL_NUMBER_OF_POSITIONS_ATTRIBUTE_ID (0x0000) -#define ZCL_CURRENT_POSITION_ATTRIBUTE_ID (0x0001) -#define ZCL_MULTI_PRESS_MAX_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Administrator Commissioning - -// Client attributes - -// Server attributes -#define ZCL_WINDOW_STATUS_ATTRIBUTE_ID (0x0000) -#define ZCL_ADMIN_FABRIC_INDEX_ATTRIBUTE_ID (0x0001) -#define ZCL_ADMIN_VENDOR_ID_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Operational Credentials - -// Client attributes - -// Server attributes -#define ZCL_NOCS_ATTRIBUTE_ID (0x0000) -#define ZCL_FABRICS_ATTRIBUTE_ID (0x0001) -#define ZCL_SUPPORTED_FABRICS_ATTRIBUTE_ID (0x0002) -#define ZCL_COMMISSIONED_FABRICS_ATTRIBUTE_ID (0x0003) -#define ZCL_TRUSTED_ROOT_CERTIFICATES_ATTRIBUTE_ID (0x0004) -#define ZCL_CURRENT_FABRIC_INDEX_ATTRIBUTE_ID (0x0005) - -// Attribute ids for cluster: Group Key Management - -// Client attributes - -// Server attributes -#define ZCL_GROUP_KEY_MAP_ATTRIBUTE_ID (0x0000) -#define ZCL_GROUP_TABLE_ATTRIBUTE_ID (0x0001) -#define ZCL_MAX_GROUPS_PER_FABRIC_ATTRIBUTE_ID (0x0002) -#define ZCL_MAX_GROUP_KEYS_PER_FABRIC_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Fixed Label - -// Client attributes - -// Server attributes -#define ZCL_LABEL_LIST_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: User Label - -// Client attributes - -// Server attributes -#define ZCL_LABEL_LIST_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Proxy Configuration - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Proxy Discovery - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Proxy Valid - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Boolean State - -// Client attributes - -// Server attributes -#define ZCL_STATE_VALUE_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Mode Select - -// Client attributes - -// Server attributes -#define ZCL_MODE_DESCRIPTION_ATTRIBUTE_ID (0x0000) -#define ZCL_STANDARD_NAMESPACE_ATTRIBUTE_ID (0x0001) -#define ZCL_SUPPORTED_MODES_ATTRIBUTE_ID (0x0002) -#define ZCL_CURRENT_MODE_ATTRIBUTE_ID (0x0003) -#define ZCL_START_UP_MODE_ATTRIBUTE_ID (0x0004) -#define ZCL_ON_MODE_ATTRIBUTE_ID (0x0005) - -// Attribute ids for cluster: Door Lock - -// Client attributes - -// Server attributes -#define ZCL_LOCK_STATE_ATTRIBUTE_ID (0x0000) -#define ZCL_LOCK_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_ACTUATOR_ENABLED_ATTRIBUTE_ID (0x0002) -#define ZCL_DOOR_STATE_ATTRIBUTE_ID (0x0003) -#define ZCL_DOOR_OPEN_EVENTS_ATTRIBUTE_ID (0x0004) -#define ZCL_DOOR_CLOSED_EVENTS_ATTRIBUTE_ID (0x0005) -#define ZCL_OPEN_PERIOD_ATTRIBUTE_ID (0x0006) -#define ZCL_NUM_TOTAL_USERS_SUPPORTED_ATTRIBUTE_ID (0x0011) -#define ZCL_NUM_PIN_USERS_SUPPORTED_ATTRIBUTE_ID (0x0012) -#define ZCL_NUM_RFID_USERS_SUPPORTED_ATTRIBUTE_ID (0x0013) -#define ZCL_NUM_WEEKDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0014) -#define ZCL_NUM_YEARDAY_SCHEDULES_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x0015) -#define ZCL_NUM_HOLIDAY_SCHEDULES_SUPPORTED_ATTRIBUTE_ID (0x0016) -#define ZCL_MAX_PIN_LENGTH_ATTRIBUTE_ID (0x0017) -#define ZCL_MIN_PIN_LENGTH_ATTRIBUTE_ID (0x0018) -#define ZCL_MAX_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x0019) -#define ZCL_MIN_RFID_CODE_LENGTH_ATTRIBUTE_ID (0x001A) -#define ZCL_CREDENTIAL_RULES_SUPPORT_ATTRIBUTE_ID (0x001B) -#define ZCL_NUM_CREDENTIALS_SUPPORTED_PER_USER_ATTRIBUTE_ID (0x001C) -#define ZCL_LANGUAGE_ATTRIBUTE_ID (0x0021) -#define ZCL_LED_SETTINGS_ATTRIBUTE_ID (0x0022) -#define ZCL_AUTO_RELOCK_TIME_ATTRIBUTE_ID (0x0023) -#define ZCL_SOUND_VOLUME_ATTRIBUTE_ID (0x0024) -#define ZCL_OPERATING_MODE_ATTRIBUTE_ID (0x0025) -#define ZCL_SUPPORTED_OPERATING_MODES_ATTRIBUTE_ID (0x0026) -#define ZCL_DEFAULT_CONFIGURATION_REGISTER_ATTRIBUTE_ID (0x0027) -#define ZCL_ENABLE_LOCAL_PROGRAMMING_ATTRIBUTE_ID (0x0028) -#define ZCL_ENABLE_ONE_TOUCH_LOCKING_ATTRIBUTE_ID (0x0029) -#define ZCL_ENABLE_INSIDE_STATUS_LED_ATTRIBUTE_ID (0x002A) -#define ZCL_ENABLE_PRIVACY_MODE_BUTTON_ATTRIBUTE_ID (0x002B) -#define ZCL_LOCAL_PROGRAMMING_FEATURES_ATTRIBUTE_ID (0x002C) -#define ZCL_WRONG_CODE_ENTRY_LIMIT_ATTRIBUTE_ID (0x0030) -#define ZCL_USER_CODE_TEMPORARY_DISABLE_TIME_ATTRIBUTE_ID (0x0031) -#define ZCL_SEND_PIN_OVER_THE_AIR_ATTRIBUTE_ID (0x0032) -#define ZCL_REQUIRE_PIN_FOR_REMOTE_OPERATION_ATTRIBUTE_ID (0x0033) -#define ZCL_EXPIRING_USER_TIMEOUT_ATTRIBUTE_ID (0x0035) - -// Attribute ids for cluster: Window Covering - -// Client attributes - -// Server attributes -#define ZCL_WC_TYPE_ATTRIBUTE_ID (0x0000) -#define ZCL_WC_PHYSICAL_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID (0x0001) -#define ZCL_WC_PHYSICAL_CLOSED_LIMIT_TILT_ATTRIBUTE_ID (0x0002) -#define ZCL_WC_CURRENT_POSITION_LIFT_ATTRIBUTE_ID (0x0003) -#define ZCL_WC_CURRENT_POSITION_TILT_ATTRIBUTE_ID (0x0004) -#define ZCL_WC_NUMBER_OF_ACTUATIONS_LIFT_ATTRIBUTE_ID (0x0005) -#define ZCL_WC_NUMBER_OF_ACTUATIONS_TILT_ATTRIBUTE_ID (0x0006) -#define ZCL_WC_CONFIG_STATUS_ATTRIBUTE_ID (0x0007) -#define ZCL_WC_CURRENT_POSITION_LIFT_PERCENTAGE_ATTRIBUTE_ID (0x0008) -#define ZCL_WC_CURRENT_POSITION_TILT_PERCENTAGE_ATTRIBUTE_ID (0x0009) -#define ZCL_WC_OPERATIONAL_STATUS_ATTRIBUTE_ID (0x000A) -#define ZCL_WC_TARGET_POSITION_LIFT_PERCENT100_THS_ATTRIBUTE_ID (0x000B) -#define ZCL_WC_TARGET_POSITION_TILT_PERCENT100_THS_ATTRIBUTE_ID (0x000C) -#define ZCL_WC_END_PRODUCT_TYPE_ATTRIBUTE_ID (0x000D) -#define ZCL_WC_CURRENT_POSITION_LIFT_PERCENT100_THS_ATTRIBUTE_ID (0x000E) -#define ZCL_WC_CURRENT_POSITION_TILT_PERCENT100_THS_ATTRIBUTE_ID (0x000F) -#define ZCL_WC_INSTALLED_OPEN_LIMIT_LIFT_ATTRIBUTE_ID (0x0010) -#define ZCL_WC_INSTALLED_CLOSED_LIMIT_LIFT_ATTRIBUTE_ID (0x0011) -#define ZCL_WC_INSTALLED_OPEN_LIMIT_TILT_ATTRIBUTE_ID (0x0012) -#define ZCL_WC_INSTALLED_CLOSED_LIMIT_TILT_ATTRIBUTE_ID (0x0013) -#define ZCL_WC_MODE_ATTRIBUTE_ID (0x0017) -#define ZCL_WC_SAFETY_STATUS_ATTRIBUTE_ID (0x001A) - -// Attribute ids for cluster: Barrier Control - -// Client attributes - -// Server attributes -#define ZCL_BARRIER_MOVING_STATE_ATTRIBUTE_ID (0x0001) -#define ZCL_BARRIER_SAFETY_STATUS_ATTRIBUTE_ID (0x0002) -#define ZCL_BARRIER_CAPABILITIES_ATTRIBUTE_ID (0x0003) -#define ZCL_BARRIER_OPEN_EVENTS_ATTRIBUTE_ID (0x0004) -#define ZCL_BARRIER_CLOSE_EVENTS_ATTRIBUTE_ID (0x0005) -#define ZCL_BARRIER_COMMAND_OPEN_EVENTS_ATTRIBUTE_ID (0x0006) -#define ZCL_BARRIER_COMMAND_CLOSE_EVENTS_ATTRIBUTE_ID (0x0007) -#define ZCL_BARRIER_OPEN_PERIOD_ATTRIBUTE_ID (0x0008) -#define ZCL_BARRIER_CLOSE_PERIOD_ATTRIBUTE_ID (0x0009) -#define ZCL_BARRIER_POSITION_ATTRIBUTE_ID (0x000A) - -// Attribute ids for cluster: Pump Configuration and Control - -// Client attributes - -// Server attributes -#define ZCL_MAX_PRESSURE_ATTRIBUTE_ID (0x0000) -#define ZCL_MAX_SPEED_ATTRIBUTE_ID (0x0001) -#define ZCL_MAX_FLOW_ATTRIBUTE_ID (0x0002) -#define ZCL_MIN_CONST_PRESSURE_ATTRIBUTE_ID (0x0003) -#define ZCL_MAX_CONST_PRESSURE_ATTRIBUTE_ID (0x0004) -#define ZCL_MIN_COMP_PRESSURE_ATTRIBUTE_ID (0x0005) -#define ZCL_MAX_COMP_PRESSURE_ATTRIBUTE_ID (0x0006) -#define ZCL_MIN_CONST_SPEED_ATTRIBUTE_ID (0x0007) -#define ZCL_MAX_CONST_SPEED_ATTRIBUTE_ID (0x0008) -#define ZCL_MIN_CONST_FLOW_ATTRIBUTE_ID (0x0009) -#define ZCL_MAX_CONST_FLOW_ATTRIBUTE_ID (0x000A) -#define ZCL_MIN_CONST_TEMP_ATTRIBUTE_ID (0x000B) -#define ZCL_MAX_CONST_TEMP_ATTRIBUTE_ID (0x000C) -#define ZCL_PUMP_STATUS_ATTRIBUTE_ID (0x0010) -#define ZCL_EFFECTIVE_OPERATION_MODE_ATTRIBUTE_ID (0x0011) -#define ZCL_EFFECTIVE_CONTROL_MODE_ATTRIBUTE_ID (0x0012) -#define ZCL_CAPACITY_ATTRIBUTE_ID (0x0013) -#define ZCL_SPEED_ATTRIBUTE_ID (0x0014) -#define ZCL_LIFETIME_RUNNING_HOURS_ATTRIBUTE_ID (0x0015) -#define ZCL_PUMP_POWER_ATTRIBUTE_ID (0x0016) -#define ZCL_LIFETIME_ENERGY_CONSUMED_ATTRIBUTE_ID (0x0017) -#define ZCL_OPERATION_MODE_ATTRIBUTE_ID (0x0020) -#define ZCL_CONTROL_MODE_ATTRIBUTE_ID (0x0021) - -// Attribute ids for cluster: Thermostat - -// Client attributes - -// Server attributes -#define ZCL_LOCAL_TEMPERATURE_ATTRIBUTE_ID (0x0000) -#define ZCL_OUTDOOR_TEMPERATURE_ATTRIBUTE_ID (0x0001) -#define ZCL_THERMOSTAT_OCCUPANCY_ATTRIBUTE_ID (0x0002) -#define ZCL_ABS_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0003) -#define ZCL_ABS_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0004) -#define ZCL_ABS_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0005) -#define ZCL_ABS_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0006) -#define ZCL_PI_COOLING_DEMAND_ATTRIBUTE_ID (0x0007) -#define ZCL_PI_HEATING_DEMAND_ATTRIBUTE_ID (0x0008) -#define ZCL_HVAC_SYSTEM_TYPE_CONFIGURATION_ATTRIBUTE_ID (0x0009) -#define ZCL_LOCAL_TEMPERATURE_CALIBRATION_ATTRIBUTE_ID (0x0010) -#define ZCL_OCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID (0x0011) -#define ZCL_OCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID (0x0012) -#define ZCL_UNOCCUPIED_COOLING_SETPOINT_ATTRIBUTE_ID (0x0013) -#define ZCL_UNOCCUPIED_HEATING_SETPOINT_ATTRIBUTE_ID (0x0014) -#define ZCL_MIN_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0015) -#define ZCL_MAX_HEAT_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0016) -#define ZCL_MIN_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0017) -#define ZCL_MAX_COOL_SETPOINT_LIMIT_ATTRIBUTE_ID (0x0018) -#define ZCL_MIN_SETPOINT_DEAD_BAND_ATTRIBUTE_ID (0x0019) -#define ZCL_REMOTE_SENSING_ATTRIBUTE_ID (0x001A) -#define ZCL_CONTROL_SEQUENCE_OF_OPERATION_ATTRIBUTE_ID (0x001B) -#define ZCL_SYSTEM_MODE_ATTRIBUTE_ID (0x001C) -#define ZCL_THERMOSTAT_RUNNING_MODE_ATTRIBUTE_ID (0x001E) -#define ZCL_START_OF_WEEK_ATTRIBUTE_ID (0x0020) -#define ZCL_NUMBER_OF_WEEKLY_TRANSITIONS_ATTRIBUTE_ID (0x0021) -#define ZCL_NUMBER_OF_DAILY_TRANSITIONS_ATTRIBUTE_ID (0x0022) -#define ZCL_TEMPERATURE_SETPOINT_HOLD_ATTRIBUTE_ID (0x0023) -#define ZCL_TEMPERATURE_SETPOINT_HOLD_DURATION_ATTRIBUTE_ID (0x0024) -#define ZCL_THERMOSTAT_PROGRAMMING_OPERATION_MODE_ATTRIBUTE_ID (0x0025) -#define ZCL_THERMOSTAT_RUNNING_STATE_ATTRIBUTE_ID (0x0029) -#define ZCL_SETPOINT_CHANGE_SOURCE_ATTRIBUTE_ID (0x0030) -#define ZCL_SETPOINT_CHANGE_AMOUNT_ATTRIBUTE_ID (0x0031) -#define ZCL_SETPOINT_CHANGE_SOURCE_TIMESTAMP_ATTRIBUTE_ID (0x0032) -#define ZCL_OCCUPIED_SETBACK_ATTRIBUTE_ID (0x0034) -#define ZCL_OCCUPIED_SETBACK_MIN_ATTRIBUTE_ID (0x0035) -#define ZCL_OCCUPIED_SETBACK_MAX_ATTRIBUTE_ID (0x0036) -#define ZCL_UNOCCUPIED_SETBACK_ATTRIBUTE_ID (0x0037) -#define ZCL_UNOCCUPIED_SETBACK_MIN_ATTRIBUTE_ID (0x0038) -#define ZCL_UNOCCUPIED_SETBACK_MAX_ATTRIBUTE_ID (0x0039) -#define ZCL_EMERGENCY_HEAT_DELTA_ATTRIBUTE_ID (0x003A) -#define ZCL_AC_TYPE_ATTRIBUTE_ID (0x0040) -#define ZCL_AC_CAPACITY_ATTRIBUTE_ID (0x0041) -#define ZCL_AC_REFRIGERANT_TYPE_ATTRIBUTE_ID (0x0042) -#define ZCL_AC_COMPRESSOR_TYPE_ATTRIBUTE_ID (0x0043) -#define ZCL_AC_ERROR_CODE_ATTRIBUTE_ID (0x0044) -#define ZCL_AC_LOUVER_POSITION_ATTRIBUTE_ID (0x0045) -#define ZCL_AC_COIL_TEMPERATURE_ATTRIBUTE_ID (0x0046) -#define ZCL_AC_CAPACITY_FORMAT_ATTRIBUTE_ID (0x0047) - -// Attribute ids for cluster: Fan Control - -// Client attributes - -// Server attributes -#define ZCL_FAN_MODE_ATTRIBUTE_ID (0x0000) -#define ZCL_FAN_MODE_SEQUENCE_ATTRIBUTE_ID (0x0001) -#define ZCL_PERCENT_SETTING_ATTRIBUTE_ID (0x0002) -#define ZCL_PERCENT_CURRENT_ATTRIBUTE_ID (0x0003) -#define ZCL_SPEED_MAX_ATTRIBUTE_ID (0x0004) -#define ZCL_SPEED_SETTING_ATTRIBUTE_ID (0x0005) -#define ZCL_SPEED_CURRENT_ATTRIBUTE_ID (0x0006) -#define ZCL_ROCK_SUPPORT_ATTRIBUTE_ID (0x0007) -#define ZCL_ROCK_SETTING_ATTRIBUTE_ID (0x0008) -#define ZCL_WIND_SUPPORT_ATTRIBUTE_ID (0x0009) -#define ZCL_WIND_SETTING_ATTRIBUTE_ID (0x000A) - -// Attribute ids for cluster: Thermostat User Interface Configuration - -// Client attributes - -// Server attributes -#define ZCL_TEMPERATURE_DISPLAY_MODE_ATTRIBUTE_ID (0x0000) -#define ZCL_KEYPAD_LOCKOUT_ATTRIBUTE_ID (0x0001) -#define ZCL_SCHEDULE_PROGRAMMING_VISIBILITY_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Color Control - -// Client attributes - -// Server attributes -#define ZCL_COLOR_CONTROL_CURRENT_HUE_ATTRIBUTE_ID (0x0000) -#define ZCL_COLOR_CONTROL_CURRENT_SATURATION_ATTRIBUTE_ID (0x0001) -#define ZCL_COLOR_CONTROL_REMAINING_TIME_ATTRIBUTE_ID (0x0002) -#define ZCL_COLOR_CONTROL_CURRENT_X_ATTRIBUTE_ID (0x0003) -#define ZCL_COLOR_CONTROL_CURRENT_Y_ATTRIBUTE_ID (0x0004) -#define ZCL_COLOR_CONTROL_DRIFT_COMPENSATION_ATTRIBUTE_ID (0x0005) -#define ZCL_COLOR_CONTROL_COMPENSATION_TEXT_ATTRIBUTE_ID (0x0006) -#define ZCL_COLOR_CONTROL_COLOR_TEMPERATURE_ATTRIBUTE_ID (0x0007) -#define ZCL_COLOR_CONTROL_COLOR_MODE_ATTRIBUTE_ID (0x0008) -#define ZCL_COLOR_CONTROL_OPTIONS_ATTRIBUTE_ID (0x000F) -#define ZCL_COLOR_CONTROL_NUMBER_OF_PRIMARIES_ATTRIBUTE_ID (0x0010) -#define ZCL_COLOR_CONTROL_PRIMARY_1_X_ATTRIBUTE_ID (0x0011) -#define ZCL_COLOR_CONTROL_PRIMARY_1_Y_ATTRIBUTE_ID (0x0012) -#define ZCL_COLOR_CONTROL_PRIMARY_1_INTENSITY_ATTRIBUTE_ID (0x0013) -#define ZCL_COLOR_CONTROL_PRIMARY_2_X_ATTRIBUTE_ID (0x0015) -#define ZCL_COLOR_CONTROL_PRIMARY_2_Y_ATTRIBUTE_ID (0x0016) -#define ZCL_COLOR_CONTROL_PRIMARY_2_INTENSITY_ATTRIBUTE_ID (0x0017) -#define ZCL_COLOR_CONTROL_PRIMARY_3_X_ATTRIBUTE_ID (0x0019) -#define ZCL_COLOR_CONTROL_PRIMARY_3_Y_ATTRIBUTE_ID (0x001A) -#define ZCL_COLOR_CONTROL_PRIMARY_3_INTENSITY_ATTRIBUTE_ID (0x001B) -#define ZCL_COLOR_CONTROL_PRIMARY_4_X_ATTRIBUTE_ID (0x0020) -#define ZCL_COLOR_CONTROL_PRIMARY_4_Y_ATTRIBUTE_ID (0x0021) -#define ZCL_COLOR_CONTROL_PRIMARY_4_INTENSITY_ATTRIBUTE_ID (0x0022) -#define ZCL_COLOR_CONTROL_PRIMARY_5_X_ATTRIBUTE_ID (0x0024) -#define ZCL_COLOR_CONTROL_PRIMARY_5_Y_ATTRIBUTE_ID (0x0025) -#define ZCL_COLOR_CONTROL_PRIMARY_5_INTENSITY_ATTRIBUTE_ID (0x0026) -#define ZCL_COLOR_CONTROL_PRIMARY_6_X_ATTRIBUTE_ID (0x0028) -#define ZCL_COLOR_CONTROL_PRIMARY_6_Y_ATTRIBUTE_ID (0x0029) -#define ZCL_COLOR_CONTROL_PRIMARY_6_INTENSITY_ATTRIBUTE_ID (0x002A) -#define ZCL_COLOR_CONTROL_WHITE_POINT_X_ATTRIBUTE_ID (0x0030) -#define ZCL_COLOR_CONTROL_WHITE_POINT_Y_ATTRIBUTE_ID (0x0031) -#define ZCL_COLOR_CONTROL_COLOR_POINT_R_X_ATTRIBUTE_ID (0x0032) -#define ZCL_COLOR_CONTROL_COLOR_POINT_R_Y_ATTRIBUTE_ID (0x0033) -#define ZCL_COLOR_CONTROL_COLOR_POINT_R_INTENSITY_ATTRIBUTE_ID (0x0034) -#define ZCL_COLOR_CONTROL_COLOR_POINT_G_X_ATTRIBUTE_ID (0x0036) -#define ZCL_COLOR_CONTROL_COLOR_POINT_G_Y_ATTRIBUTE_ID (0x0037) -#define ZCL_COLOR_CONTROL_COLOR_POINT_G_INTENSITY_ATTRIBUTE_ID (0x0038) -#define ZCL_COLOR_CONTROL_COLOR_POINT_B_X_ATTRIBUTE_ID (0x003A) -#define ZCL_COLOR_CONTROL_COLOR_POINT_B_Y_ATTRIBUTE_ID (0x003B) -#define ZCL_COLOR_CONTROL_COLOR_POINT_B_INTENSITY_ATTRIBUTE_ID (0x003C) -#define ZCL_COLOR_CONTROL_ENHANCED_CURRENT_HUE_ATTRIBUTE_ID (0x4000) -#define ZCL_COLOR_CONTROL_ENHANCED_COLOR_MODE_ATTRIBUTE_ID (0x4001) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_ACTIVE_ATTRIBUTE_ID (0x4002) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_DIRECTION_ATTRIBUTE_ID (0x4003) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_TIME_ATTRIBUTE_ID (0x4004) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_START_ENHANCED_HUE_ATTRIBUTE_ID (0x4005) -#define ZCL_COLOR_CONTROL_COLOR_LOOP_STORED_ENHANCED_HUE_ATTRIBUTE_ID (0x4006) -#define ZCL_COLOR_CONTROL_COLOR_CAPABILITIES_ATTRIBUTE_ID (0x400A) -#define ZCL_COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MIN_ATTRIBUTE_ID (0x400B) -#define ZCL_COLOR_CONTROL_COLOR_TEMP_PHYSICAL_MAX_ATTRIBUTE_ID (0x400C) -#define ZCL_COLOR_CONTROL_TEMPERATURE_LEVEL_MIN_MIREDS_ATTRIBUTE_ID (0x400D) -#define ZCL_START_UP_COLOR_TEMPERATURE_MIREDS_ATTRIBUTE_ID (0x4010) - -// Attribute ids for cluster: Ballast Configuration - -// Client attributes - -// Server attributes -#define ZCL_PHYSICAL_MIN_LEVEL_ATTRIBUTE_ID (0x0000) -#define ZCL_PHYSICAL_MAX_LEVEL_ATTRIBUTE_ID (0x0001) -#define ZCL_BALLAST_STATUS_ATTRIBUTE_ID (0x0002) -#define ZCL_MIN_LEVEL_ATTRIBUTE_ID (0x0010) -#define ZCL_MAX_LEVEL_ATTRIBUTE_ID (0x0011) -#define ZCL_INTRINSIC_BALLAST_FACTOR_ATTRIBUTE_ID (0x0014) -#define ZCL_BALLAST_FACTOR_ADJUSTMENT_ATTRIBUTE_ID (0x0015) -#define ZCL_LAMP_QUANTITY_ATTRIBUTE_ID (0x0020) -#define ZCL_LAMP_TYPE_ATTRIBUTE_ID (0x0030) -#define ZCL_LAMP_MANUFACTURER_ATTRIBUTE_ID (0x0031) -#define ZCL_LAMP_RATED_HOURS_ATTRIBUTE_ID (0x0032) -#define ZCL_LAMP_BURN_HOURS_ATTRIBUTE_ID (0x0033) -#define ZCL_LAMP_ALARM_MODE_ATTRIBUTE_ID (0x0034) -#define ZCL_LAMP_BURN_HOURS_TRIP_POINT_ATTRIBUTE_ID (0x0035) - -// Attribute ids for cluster: Illuminance Measurement - -// Client attributes - -// Server attributes -#define ZCL_ILLUM_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_ILLUM_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_ILLUM_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_ILLUM_TOLERANCE_ATTRIBUTE_ID (0x0003) -#define ZCL_ILLUM_LIGHT_SENSOR_TYPE_ATTRIBUTE_ID (0x0004) - -// Attribute ids for cluster: Temperature Measurement - -// Client attributes - -// Server attributes -#define ZCL_TEMP_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_TEMP_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_TEMP_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_TEMP_TOLERANCE_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Pressure Measurement - -// Client attributes - -// Server attributes -#define ZCL_PRESSURE_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_PRESSURE_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_PRESSURE_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_PRESSURE_TOLERANCE_ATTRIBUTE_ID (0x0003) -#define ZCL_PRESSURE_SCALED_VALUE_ATTRIBUTE_ID (0x0010) -#define ZCL_PRESSURE_MIN_SCALED_VALUE_ATTRIBUTE_ID (0x0011) -#define ZCL_PRESSURE_MAX_SCALED_VALUE_ATTRIBUTE_ID (0x0012) -#define ZCL_PRESSURE_SCALED_TOLERANCE_ATTRIBUTE_ID (0x0013) -#define ZCL_PRESSURE_SCALE_ATTRIBUTE_ID (0x0014) - -// Attribute ids for cluster: Flow Measurement - -// Client attributes - -// Server attributes -#define ZCL_FLOW_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_FLOW_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_FLOW_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_FLOW_TOLERANCE_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Relative Humidity Measurement - -// Client attributes - -// Server attributes -#define ZCL_RELATIVE_HUMIDITY_MEASURED_VALUE_ATTRIBUTE_ID (0x0000) -#define ZCL_RELATIVE_HUMIDITY_MIN_MEASURED_VALUE_ATTRIBUTE_ID (0x0001) -#define ZCL_RELATIVE_HUMIDITY_MAX_MEASURED_VALUE_ATTRIBUTE_ID (0x0002) -#define ZCL_RELATIVE_HUMIDITY_TOLERANCE_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Occupancy Sensing - -// Client attributes - -// Server attributes -#define ZCL_OCCUPANCY_ATTRIBUTE_ID (0x0000) -#define ZCL_OCCUPANCY_SENSOR_TYPE_ATTRIBUTE_ID (0x0001) -#define ZCL_OCCUPANCY_SENSOR_TYPE_BITMAP_ATTRIBUTE_ID (0x0002) -#define ZCL_PIR_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID (0x0010) -#define ZCL_PIR_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0011) -#define ZCL_PIR_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0012) -#define ZCL_ULTRASONIC_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID (0x0020) -#define ZCL_ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0021) -#define ZCL_ULTRASONIC_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0022) -#define ZCL_PHYSICAL_CONTACT_OCCUPIED_TO_UNOCCUPIED_DELAY_ATTRIBUTE_ID (0x0030) -#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_DELAY_ATTRIBUTE_ID (0x0031) -#define ZCL_PHYSICAL_CONTACT_UNOCCUPIED_TO_OCCUPIED_THRESHOLD_ATTRIBUTE_ID (0x0032) - -// Attribute ids for cluster: Wake on LAN - -// Client attributes - -// Server attributes -#define ZCL_WAKE_ON_LAN_MAC_ADDRESS_ATTRIBUTE_ID (0x0000) - -// Attribute ids for cluster: Channel - -// Client attributes - -// Server attributes -#define ZCL_CHANNEL_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_CHANNEL_LINEUP_ATTRIBUTE_ID (0x0001) -#define ZCL_CHANNEL_CURRENT_CHANNEL_ATTRIBUTE_ID (0x0002) - -// Attribute ids for cluster: Target Navigator - -// Client attributes - -// Server attributes -#define ZCL_TARGET_NAVIGATOR_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_TARGET_NAVIGATOR_CURRENT_TARGET_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Media Playback - -// Client attributes - -// Server attributes -#define ZCL_MEDIA_PLAYBACK_STATE_ATTRIBUTE_ID (0x0000) -#define ZCL_MEDIA_PLAYBACK_START_TIME_ATTRIBUTE_ID (0x0001) -#define ZCL_MEDIA_PLAYBACK_DURATION_ATTRIBUTE_ID (0x0002) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_POSITION_ATTRIBUTE_ID (0x0003) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_SPEED_ATTRIBUTE_ID (0x0004) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_END_ATTRIBUTE_ID (0x0005) -#define ZCL_MEDIA_PLAYBACK_PLAYBACK_SEEK_RANGE_START_ATTRIBUTE_ID (0x0006) - -// Attribute ids for cluster: Media Input - -// Client attributes - -// Server attributes -#define ZCL_MEDIA_INPUT_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_MEDIA_INPUT_CURRENT_INPUT_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Low Power - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Keypad Input - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Content Launcher - -// Client attributes - -// Server attributes -#define ZCL_CONTENT_LAUNCHER_ACCEPT_HEADER_ATTRIBUTE_ID (0x0000) -#define ZCL_CONTENT_LAUNCHER_SUPPORTED_STREAMING_PROTOCOLS_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Audio Output - -// Client attributes - -// Server attributes -#define ZCL_AUDIO_OUTPUT_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_AUDIO_OUTPUT_CURRENT_OUTPUT_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Application Launcher - -// Client attributes - -// Server attributes -#define ZCL_APPLICATION_LAUNCHER_LIST_ATTRIBUTE_ID (0x0000) -#define ZCL_APPLICATION_LAUNCHER_CURRENT_APP_ATTRIBUTE_ID (0x0001) - -// Attribute ids for cluster: Application Basic - -// Client attributes - -// Server attributes -#define ZCL_APPLICATION_VENDOR_NAME_ATTRIBUTE_ID (0x0000) -#define ZCL_APPLICATION_VENDOR_ID_ATTRIBUTE_ID (0x0001) -#define ZCL_APPLICATION_NAME_ATTRIBUTE_ID (0x0002) -#define ZCL_APPLICATION_PRODUCT_ID_ATTRIBUTE_ID (0x0003) -#define ZCL_APPLICATION_APP_ATTRIBUTE_ID (0x0004) -#define ZCL_APPLICATION_STATUS_ATTRIBUTE_ID (0x0005) -#define ZCL_APPLICATION_VERSION_ATTRIBUTE_ID (0x0006) -#define ZCL_APPLICATION_ALLOWED_VENDOR_LIST_ATTRIBUTE_ID (0x0007) - -// Attribute ids for cluster: Account Login - -// Client attributes - -// Server attributes - -// Attribute ids for cluster: Electrical Measurement - -// Client attributes - -// Server attributes -#define ZCL_MEASUREMENT_TYPE_ATTRIBUTE_ID (0x0000) -#define ZCL_DC_VOLTAGE_ATTRIBUTE_ID (0x0100) -#define ZCL_DC_VOLTAGE_MIN_ATTRIBUTE_ID (0x0101) -#define ZCL_DC_VOLTAGE_MAX_ATTRIBUTE_ID (0x0102) -#define ZCL_DC_CURRENT_ATTRIBUTE_ID (0x0103) -#define ZCL_DC_CURRENT_MIN_ATTRIBUTE_ID (0x0104) -#define ZCL_DC_CURRENT_MAX_ATTRIBUTE_ID (0x0105) -#define ZCL_DC_POWER_ATTRIBUTE_ID (0x0106) -#define ZCL_DC_POWER_MIN_ATTRIBUTE_ID (0x0107) -#define ZCL_DC_POWER_MAX_ATTRIBUTE_ID (0x0108) -#define ZCL_DC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID (0x0200) -#define ZCL_DC_VOLTAGE_DIVISOR_ATTRIBUTE_ID (0x0201) -#define ZCL_DC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0202) -#define ZCL_DC_CURRENT_DIVISOR_ATTRIBUTE_ID (0x0203) -#define ZCL_DC_POWER_MULTIPLIER_ATTRIBUTE_ID (0x0204) -#define ZCL_DC_POWER_DIVISOR_ATTRIBUTE_ID (0x0205) -#define ZCL_AC_FREQUENCY_ATTRIBUTE_ID (0x0300) -#define ZCL_AC_FREQUENCY_MIN_ATTRIBUTE_ID (0x0301) -#define ZCL_AC_FREQUENCY_MAX_ATTRIBUTE_ID (0x0302) -#define ZCL_NEUTRAL_CURRENT_ATTRIBUTE_ID (0x0303) -#define ZCL_TOTAL_ACTIVE_POWER_ATTRIBUTE_ID (0x0304) -#define ZCL_TOTAL_REACTIVE_POWER_ATTRIBUTE_ID (0x0305) -#define ZCL_TOTAL_APPARENT_POWER_ATTRIBUTE_ID (0x0306) -#define ZCL_MEASURED_1_ST_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0307) -#define ZCL_MEASURED_3_RD_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0308) -#define ZCL_MEASURED_5_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0309) -#define ZCL_MEASURED_7_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030A) -#define ZCL_MEASURED_9_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030B) -#define ZCL_MEASURED_11_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030C) -#define ZCL_MEASURED_PHASE_1_ST_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030D) -#define ZCL_MEASURED_PHASE_3_RD_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030E) -#define ZCL_MEASURED_PHASE_5_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x030F) -#define ZCL_MEASURED_PHASE_7_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0310) -#define ZCL_MEASURED_PHASE_9_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0311) -#define ZCL_MEASURED_PHASE_11_TH_HARMONIC_CURRENT_ATTRIBUTE_ID (0x0312) -#define ZCL_AC_FREQUENCY_MULTIPLIER_ATTRIBUTE_ID (0x0400) -#define ZCL_AC_FREQUENCY_DIVISOR_ATTRIBUTE_ID (0x0401) -#define ZCL_POWER_MULTIPLIER_ATTRIBUTE_ID (0x0402) -#define ZCL_POWER_DIVISOR_ATTRIBUTE_ID (0x0403) -#define ZCL_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0404) -#define ZCL_PHASE_HARMONIC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0405) -#define ZCL_INSTANTANEOUS_VOLTAGE_ATTRIBUTE_ID (0x0500) -#define ZCL_INSTANTANEOUS_LINE_CURRENT_ATTRIBUTE_ID (0x0501) -#define ZCL_INSTANTANEOUS_ACTIVE_CURRENT_ATTRIBUTE_ID (0x0502) -#define ZCL_INSTANTANEOUS_REACTIVE_CURRENT_ATTRIBUTE_ID (0x0503) -#define ZCL_INSTANTANEOUS_POWER_ATTRIBUTE_ID (0x0504) -#define ZCL_RMS_VOLTAGE_ATTRIBUTE_ID (0x0505) -#define ZCL_RMS_VOLTAGE_MIN_ATTRIBUTE_ID (0x0506) -#define ZCL_RMS_VOLTAGE_MAX_ATTRIBUTE_ID (0x0507) -#define ZCL_RMS_CURRENT_ATTRIBUTE_ID (0x0508) -#define ZCL_RMS_CURRENT_MIN_ATTRIBUTE_ID (0x0509) -#define ZCL_RMS_CURRENT_MAX_ATTRIBUTE_ID (0x050A) -#define ZCL_ACTIVE_POWER_ATTRIBUTE_ID (0x050B) -#define ZCL_ACTIVE_POWER_MIN_ATTRIBUTE_ID (0x050C) -#define ZCL_ACTIVE_POWER_MAX_ATTRIBUTE_ID (0x050D) -#define ZCL_REACTIVE_POWER_ATTRIBUTE_ID (0x050E) -#define ZCL_APPARENT_POWER_ATTRIBUTE_ID (0x050F) -#define ZCL_AC_POWER_FACTOR_ATTRIBUTE_ID (0x0510) -#define ZCL_AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_ATTRIBUTE_ID (0x0511) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_ATTRIBUTE_ID (0x0513) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_PERIOD_ATTRIBUTE_ID (0x0514) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_ATTRIBUTE_ID (0x0515) -#define ZCL_RMS_VOLTAGE_SAG_PERIOD_ATTRIBUTE_ID (0x0516) -#define ZCL_RMS_VOLTAGE_SWELL_PERIOD_ATTRIBUTE_ID (0x0517) -#define ZCL_AC_VOLTAGE_MULTIPLIER_ATTRIBUTE_ID (0x0600) -#define ZCL_AC_VOLTAGE_DIVISOR_ATTRIBUTE_ID (0x0601) -#define ZCL_AC_CURRENT_MULTIPLIER_ATTRIBUTE_ID (0x0602) -#define ZCL_AC_CURRENT_DIVISOR_ATTRIBUTE_ID (0x0603) -#define ZCL_AC_POWER_MULTIPLIER_ATTRIBUTE_ID (0x0604) -#define ZCL_AC_POWER_DIVISOR_ATTRIBUTE_ID (0x0605) -#define ZCL_DC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID (0x0700) -#define ZCL_DC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID (0x0701) -#define ZCL_DC_CURRENT_OVERLOAD_ATTRIBUTE_ID (0x0702) -#define ZCL_AC_OVERLOAD_ALARMS_MASK_ATTRIBUTE_ID (0x0800) -#define ZCL_AC_VOLTAGE_OVERLOAD_ATTRIBUTE_ID (0x0801) -#define ZCL_AC_CURRENT_OVERLOAD_ATTRIBUTE_ID (0x0802) -#define ZCL_AC_POWER_OVERLOAD_ATTRIBUTE_ID (0x0803) -#define ZCL_AC_REACTIVE_POWER_OVERLOAD_ATTRIBUTE_ID (0x0804) -#define ZCL_AVERAGE_RMS_OVER_VOLTAGE_ATTRIBUTE_ID (0x0805) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_ATTRIBUTE_ID (0x0806) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_ATTRIBUTE_ID (0x0807) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_ATTRIBUTE_ID (0x0808) -#define ZCL_RMS_VOLTAGE_SAG_ATTRIBUTE_ID (0x0809) -#define ZCL_RMS_VOLTAGE_SWELL_ATTRIBUTE_ID (0x080A) -#define ZCL_LINE_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0901) -#define ZCL_ACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0902) -#define ZCL_REACTIVE_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0903) -#define ZCL_RMS_VOLTAGE_PHASE_B_ATTRIBUTE_ID (0x0905) -#define ZCL_RMS_VOLTAGE_MIN_PHASE_B_ATTRIBUTE_ID (0x0906) -#define ZCL_RMS_VOLTAGE_MAX_PHASE_B_ATTRIBUTE_ID (0x0907) -#define ZCL_RMS_CURRENT_PHASE_B_ATTRIBUTE_ID (0x0908) -#define ZCL_RMS_CURRENT_MIN_PHASE_B_ATTRIBUTE_ID (0x0909) -#define ZCL_RMS_CURRENT_MAX_PHASE_B_ATTRIBUTE_ID (0x090A) -#define ZCL_ACTIVE_POWER_PHASE_B_ATTRIBUTE_ID (0x090B) -#define ZCL_ACTIVE_POWER_MIN_PHASE_B_ATTRIBUTE_ID (0x090C) -#define ZCL_ACTIVE_POWER_MAX_PHASE_B_ATTRIBUTE_ID (0x090D) -#define ZCL_REACTIVE_POWER_PHASE_B_ATTRIBUTE_ID (0x090E) -#define ZCL_APPARENT_POWER_PHASE_B_ATTRIBUTE_ID (0x090F) -#define ZCL_POWER_FACTOR_PHASE_B_ATTRIBUTE_ID (0x0910) -#define ZCL_AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0911) -#define ZCL_AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID (0x0912) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_B_ATTRIBUTE_ID (0x0913) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0914) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0915) -#define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0916) -#define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_B_ATTRIBUTE_ID (0x0917) -#define ZCL_LINE_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A01) -#define ZCL_ACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A02) -#define ZCL_REACTIVE_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A03) -#define ZCL_RMS_VOLTAGE_PHASE_C_ATTRIBUTE_ID (0x0A05) -#define ZCL_RMS_VOLTAGE_MIN_PHASE_C_ATTRIBUTE_ID (0x0A06) -#define ZCL_RMS_VOLTAGE_MAX_PHASE_C_ATTRIBUTE_ID (0x0A07) -#define ZCL_RMS_CURRENT_PHASE_C_ATTRIBUTE_ID (0x0A08) -#define ZCL_RMS_CURRENT_MIN_PHASE_C_ATTRIBUTE_ID (0x0A09) -#define ZCL_RMS_CURRENT_MAX_PHASE_C_ATTRIBUTE_ID (0x0A0A) -#define ZCL_ACTIVE_POWER_PHASE_C_ATTRIBUTE_ID (0x0A0B) -#define ZCL_ACTIVE_POWER_MIN_PHASE_C_ATTRIBUTE_ID (0x0A0C) -#define ZCL_ACTIVE_POWER_MAX_PHASE_C_ATTRIBUTE_ID (0x0A0D) -#define ZCL_REACTIVE_POWER_PHASE_C_ATTRIBUTE_ID (0x0A0E) -#define ZCL_APPARENT_POWER_PHASE_C_ATTRIBUTE_ID (0x0A0F) -#define ZCL_POWER_FACTOR_PHASE_C_ATTRIBUTE_ID (0x0A10) -#define ZCL_AVERAGE_RMS_VOLTAGE_MEASUREMENT_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A11) -#define ZCL_AVERAGE_RMS_OVER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID (0x0A12) -#define ZCL_AVERAGE_RMS_UNDER_VOLTAGE_COUNTER_PHASE_C_ATTRIBUTE_ID (0x0A13) -#define ZCL_RMS_EXTREME_OVER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A14) -#define ZCL_RMS_EXTREME_UNDER_VOLTAGE_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A15) -#define ZCL_RMS_VOLTAGE_SAG_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A16) -#define ZCL_RMS_VOLTAGE_SWELL_PERIOD_PHASE_C_ATTRIBUTE_ID (0x0A17) - -// Attribute ids for cluster: Client Monitoring - -// Client attributes - -// Server attributes -#define ZCL_IDLE_MODE_INTERVAL_ATTRIBUTE_ID (0x0000) -#define ZCL_ACTIVE_MODE_INTERVAL_ATTRIBUTE_ID (0x0001) -#define ZCL_ACTIVE_MODE_THRESHOLD_ATTRIBUTE_ID (0x0002) -#define ZCL_EXPECTED_CLIENTS_ATTRIBUTE_ID (0x0003) - -// Attribute ids for cluster: Unit Testing - -// Client attributes - -// Server attributes -#define ZCL_BOOLEAN_ATTRIBUTE_ID (0x0000) -#define ZCL_BITMAP8_ATTRIBUTE_ID (0x0001) -#define ZCL_BITMAP16_ATTRIBUTE_ID (0x0002) -#define ZCL_BITMAP32_ATTRIBUTE_ID (0x0003) -#define ZCL_BITMAP64_ATTRIBUTE_ID (0x0004) -#define ZCL_INT8_U_ATTRIBUTE_ID (0x0005) -#define ZCL_INT16_U_ATTRIBUTE_ID (0x0006) -#define ZCL_INT24_U_ATTRIBUTE_ID (0x0007) -#define ZCL_INT32_U_ATTRIBUTE_ID (0x0008) -#define ZCL_INT40_U_ATTRIBUTE_ID (0x0009) -#define ZCL_INT48_U_ATTRIBUTE_ID (0x000A) -#define ZCL_INT56_U_ATTRIBUTE_ID (0x000B) -#define ZCL_INT64_U_ATTRIBUTE_ID (0x000C) -#define ZCL_INT8_S_ATTRIBUTE_ID (0x000D) -#define ZCL_INT16_S_ATTRIBUTE_ID (0x000E) -#define ZCL_INT24_S_ATTRIBUTE_ID (0x000F) -#define ZCL_INT32_S_ATTRIBUTE_ID (0x0010) -#define ZCL_INT40_S_ATTRIBUTE_ID (0x0011) -#define ZCL_INT48_S_ATTRIBUTE_ID (0x0012) -#define ZCL_INT56_S_ATTRIBUTE_ID (0x0013) -#define ZCL_INT64_S_ATTRIBUTE_ID (0x0014) -#define ZCL_ENUM8_ATTRIBUTE_ID (0x0015) -#define ZCL_ENUM16_ATTRIBUTE_ID (0x0016) -#define ZCL_FLOAT_SINGLE_ATTRIBUTE_ID (0x0017) -#define ZCL_FLOAT_DOUBLE_ATTRIBUTE_ID (0x0018) -#define ZCL_OCTET_STRING_ATTRIBUTE_ID (0x0019) -#define ZCL_LIST_ATTRIBUTE_ID (0x001A) -#define ZCL_LIST_OCTET_STRING_ATTRIBUTE_ID (0x001B) -#define ZCL_LIST_STRUCT_OCTET_STRING_ATTRIBUTE_ID (0x001C) -#define ZCL_LONG_OCTET_STRING_ATTRIBUTE_ID (0x001D) -#define ZCL_CHAR_STRING_ATTRIBUTE_ID (0x001E) -#define ZCL_LONG_CHAR_STRING_ATTRIBUTE_ID (0x001F) -#define ZCL_EPOCH_US_ATTRIBUTE_ID (0x0020) -#define ZCL_EPOCH_S_ATTRIBUTE_ID (0x0021) -#define ZCL_TEST_VENDOR_ID_ATTRIBUTE_ID (0x0022) -#define ZCL_LIST_OF_STRUCTS_WITH_OPTIONALS_ATTRIBUTE_ID (0x0023) -#define ZCL_SIMPLE_ENUM_ATTRIBUTE_ID (0x0024) -#define ZCL_STRUCT_ATTRIBUTE_ID (0x0025) -#define ZCL_RANGE_RESTRICTED_INT8_U_ATTRIBUTE_ID (0x0026) -#define ZCL_RANGE_RESTRICTED_INT8S_ATTRIBUTE_ID (0x0027) -#define ZCL_RANGE_RESTRICTED_INT16_U_ATTRIBUTE_ID (0x0028) -#define ZCL_RANGE_RESTRICTED_INT16S_ATTRIBUTE_ID (0x0029) -#define ZCL_LIST_LONG_OCTET_STRING_ATTRIBUTE_ID (0x002A) -#define ZCL_LIST_FABRIC_SCOPED_ATTRIBUTE_ID (0x002B) -#define ZCL_TIMED_WRITE_BOOLEAN_ATTRIBUTE_ID (0x0030) -#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 (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) -#define ZCL_WRITE_ONLY_INT8_U_ATTRIBUTE_ID (0x402A) - -// Attribute ids for cluster: Fault Injection - -// Client attributes - -// Server attributes diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 995dbfcecc9bc7..e94f6982e1904a 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -284,54 +284,6 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Actions::EndpointListTy } } -static auto __attribute__((unused)) EnsureKnownEnumValue(BasicInformation::ColorEnum val) -{ - using EnumType = BasicInformation::ColorEnum; - switch (val) - { - case EnumType::kBlack: - case EnumType::kNavy: - case EnumType::kGreen: - case EnumType::kTeal: - case EnumType::kMaroon: - case EnumType::kPurple: - case EnumType::kOlive: - case EnumType::kGray: - case EnumType::kBlue: - case EnumType::kLime: - case EnumType::kAqua: - case EnumType::kRed: - case EnumType::kFuchsia: - case EnumType::kYellow: - case EnumType::kWhite: - case EnumType::kNickel: - case EnumType::kChrome: - case EnumType::kBrass: - case EnumType::kCopper: - case EnumType::kSilver: - case EnumType::kGold: - return val; - default: - return static_cast(21); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(BasicInformation::ProductFinishEnum val) -{ - using EnumType = BasicInformation::ProductFinishEnum; - switch (val) - { - case EnumType::kMatte: - case EnumType::kSatin: - case EnumType::kPolished: - case EnumType::kRugged: - case EnumType::kFabric: - case EnumType::kOther: - return val; - default: - return static_cast(5); - } -} - static auto __attribute__((unused)) EnsureKnownEnumValue(OtaSoftwareUpdateProvider::OTAApplyUpdateAction val) { using EnumType = OtaSoftwareUpdateProvider::OTAApplyUpdateAction; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 02c0477a51716c..387ce5239b3dc9 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -370,55 +370,7 @@ enum class CommandBits : uint16_t }; } // namespace Actions -namespace BasicInformation { - -// Enum for ColorEnum -enum class ColorEnum : uint8_t -{ - kBlack = 0x00, - kNavy = 0x01, - kGreen = 0x02, - kTeal = 0x03, - kMaroon = 0x04, - kPurple = 0x05, - kOlive = 0x06, - kGray = 0x07, - kBlue = 0x08, - kLime = 0x09, - kAqua = 0x0A, - kRed = 0x0B, - kFuchsia = 0x0C, - kYellow = 0x0D, - kWhite = 0x0E, - kNickel = 0x0F, - kChrome = 0x10, - kBrass = 0x11, - kCopper = 0x12, - kSilver = 0x13, - kGold = 0x14, - // All received enum values that are not listed above will be mapped - // to kUnknownEnumValue. This is a helper enum value that should only - // be used by code to process how it handles receiving and unknown - // enum value. This specific should never be transmitted. - kUnknownEnumValue = 21, -}; - -// Enum for ProductFinishEnum -enum class ProductFinishEnum : uint8_t -{ - kMatte = 0x00, - kSatin = 0x01, - kPolished = 0x02, - kRugged = 0x03, - kFabric = 0x04, - kOther = 0xFF, - // All received enum values that are not listed above will be mapped - // to kUnknownEnumValue. This is a helper enum value that should only - // be used by code to process how it handles receiving and unknown - // enum value. This specific should never be transmitted. - kUnknownEnumValue = 5, -}; -} // namespace BasicInformation +namespace BasicInformation {} // namespace BasicInformation namespace OtaSoftwareUpdateProvider { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 9516002c77a9b3..a37e57cacbc576 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -3991,50 +3991,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } } // namespace CapabilityMinimaStruct -namespace ProductAppearanceStruct { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kFinish), finish)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kPrimaryColor), primaryColor)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - err = reader.EnterContainer(outer); - ReturnErrorOnFailure(err); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kFinish): - ReturnErrorOnFailure(DataModel::Decode(reader, finish)); - break; - case to_underlying(Fields::kPrimaryColor): - ReturnErrorOnFailure(DataModel::Decode(reader, primaryColor)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - - return CHIP_NO_ERROR; -} - -} // namespace ProductAppearanceStruct } // namespace Structs namespace Commands { @@ -4138,9 +4094,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::CapabilityMinima::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, capabilityMinima)); break; - case Attributes::ProductAppearance::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, productAppearance)); - break; case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, generatedCommandList)); break; diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 390f643e5252da..076c4097b13647 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -4526,29 +4526,6 @@ struct Type using DecodableType = Type; } // namespace CapabilityMinimaStruct -namespace ProductAppearanceStruct { -enum class Fields : uint8_t -{ - kFinish = 0, - kPrimaryColor = 1, -}; - -struct Type -{ -public: - ProductFinishEnum finish = static_cast(0); - DataModel::Nullable primaryColor; - - CHIP_ERROR Decode(TLV::TLVReader & reader); - - static constexpr bool kIsFabricScoped = false; - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; -}; - -using DecodableType = Type; - -} // namespace ProductAppearanceStruct } // namespace Structs namespace Commands { @@ -4846,18 +4823,6 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace CapabilityMinima -namespace ProductAppearance { -struct TypeInfo -{ - using Type = chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type; - using DecodableType = chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType; - using DecodableArgType = const chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType &; - - static constexpr ClusterId GetClusterId() { return Clusters::BasicInformation::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ProductAppearance::Id; } - static constexpr bool MustUseTimedWrite() { return false; } -}; -} // namespace ProductAppearance namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { @@ -4923,7 +4888,6 @@ struct TypeInfo Attributes::Reachable::TypeInfo::DecodableType reachable = static_cast(0); Attributes::UniqueID::TypeInfo::DecodableType uniqueID; Attributes::CapabilityMinima::TypeInfo::DecodableType capabilityMinima; - Attributes::ProductAppearance::TypeInfo::DecodableType productAppearance; Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; Attributes::EventList::TypeInfo::DecodableType eventList; 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 68bdcdeef043c7..62102d5fed1e5f 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 @@ -706,10 +706,6 @@ namespace CapabilityMinima { static constexpr AttributeId Id = 0x00000013; } // namespace CapabilityMinima -namespace ProductAppearance { -static constexpr AttributeId Id = 0x00000014; -} // namespace ProductAppearance - namespace GeneratedCommandList { static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; } // namespace GeneratedCommandList diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 7b55df31a6409f..98e822796ecc4a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -1853,7 +1853,6 @@ class ActionsDisableActionWithDuration : public ClusterCommand | * Reachable | 0x0011 | | * UniqueID | 0x0012 | | * CapabilityMinima | 0x0013 | -| * ProductAppearance | 0x0014 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -9360,7 +9359,6 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman make_unique(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig), // make_unique(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig), // make_unique(Id, "capability-minima", Attributes::CapabilityMinima::Id, credsIssuerConfig), // - make_unique(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // make_unique(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), // @@ -9408,8 +9406,6 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman credsIssuerConfig), // make_unique>( Id, "capability-minima", Attributes::CapabilityMinima::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( - Id, "product-appearance", Attributes::ProductAppearance::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -9444,7 +9440,6 @@ void registerClusterBasicInformation(Commands & commands, CredentialIssuerComman make_unique(Id, "reachable", Attributes::Reachable::Id, credsIssuerConfig), // make_unique(Id, "unique-id", Attributes::UniqueID::Id, credsIssuerConfig), // make_unique(Id, "capability-minima", Attributes::CapabilityMinima::Id, credsIssuerConfig), // - make_unique(Id, "product-appearance", Attributes::ProductAppearance::Id, credsIssuerConfig), // make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // make_unique(Id, "event-list", Attributes::EventList::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 6bee09307d6687..859fd542e6cc77 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1869,37 +1869,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::MediaPlayback::Structs ComplexArgumentParser::Finalize(request.updatedAt); ComplexArgumentParser::Finalize(request.position); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type & request, - Json::Value & value) -{ - VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); - - // Copy to track which members we already processed. - Json::Value valueCopy(value); - - ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ProductAppearanceStruct.finish", "finish", value.isMember("finish"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ProductAppearanceStruct.primaryColor", "primaryColor", - value.isMember("primaryColor"))); - - char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "finish"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.finish, value["finish"])); - valueCopy.removeMember("finish"); - - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "primaryColor"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.primaryColor, value["primaryColor"])); - valueCopy.removeMember("primaryColor"); - - return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); -} - -void ComplexArgumentParser::Finalize(chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type & request) -{ - ComplexArgumentParser::Finalize(request.finish); - ComplexArgumentParser::Finalize(request.primaryColor); -} CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type & request, Json::Value & value) diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index a7db6ba3697e4c..8c0036f996e70c 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -190,10 +190,6 @@ static CHIP_ERROR Setup(const char * label, chip::app::Clusters::MediaPlayback:: Json::Value & value); static void Finalize(chip::app::Clusters::MediaPlayback::Structs::PlaybackPositionStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type & request, - Json::Value & value); - -static void Finalize(chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 4c46bc33a612ec..578944136f8fdd 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -1682,31 +1682,6 @@ DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR -DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType & value) -{ - DataModelLogger::LogString(label, indent, "{"); - { - CHIP_ERROR err = LogValue("Finish", indent + 1, value.finish); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Finish'"); - return err; - } - } - { - CHIP_ERROR err = LogValue("PrimaryColor", indent + 1, value.primaryColor); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PrimaryColor'"); - return err; - } - } - DataModelLogger::LogString(indent, "}"); - - return CHIP_NO_ERROR; -} -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType & value) { @@ -5042,11 +5017,6 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CapabilityMinima", 1, value); } - case BasicInformation::Attributes::ProductAppearance::Id: { - chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ProductAppearance", 1, value); - } case BasicInformation::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 90b9a50ded26bf..cb1d136ebc92b7 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -104,8 +104,6 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::ContentLauncher::Structs::ParameterStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::MediaPlayback::Structs::PlaybackPositionStruct::DecodableType & value); -static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::OtaSoftwareUpdateRequestor::Structs::ProviderLocation::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index e9c04d681675bc..7b7fbf2a205390 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -18889,7 +18889,7 @@ class Test_TC_BINFO_1_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("clusterRevision", value, 2U)); + VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; @@ -67195,7 +67195,7 @@ class TestBasicInformationSuite : public TestCommand { public: TestBasicInformationSuite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("TestBasicInformation", 19, credsIssuerConfig) + TestCommand("TestBasicInformation", 18, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -67302,18 +67302,16 @@ class TestBasicInformationSuite : public TestCommand VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 19)); VerifyOrReturn(CheckValue("attributeList[19]", iter_0.GetValue(), 19UL)); VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 20)); - VerifyOrReturn(CheckValue("attributeList[20]", iter_0.GetValue(), 20UL)); + VerifyOrReturn(CheckValue("attributeList[20]", iter_0.GetValue(), 65528UL)); VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 21)); - VerifyOrReturn(CheckValue("attributeList[21]", iter_0.GetValue(), 65528UL)); + VerifyOrReturn(CheckValue("attributeList[21]", iter_0.GetValue(), 65529UL)); VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 22)); - VerifyOrReturn(CheckValue("attributeList[22]", iter_0.GetValue(), 65529UL)); + VerifyOrReturn(CheckValue("attributeList[22]", iter_0.GetValue(), 65531UL)); VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 23)); - VerifyOrReturn(CheckValue("attributeList[23]", iter_0.GetValue(), 65531UL)); + VerifyOrReturn(CheckValue("attributeList[23]", iter_0.GetValue(), 65532UL)); VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 24)); - VerifyOrReturn(CheckValue("attributeList[24]", iter_0.GetValue(), 65532UL)); - VerifyOrReturn(CheckNextListItemDecodes("attributeList", iter_0, 25)); - VerifyOrReturn(CheckValue("attributeList[25]", iter_0.GetValue(), 65533UL)); - VerifyOrReturn(CheckNoMoreListItems("attributeList", iter_0, 26)); + VerifyOrReturn(CheckValue("attributeList[24]", iter_0.GetValue(), 65533UL)); + VerifyOrReturn(CheckNoMoreListItems("attributeList", iter_0, 25)); } } break; @@ -67385,16 +67383,6 @@ class TestBasicInformationSuite : public TestCommand case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 18: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - { - chip::app::Clusters::BasicInformation::Structs::ProductAppearanceStruct::DecodableType value; - VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("productAppearance.finish", value.finish, 1U)); - VerifyOrReturn(CheckValueNonNull("productAppearance.primaryColor", value.primaryColor)); - VerifyOrReturn(CheckValue("productAppearance.primaryColor.Value()", value.primaryColor.Value(), 5U)); - } - break; default: LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); } @@ -67525,11 +67513,6 @@ class TestBasicInformationSuite : public TestCommand BasicInformation::Attributes::LocalConfigDisabled::Id, value, chip::NullOptional, chip::NullOptional); } - case 18: { - LogStep(18, "Read the ProductApppearance value"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(0), BasicInformation::Id, - BasicInformation::Attributes::ProductAppearance::Id, true, chip::NullOptional); - } } return CHIP_NO_ERROR; } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 1dead7e0f6dfcc..3c52df46823049 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -10964,7 +10964,6 @@ class SubscribeAttributeActionsClusterRevision : public SubscribeAttribute { | * Reachable | 0x0011 | | * UniqueID | 0x0012 | | * CapabilityMinima | 0x0013 | -| * ProductAppearance | 0x0014 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -12504,77 +12503,6 @@ class SubscribeAttributeBasicInformationCapabilityMinima : public SubscribeAttri } }; -/* - * Attribute ProductAppearance - */ -class ReadBasicInformationProductAppearance : public ReadAttribute { -public: - ReadBasicInformationProductAppearance() - : ReadAttribute("product-appearance") - { - } - - ~ReadBasicInformationProductAppearance() {} - - CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReadAttribute (0x00000014) on endpoint %u", endpointId); - - dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; - [cluster readAttributeProductAppearanceWithCompletion:^( - MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, NSError * _Nullable error) { - NSLog(@"BasicInformation.ProductAppearance response %@", [value description]); - if (error != nil) { - LogNSError("BasicInformation ProductAppearance read Error", error); - } - SetCommandExitStatus(error); - }]; - return CHIP_NO_ERROR; - } -}; - -class SubscribeAttributeBasicInformationProductAppearance : public SubscribeAttribute { -public: - SubscribeAttributeBasicInformationProductAppearance() - : SubscribeAttribute("product-appearance") - { - } - - ~SubscribeAttributeBasicInformationProductAppearance() {} - - CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000028) ReportAttribute (0x00000014) on endpoint %u", endpointId); - dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; - __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; - if (mKeepSubscriptions.HasValue()) { - params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); - } - if (mFabricFiltered.HasValue()) { - params.filterByFabric = mFabricFiltered.Value(); - } - if (mAutoResubscribe.HasValue()) { - params.resubscribeAutomatically = mAutoResubscribe.Value(); - } - [cluster subscribeAttributeProductAppearanceWithParams:params - subscriptionEstablished:^() { - mSubscriptionEstablished = YES; - } - reportHandler:^(MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, NSError * _Nullable error) { - NSLog(@"BasicInformation.ProductAppearance response %@", [value description]); - SetCommandExitStatus(error); - }]; - - return CHIP_NO_ERROR; - } -}; - /* * Attribute GeneratedCommandList */ @@ -98101,8 +98029,6 @@ void registerClusterBasicInformation(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 65d818df96651f..29947c74f391e6 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -21373,7 +21373,7 @@ class Test_TC_BINFO_1_1 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U)); + VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); @@ -97786,10 +97786,6 @@ class TestBasicInformation : public TestCommandBridge { ChipLogProgress(chipTool, " ***** Test Step 17 : Restore initial LocalConfigDisabled value\n"); err = TestRestoreInitialLocalConfigDisabledValue_17(); break; - case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Read the ProductApppearance value\n"); - err = TestReadTheProductApppearanceValue_18(); - break; } if (CHIP_NO_ERROR != err) { @@ -97855,9 +97851,6 @@ class TestBasicInformation : public TestCommandBridge { case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 18: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; } // Go on to the next test. @@ -97871,7 +97864,7 @@ class TestBasicInformation : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 19; + const uint16_t mTestCount = 18; chip::Optional mNodeId; chip::Optional mCluster; @@ -97988,7 +97981,7 @@ class TestBasicInformation : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast(26))); + VerifyOrReturn(CheckValue("AttributeList", [actualValue count], static_cast(25))); VerifyOrReturn(CheckValue("", actualValue[0], 0UL)); VerifyOrReturn(CheckValue("", actualValue[1], 1UL)); VerifyOrReturn(CheckValue("", actualValue[2], 2UL)); @@ -98009,12 +98002,11 @@ class TestBasicInformation : public TestCommandBridge { VerifyOrReturn(CheckValue("", actualValue[17], 17UL)); VerifyOrReturn(CheckValue("", actualValue[18], 18UL)); VerifyOrReturn(CheckValue("", actualValue[19], 19UL)); - VerifyOrReturn(CheckValue("", actualValue[20], 20UL)); - VerifyOrReturn(CheckValue("", actualValue[21], 65528UL)); - VerifyOrReturn(CheckValue("", actualValue[22], 65529UL)); - VerifyOrReturn(CheckValue("", actualValue[23], 65531UL)); - VerifyOrReturn(CheckValue("", actualValue[24], 65532UL)); - VerifyOrReturn(CheckValue("", actualValue[25], 65533UL)); + VerifyOrReturn(CheckValue("", actualValue[20], 65528UL)); + VerifyOrReturn(CheckValue("", actualValue[21], 65529UL)); + VerifyOrReturn(CheckValue("", actualValue[22], 65531UL)); + VerifyOrReturn(CheckValue("", actualValue[23], 65532UL)); + VerifyOrReturn(CheckValue("", actualValue[24], 65533UL)); } NextTest(); @@ -98259,35 +98251,6 @@ class TestBasicInformation : public TestCommandBridge { return CHIP_NO_ERROR; } - - CHIP_ERROR TestReadTheProductApppearanceValue_18() - { - - MTRBaseDevice * device = GetDevice("alpha"); - __auto_type * cluster = [[MTRBaseClusterBasicInformation alloc] initWithDevice:device endpointID:@(0) queue:mCallbackQueue]; - VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - - [cluster readAttributeProductAppearanceWithCompletion:^( - MTRBasicInformationClusterProductAppearanceStruct * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read the ProductApppearance value Error: %@", err); - - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - - { - id actualValue = value; - VerifyOrReturn( - CheckValue("Finish", ((MTRBasicInformationClusterProductAppearanceStruct *) actualValue).finish, 1U)); - VerifyOrReturn(CheckValueNonNull( - "PrimaryColor", ((MTRBasicInformationClusterProductAppearanceStruct *) actualValue).primaryColor)); - VerifyOrReturn(CheckValue( - "PrimaryColor", ((MTRBasicInformationClusterProductAppearanceStruct *) actualValue).primaryColor, 5U)); - } - - NextTest(); - }]; - - return CHIP_NO_ERROR; - } }; class TestFabricRemovalWhileSubscribed : public TestCommandBridge {