From 87947407a10d4f661c66f64b9ac51fccdbc5283e Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 18 Jan 2023 21:35:14 -0500 Subject: [PATCH] Align Administrator Commissioning XML with the spec again. (#24473) * Align Administrator Commissioning XML with the spec again. The spec changed in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6149 Fixes https://github.com/project-chip/connectedhomeip/issues/24465 * Auto-update ZAP files from the XML. * Regenerate generated code. --- .../all-clusters-app.matter | 4 +- .../all-clusters-common/all-clusters-app.zap | 6 +- .../all-clusters-minimal-app.matter | 4 +- .../all-clusters-minimal-app.zap | 6 +- .../bridge-common/bridge-app.matter | 4 +- .../bridge-app/bridge-common/bridge-app.zap | 6 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 6 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 4 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 6 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 4 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 6 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 6 +- .../rootnode_doorlock_aNKYAreMXE.matter | 4 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 6 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 4 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 6 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 4 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 6 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 4 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 6 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 4 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 6 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 4 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 6 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 4 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 6 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 4 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 6 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 4 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 6 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 4 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 6 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 6 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 4 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 6 +- .../rootnode_speaker_RpzeXdimqA.matter | 4 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 6 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 4 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 6 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 4 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 6 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 4 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 6 +- examples/common/pigweed/rpc_services/Device.h | 4 +- .../contact-sensor-app.matter | 4 +- .../contact-sensor-app.zap | 6 +- .../bridge-common/bridge-app.matter | 4 +- .../bridge-common/bridge-app.zap | 6 +- .../light-switch-app.matter | 4 +- .../light-switch-common/light-switch-app.zap | 6 +- .../lighting-common/lighting-app.matter | 4 +- .../lighting-common/lighting-app.zap | 6 +- .../nxp/zap/lighting-on-off.matter | 4 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 6 +- examples/lock-app/lock-common/lock-app.matter | 4 +- examples/lock-app/lock-common/lock-app.zap | 6 +- .../ota-provider-app.matter | 4 +- .../ota-provider-common/ota-provider-app.zap | 6 +- .../ota-requestor-app.matter | 4 +- .../ota-requestor-app.zap | 6 +- .../placeholder/linux/apps/app1/config.matter | 4 +- .../placeholder/linux/apps/app1/config.zap | 6 +- .../placeholder/linux/apps/app2/config.matter | 4 +- .../placeholder/linux/apps/app2/config.zap | 6 +- examples/pump-app/pump-common/pump-app.matter | 4 +- examples/pump-app/pump-common/pump-app.zap | 6 +- .../pump-controller-app.matter | 4 +- .../pump-controller-app.zap | 6 +- .../esp32/main/temperature-measurement.matter | 4 +- .../esp32/main/temperature-measurement.zap | 6 +- .../thermostat-common/thermostat.matter | 4 +- .../thermostat-common/thermostat.zap | 6 +- examples/tv-app/tv-common/tv-app.matter | 4 +- examples/tv-app/tv-common/tv-app.zap | 6 +- .../tv-casting-common/tv-casting-app.matter | 4 +- .../tv-casting-common/tv-casting-app.zap | 6 +- examples/window-app/common/window-app.matter | 4 +- examples/window-app/common/window-app.zap | 6 +- .../all-clusters-app/app-templates/access.h | 18 ++--- .../app-templates/endpoint_config.h | 6 +- .../app-templates/gen_config.h | 2 +- .../lighting-app/app-templates/access.h | 18 ++--- .../app-templates/endpoint_config.h | 6 +- .../lighting-app/app-templates/gen_config.h | 2 +- src/app/server/AppDelegate.h | 4 +- src/app/server/CommissioningWindowManager.cpp | 26 +++--- src/app/server/CommissioningWindowManager.h | 8 +- src/app/tests/TestCommissionManager.cpp | 18 ++--- .../tests/suites/TestClusterMultiFabric.yaml | 2 +- .../tests/suites/TestCommissionerNodeId.yaml | 4 +- .../tests/suites/TestCommissioningWindow.yaml | 2 +- src/app/tests/suites/TestDiscovery.yaml | 8 +- .../TestFabricRemovalWhileSubscribed.yaml | 2 +- .../suites/TestGeneralCommissioning.yaml | 2 +- src/app/tests/suites/TestGroupMessaging.yaml | 2 +- src/app/tests/suites/TestMultiAdmin.yaml | 8 +- ...tSubscribe_AdministratorCommissioning.yaml | 2 +- .../suites/certification/Test_TC_ACL_2_7.yaml | 2 +- .../certification/Test_TC_CADMIN_1_10.yaml | 2 +- .../certification/Test_TC_CADMIN_1_11.yaml | 16 ++-- .../certification/Test_TC_CADMIN_1_13.yaml | 26 +++--- .../certification/Test_TC_CADMIN_1_15.yaml | 6 +- .../certification/Test_TC_CADMIN_1_16.yaml | 6 +- .../certification/Test_TC_CADMIN_1_21.yaml | 8 +- .../certification/Test_TC_CADMIN_1_22.yaml | 8 +- .../certification/Test_TC_CADMIN_1_23.yaml | 8 +- .../certification/Test_TC_CADMIN_1_24.yaml | 8 +- .../certification/Test_TC_CADMIN_1_3.yaml | 8 +- .../certification/Test_TC_CADMIN_1_4.yaml | 8 +- .../certification/Test_TC_CADMIN_1_5.yaml | 16 ++-- .../certification/Test_TC_CADMIN_1_6.yaml | 14 ++-- .../certification/Test_TC_CADMIN_1_9.yaml | 2 +- .../administrator-commissioning-cluster.xml | 6 +- .../zcl/zcl-with-test-extensions.json | 2 +- src/app/zap-templates/zcl/zcl.json | 2 +- .../data_model/controller-clusters.matter | 4 +- .../data_model/controller-clusters.zap | 6 +- .../python/chip/clusters/Objects.py | 10 +-- .../CHIP/templates/availability.yaml | 10 ++- .../CHIP/zap-generated/MTRBaseClusters.h | 2 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 8 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 79 ++++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 13 +-- .../CHIP/zap-generated/MTRClusters.h | 2 +- .../app-common/zap-generated/attribute-id.h | 2 +- .../zap-generated/attributes/Accessors.cpp | 8 +- .../zap-generated/attributes/Accessors.h | 7 +- .../app-common/zap-generated/callback.h | 28 +++---- .../zap-generated/cluster-enums-check.h | 4 +- .../app-common/zap-generated/cluster-enums.h | 4 +- .../zap-generated/cluster-objects.h | 8 +- .../app-common/zap-generated/command-id.h | 2 +- .../app-common/zap-generated/print-cluster.h | 2 +- .../cluster/logging/DataModelLogger.cpp | 2 +- .../chip-tool/zap-generated/test/Commands.h | 44 +++++------ .../zap-generated/endpoint_config.h | 2 +- .../zap-generated/gen_config.h | 2 +- 140 files changed, 476 insertions(+), 465 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 7bf43efc3b4cf1..9a74e469364fdb 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 @@ -1541,7 +1541,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1553,7 +1553,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; 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 9b5bef1e5a6ebd..96fa40024e8596 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 @@ -5395,7 +5395,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -5447,7 +5447,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -5459,7 +5459,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 13af6c99f6204d..44907912a03349 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 @@ -1391,7 +1391,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1403,7 +1403,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 31383a7181442f..e5c4258b21f8fd 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -5395,7 +5395,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -5447,7 +5447,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -5459,7 +5459,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 923b7929e97c78..101ae1eb4c3468 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1213,7 +1213,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1225,7 +1225,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 44436d9cec3bb1..e7ea939cda1709 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -4029,7 +4029,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4097,7 +4097,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4109,7 +4109,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 2d811db4990ee6..32f3ba7e05372e 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1068,7 +1068,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1080,7 +1080,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 3be1f650872bf7..db21fdca32ba5b 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 41a65b560101dd..893f3680194183 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -887,7 +887,7 @@ server cluster SoftwareDiagnostics = 52 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -899,7 +899,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index f0f6bbd16478d9..7f5d6b13b6277f 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -4617,7 +4617,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4669,7 +4669,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4681,7 +4681,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index c0273c715dbac3..9650875ac1705a 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -803,7 +803,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index 7050ceee78f222..54f47666dbe4c8 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index dc4e9b8436caac..63478a389abacd 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -952,7 +952,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index d7a25a383c47cf..bbb0c0cd734d79 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 79850905e39b05..11ea8ba2b34c46 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -803,7 +803,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index f0ae9d5c3b6428..762194fd8ad6a1 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 235539e4fdd249..449f3eee65a830 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -952,7 +952,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 7a59d1ee65a920..1262c4cc74ad3b 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 9020bec3f2ec1b..03656c119c18ac 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -807,7 +807,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -819,7 +819,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 04e16096fc3e0c..606234eb628c0b 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -4665,7 +4665,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4717,7 +4717,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4729,7 +4729,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 62c4c0b5bd6e7c..b25d9ff8f24c16 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -816,7 +816,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 353ec8d49187f0..a906e41246cf76 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index eb919dbf3f616a..d530b3bc132b4a 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -945,7 +945,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -957,7 +957,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index fa8d959973abbe..84283fedb10e2c 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 0385a52b5eea69..df49dee1371a48 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -816,7 +816,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 719453021ec0c5..cc514f48c8e117 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 4679c7372cc051..fd1ec1e0b50ef6 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -816,7 +816,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 40c284a542950e..5695311d5c863d 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 8e0f664bbfb80a..e4a20891e8fa45 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -816,7 +816,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 0e78cb4ea11bbf..3c9434f8a96a12 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 6487d8282734da..5b35c319b46afd 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -952,7 +952,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -964,7 +964,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 054cec8921d7cb..853ea2338bcc7b 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index bbdb02e112217c..fa5eba629fd0e4 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -895,7 +895,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -907,7 +907,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 6c41d7cf399b6d..e13b9fd80ecad1 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 0d0be004b7917a..3190ff85961fd7 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -853,7 +853,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -865,7 +865,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 21a07b0ab4c377..840c952037046e 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 92465c448d8b6f..7e90f114561b49 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -821,7 +821,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -833,7 +833,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 4e6d4295e04cbf..1aaea5bc177e86 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index f215a3a2d10768..54f25f72a29ae7 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -943,7 +943,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -955,7 +955,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 2e6d208f3ae502..3a9b8f5f7642f4 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 66d192505a03cf..4698b1949f6393 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -816,7 +816,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -828,7 +828,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 6f351c86943bde..ce8db3d22c5b91 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 33153dde9206e8..1ef2b013c0f001 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -803,7 +803,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 1f95d0f30093d9..bfa8a28fa4a94c 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -4537,7 +4537,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4589,7 +4589,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4601,7 +4601,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 534b4de8d43e99..506df3fb6897a2 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -803,7 +803,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -815,7 +815,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 1481f7887acfbc..7c5b00a6a08671 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -4489,7 +4489,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4541,7 +4541,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/common/pigweed/rpc_services/Device.h b/examples/common/pigweed/rpc_services/Device.h index 758ecc9c454259..1427d48d391431 100644 --- a/examples/common/pigweed/rpc_services/Device.h +++ b/examples/common/pigweed/rpc_services/Device.h @@ -430,7 +430,7 @@ class Device : public pw_rpc::nanopb::Device::Service if (Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen() && Server::GetInstance().GetCommissioningWindowManager().CommissioningWindowStatusForCluster() != - app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kEnhancedWindowOpen) + app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kEnhancedWindowOpen) { // Cache values before closing to restore them after restart. app::DataModel::Nullable vendorId = Server::GetInstance().GetCommissioningWindowManager().GetOpenerVendorId(); @@ -444,7 +444,7 @@ class Device : public pw_rpc::nanopb::Device::Service } // Let other tasks possibly work since Commissioning window close/open are "heavy" if (Server::GetInstance().GetCommissioningWindowManager().CommissioningWindowStatusForCluster() != - app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen && + app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen && !vendorId.IsNull() && !fabricIndex.IsNull()) { DeviceLayer::StackLock lock; 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 89f8587c26f2d1..71330150836b03 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 @@ -1013,7 +1013,7 @@ server cluster EthernetNetworkDiagnostics = 55 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1025,7 +1025,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index cd9511da1bcea4..39c5cc7b1d8852 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -4585,7 +4585,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4637,7 +4637,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4649,7 +4649,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 923b7929e97c78..101ae1eb4c3468 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -1213,7 +1213,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1225,7 +1225,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index 44436d9cec3bb1..e7ea939cda1709 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -4029,7 +4029,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4097,7 +4097,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4109,7 +4109,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 b93957645d798a..dd255a60efd269 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 @@ -1263,7 +1263,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1275,7 +1275,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index f20217188b6e35..f4d7acc82b03be 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -4567,7 +4567,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4619,7 +4619,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4631,7 +4631,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 1b93e78f28bcdc..ecdbec61b1ff97 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1214,7 +1214,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1226,7 +1226,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 2243bafe025659..5c9c15454a060b 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -4585,7 +4585,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4637,7 +4637,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4649,7 +4649,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index fe090551eaa8d6..53fb163e4fc133 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -985,7 +985,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -997,7 +997,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 4e6583afa3d7ab..50ec3edd100560 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -4780,7 +4780,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4832,7 +4832,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4844,7 +4844,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 4786b06b8bf246..a1ceb85f7a3baf 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1087,7 +1087,7 @@ server cluster EthernetNetworkDiagnostics = 55 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1099,7 +1099,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 22ed9149422708..3dfa96fbb0e221 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -4463,7 +4463,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4515,7 +4515,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4527,7 +4527,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 59666de41b3671..1b82ba7c93dc7f 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 @@ -595,7 +595,7 @@ server cluster GeneralDiagnostics = 51 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -607,7 +607,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 2c6c4b3df449eb..8df05c3acbd561 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -2589,7 +2589,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -2623,7 +2623,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -2635,7 +2635,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 b4291c96c2ef8d..182bba623d3e1d 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 @@ -760,7 +760,7 @@ server cluster GeneralDiagnostics = 51 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -772,7 +772,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index c95e65fb19da5f..5397deced00235 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -2643,7 +2643,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -2677,7 +2677,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -2689,7 +2689,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 36d8a5bebaa6b0..054bff806f95cc 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1291,7 +1291,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1303,7 +1303,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 3c4241e1174bbe..4f3b0745b90fb6 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -3139,7 +3139,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -3191,7 +3191,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -3203,7 +3203,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 0c53527d0f5164..c9f51b58a50df2 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1268,7 +1268,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1280,7 +1280,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 0313ea00cb93f3..56cd5c6239ea6a 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -3339,7 +3339,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -3391,7 +3391,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -3403,7 +3403,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 55517bbc246f6f..d5ee3f283a4f4f 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -871,7 +871,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -883,7 +883,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index f590f49c579b05..17b63f8886062e 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -4587,7 +4587,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4655,7 +4655,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4667,7 +4667,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 6783ecf90163a5..ac5dbb5e03bed0 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 @@ -770,7 +770,7 @@ server cluster ThreadNetworkDiagnostics = 53 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -782,7 +782,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 0421cbf39d8f25..4b1963432df5a8 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -4535,7 +4535,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4603,7 +4603,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4615,7 +4615,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 13fb74571a8e7d..d1124c1bb885e3 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -608,7 +608,7 @@ server cluster EthernetNetworkDiagnostics = 55 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -620,7 +620,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index c88ca4581a57b6..3078500156336f 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -2519,7 +2519,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -2571,7 +2571,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -2583,7 +2583,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index d8557b71f47f4d..348b4e56f1a311 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1167,7 +1167,7 @@ server cluster EthernetNetworkDiagnostics = 55 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1179,7 +1179,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 5c874eb1042838..fb1b971e9c8919 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -4603,7 +4603,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4655,7 +4655,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4667,7 +4667,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 68dab6d6ff3d4a..048f9125d975e8 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1214,7 +1214,7 @@ server cluster EthernetNetworkDiagnostics = 55 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1226,7 +1226,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 0457316fa9d80e..465cfb35fc98e9 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -4413,7 +4413,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4465,7 +4465,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4477,7 +4477,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, 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 4146ebb2c13668..463c6fe32602da 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 @@ -1431,7 +1431,7 @@ server cluster Switch = 59 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1443,7 +1443,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute bitmap32 featureMap = 65532; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index e418a417012ff8..565fb7921fe529 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -4363,7 +4363,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4415,7 +4415,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -4427,7 +4427,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 0cb5222e9579a9..6f331998db67a4 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1223,7 +1223,7 @@ server cluster EthernetNetworkDiagnostics = 55 { } server cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1235,7 +1235,7 @@ server cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index f82d64a7b86bbf..c6f8927b377e11 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -5225,7 +5225,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -5293,7 +5293,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -5305,7 +5305,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h index 9650bc4712ad06..56437352d10126 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/access.h @@ -404,9 +404,9 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 0x0000003C, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ @@ -456,9 +456,9 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0x00000000, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 0x00000001, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 0x00000002, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 0x00000000, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 0x00000002, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 0x00000004, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ @@ -508,9 +508,9 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 471b9cad3665c2..b3770733b83476 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -709,7 +709,7 @@ { ZAP_SIMPLE_DEFAULT(3), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ - /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */ \ { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ @@ -1629,7 +1629,7 @@ /* AcceptedCommandList (index=48) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */\ /* AcceptedCommandList (index=50) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ @@ -2128,7 +2128,7 @@ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ .clusterId = 0x0000003C, \ .attributes = ZAP_ATTRIBUTE_INDEX(201), \ .attributeCount = 5, \ diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h index b608d4fe5dbf93..15aee97c4f20aa 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/gen_config.h @@ -251,7 +251,7 @@ #define EMBER_AF_PLUGIN_SWITCH_SERVER #define EMBER_AF_PLUGIN_SWITCH -// Use this macro to check if the server side of the AdministratorCommissioning cluster is included +// Use this macro to check if the server side of the Administrator Commissioning cluster is included #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h index 4901b15475745f..b9946f3ca9162d 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/access.h @@ -172,9 +172,9 @@ 0x00000031, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000031, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000033, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 0x0000003C, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 0x0000003C, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 0x0000003C, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 0x0000003C, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 0x0000003E, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ @@ -207,9 +207,9 @@ 0x00000006, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 0x00000008, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0x00000000, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0x00000000, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 0x00000001, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 0x00000002, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 0x00000000, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 0x00000001, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 0x00000002, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 0x00000000, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 0x00000002, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 0x00000004, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ @@ -242,9 +242,9 @@ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ kMatterAccessPrivilegeManage, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - kMatterAccessPrivilegeAdminister, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + kMatterAccessPrivilegeAdminister, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h index c65f1edfd2ee7b..2b26cf124fbd63 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/endpoint_config.h @@ -407,7 +407,7 @@ { ZAP_SIMPLE_DEFAULT(0), 0x0000FFFC, 4, ZAP_TYPE(BITMAP32), 0 }, /* FeatureMap */ \ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ - /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ { ZAP_EMPTY_DEFAULT(), 0x00000000, 1, ZAP_TYPE(ENUM8), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* WindowStatus */ \ { ZAP_EMPTY_DEFAULT(), 0x00000001, 1, ZAP_TYPE(FABRIC_IDX), \ ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) | ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* AdminFabricIndex */ \ @@ -651,7 +651,7 @@ /* AcceptedCommandList (index=45) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ - /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */\ /* AcceptedCommandList (index=47) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ @@ -944,7 +944,7 @@ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */ \ + /* Endpoint: 0, Cluster: Administrator Commissioning (server) */ \ .clusterId = 0x0000003C, \ .attributes = ZAP_ATTRIBUTE_INDEX(182), \ .attributeCount = 5, \ diff --git a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h index 65903e9971cc7c..dc78b319e23cb1 100644 --- a/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h +++ b/scripts/tools/zap/tests/outputs/lighting-app/app-templates/gen_config.h @@ -162,7 +162,7 @@ #define EMBER_AF_PLUGIN_SWITCH_SERVER #define EMBER_AF_PLUGIN_SWITCH -// Use this macro to check if the server side of the AdministratorCommissioning cluster is included +// Use this macro to check if the server side of the Administrator Commissioning cluster is included #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_SERVER #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING diff --git a/src/app/server/AppDelegate.h b/src/app/server/AppDelegate.h index 49937c62d7168e..dbd1d42c7a4828 100644 --- a/src/app/server/AppDelegate.h +++ b/src/app/server/AppDelegate.h @@ -33,7 +33,9 @@ class AppDelegate * This is called anytime a basic or enhanced commissioning window is opened. * * The type of the window can be retrieved by calling - * CommissioningWindowManager::CommissioningWindowStatus() + * CommissioningWindowManager::CommissioningWindowStatusForCluster(), but + * being careful about how to handle the None status when a window is in + * fact open. */ virtual void OnCommissioningWindowOpened() {} virtual void OnCommissioningWindowClosed() {} diff --git a/src/app/server/CommissioningWindowManager.cpp b/src/app/server/CommissioningWindowManager.cpp index 6ce32d01bbbfa2..a899179c85e545 100644 --- a/src/app/server/CommissioningWindowManager.cpp +++ b/src/app/server/CommissioningWindowManager.cpp @@ -28,7 +28,7 @@ using namespace chip::app::Clusters; using namespace chip::System::Clock; -using AdministratorCommissioning::CommissioningWindowStatus; +using AdministratorCommissioning::CommissioningWindowStatusEnum; using chip::app::DataModel::MakeNullable; using chip::app::DataModel::Nullable; using chip::app::DataModel::NullNullable; @@ -106,7 +106,7 @@ void CommissioningWindowManager::ResetState() } #endif - UpdateWindowStatus(CommissioningWindowStatus::kWindowNotOpen); + UpdateWindowStatus(CommissioningWindowStatusEnum::kWindowNotOpen); UpdateOpenerFabricIndex(NullNullable); UpdateOpenerVendorId(NullNullable); @@ -368,7 +368,7 @@ void CommissioningWindowManager::CloseCommissioningWindow() } } -CommissioningWindowStatus CommissioningWindowManager::CommissioningWindowStatusForCluster() const +CommissioningWindowStatusEnum CommissioningWindowManager::CommissioningWindowStatusForCluster() const { // If the condition we use to determine whether we were opened via the // cluster ever changes, make sure whatever code affects that condition @@ -377,7 +377,7 @@ CommissioningWindowStatus CommissioningWindowManager::CommissioningWindowStatusF if (mOpenerVendorId.IsNull()) { // Not opened via the cluster. - return CommissioningWindowStatus::kWindowNotOpen; + return CommissioningWindowStatusEnum::kWindowNotOpen; } return mWindowStatus; @@ -385,7 +385,7 @@ CommissioningWindowStatus CommissioningWindowManager::CommissioningWindowStatusF bool CommissioningWindowManager::IsCommissioningWindowOpen() const { - return mWindowStatus != CommissioningWindowStatus::kWindowNotOpen; + return mWindowStatus != CommissioningWindowStatusEnum::kWindowNotOpen; } void CommissioningWindowManager::OnFabricRemoved(FabricIndex removedIndex) @@ -409,9 +409,9 @@ Dnssd::CommissioningMode CommissioningWindowManager::GetCommissioningMode() cons switch (mWindowStatus) { - case CommissioningWindowStatus::kEnhancedWindowOpen: + case CommissioningWindowStatusEnum::kEnhancedWindowOpen: return Dnssd::CommissioningMode::kEnabledEnhanced; - case CommissioningWindowStatus::kBasicWindowOpen: + case CommissioningWindowStatusEnum::kBasicWindowOpen: return Dnssd::CommissioningMode::kEnabledBasic; default: return Dnssd::CommissioningMode::kDisabled; @@ -442,11 +442,11 @@ CHIP_ERROR CommissioningWindowManager::StartAdvertisement() if (mUseECM) { - UpdateWindowStatus(CommissioningWindowStatus::kEnhancedWindowOpen); + UpdateWindowStatus(CommissioningWindowStatusEnum::kEnhancedWindowOpen); } else { - UpdateWindowStatus(CommissioningWindowStatus::kBasicWindowOpen); + UpdateWindowStatus(CommissioningWindowStatusEnum::kBasicWindowOpen); } if (mAppDelegate != nullptr) @@ -537,10 +537,10 @@ void CommissioningWindowManager::ExpireFailSafeIfArmed() } } -void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatus aNewStatus) +void CommissioningWindowManager::UpdateWindowStatus(CommissioningWindowStatusEnum aNewStatus) { - CommissioningWindowStatus oldClusterStatus = CommissioningWindowStatusForCluster(); - mWindowStatus = aNewStatus; + CommissioningWindowStatusEnum oldClusterStatus = CommissioningWindowStatusForCluster(); + mWindowStatus = aNewStatus; if (CommissioningWindowStatusForCluster() != oldClusterStatus) { // The Administrator Commissioning cluster is always on the root endpoint. @@ -553,7 +553,7 @@ void CommissioningWindowManager::UpdateOpenerVendorId(Nullable aNewOpe { // Changing the opener vendor id affects what // CommissioningWindowStatusForCluster() returns. - CommissioningWindowStatus oldClusterStatus = CommissioningWindowStatusForCluster(); + CommissioningWindowStatusEnum oldClusterStatus = CommissioningWindowStatusForCluster(); if (mOpenerVendorId != aNewOpenerVendorId) { diff --git a/src/app/server/CommissioningWindowManager.h b/src/app/server/CommissioningWindowManager.h index 4222830ad5def1..cfd13eecb06c11 100644 --- a/src/app/server/CommissioningWindowManager.h +++ b/src/app/server/CommissioningWindowManager.h @@ -91,7 +91,7 @@ class CommissioningWindowManager : public SessionEstablishmentDelegate, void CloseCommissioningWindow(); - app::Clusters::AdministratorCommissioning::CommissioningWindowStatus CommissioningWindowStatusForCluster() const; + app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum CommissioningWindowStatusForCluster() const; bool IsCommissioningWindowOpen() const; @@ -175,15 +175,15 @@ class CommissioningWindowManager : public SessionEstablishmentDelegate, * Helpers to ensure the right attribute reporting happens when our state is * updated. */ - void UpdateWindowStatus(app::Clusters::AdministratorCommissioning::CommissioningWindowStatus aNewStatus); + void UpdateWindowStatus(app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum aNewStatus); void UpdateOpenerVendorId(app::DataModel::Nullable aNewOpenerVendorId); void UpdateOpenerFabricIndex(app::DataModel::Nullable aNewOpenerFabricIndex); AppDelegate * mAppDelegate = nullptr; Server * mServer = nullptr; - app::Clusters::AdministratorCommissioning::CommissioningWindowStatus mWindowStatus = - app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen; + app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum mWindowStatus = + app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen; bool mIsBLE = true; diff --git a/src/app/tests/TestCommissionManager.cpp b/src/app/tests/TestCommissionManager.cpp index 7a05cbdeea7d4b..a1f5243e3bed8d 100644 --- a/src/app/tests/TestCommissionManager.cpp +++ b/src/app/tests/TestCommissionManager.cpp @@ -136,7 +136,7 @@ void CheckCommissioningWindowManagerBasicWindowOpenCloseTask(intptr_t context) NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().IsNull()); NL_TEST_ASSERT(suite, commissionMgr.GetOpenerVendorId().IsNull()); NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()); @@ -174,7 +174,7 @@ void CheckCommissioningWindowManagerBasicWindowOpenCloseFromClusterTask(intptr_t NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kBasicWindowOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kBasicWindowOpen); NL_TEST_ASSERT(suite, !commissionMgr.GetOpenerFabricIndex().IsNull()); NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().Value() == fabricIndex); NL_TEST_ASSERT(suite, !commissionMgr.GetOpenerVendorId().IsNull()); @@ -214,7 +214,7 @@ void CheckCommissioningWindowManagerWindowClosedTask(chip::System::Layer *, void NL_TEST_ASSERT(suite, !commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, !sWindowStatusDirty); NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty); NL_TEST_ASSERT(suite, !sAdminVendorIdDirty); @@ -237,7 +237,7 @@ void CheckCommissioningWindowManagerWindowTimeoutTask(intptr_t context) NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()); NL_TEST_ASSERT(suite, !sWindowStatusDirty); NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty); @@ -261,7 +261,7 @@ void SimulateFailedSessionEstablishmentTask(chip::System::Layer *, void * contex NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, !sWindowStatusDirty); NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty); NL_TEST_ASSERT(suite, !sAdminVendorIdDirty); @@ -271,7 +271,7 @@ void SimulateFailedSessionEstablishmentTask(chip::System::Layer *, void * contex NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, !sWindowStatusDirty); NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty); NL_TEST_ASSERT(suite, !sAdminVendorIdDirty); @@ -293,7 +293,7 @@ void CheckCommissioningWindowManagerWindowTimeoutWithSessionEstablishmentErrorsT NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()); NL_TEST_ASSERT(suite, !sWindowStatusDirty); NL_TEST_ASSERT(suite, !sAdminFabricIndexDirty); @@ -339,7 +339,7 @@ void CheckCommissioningWindowManagerEnhancedWindowTask(intptr_t context) NL_TEST_ASSERT(suite, commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kEnhancedWindowOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kEnhancedWindowOpen); NL_TEST_ASSERT(suite, !chip::DeviceLayer::ConnectivityMgr().IsBLEAdvertisingEnabled()); NL_TEST_ASSERT(suite, !commissionMgr.GetOpenerFabricIndex().IsNull()); NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().Value() == fabricIndex); @@ -358,7 +358,7 @@ void CheckCommissioningWindowManagerEnhancedWindowTask(intptr_t context) NL_TEST_ASSERT(suite, !commissionMgr.IsCommissioningWindowOpen()); NL_TEST_ASSERT(suite, commissionMgr.CommissioningWindowStatusForCluster() == - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus::kWindowNotOpen); + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum::kWindowNotOpen); NL_TEST_ASSERT(suite, commissionMgr.GetOpenerFabricIndex().IsNull()); NL_TEST_ASSERT(suite, commissionMgr.GetOpenerVendorId().IsNull()); NL_TEST_ASSERT(suite, sWindowStatusDirty); diff --git a/src/app/tests/suites/TestClusterMultiFabric.yaml b/src/app/tests/suites/TestClusterMultiFabric.yaml index d11f5f1d4715ed..852e9e51a9f5be 100644 --- a/src/app/tests/suites/TestClusterMultiFabric.yaml +++ b/src/app/tests/suites/TestClusterMultiFabric.yaml @@ -35,7 +35,7 @@ tests: - label: "Open Commissioning Window from alpha" endpoint: 0 - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestCommissionerNodeId.yaml b/src/app/tests/suites/TestCommissionerNodeId.yaml index 0b805c384ce8e3..39e1103d72007d 100644 --- a/src/app/tests/suites/TestCommissionerNodeId.yaml +++ b/src/app/tests/suites/TestCommissionerNodeId.yaml @@ -32,7 +32,7 @@ tests: value: nodeId - label: "Open Commissioning Window from alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -61,7 +61,7 @@ tests: value: nodeId - label: "Open Commissioning Window from alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestCommissioningWindow.yaml b/src/app/tests/suites/TestCommissioningWindow.yaml index 5ec5bc46f422e5..b28359081f65d0 100644 --- a/src/app/tests/suites/TestCommissioningWindow.yaml +++ b/src/app/tests/suites/TestCommissioningWindow.yaml @@ -20,7 +20,7 @@ config: type: node_id defaultValue: 0xCAFE endpoint: 0 - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" discriminator: type: int16u defaultValue: 3840 diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml index febff676e13b64..fc01f5c1cfef8b 100644 --- a/src/app/tests/suites/TestDiscovery.yaml +++ b/src/app/tests/suites/TestDiscovery.yaml @@ -54,7 +54,7 @@ tests: value: nodeId - label: "Open Commissioning Window with too-short timeout" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -65,7 +65,7 @@ tests: error: INVALID_COMMAND - label: "Open Commissioning Window with too-long timeout" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -76,7 +76,7 @@ tests: error: INVALID_COMMAND - label: "Open Commissioning Window" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -320,7 +320,7 @@ tests: value: nodeId - label: "Open Commissioning Window" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml b/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml index cdd8fded717805..e8a8342d36ae64 100644 --- a/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml +++ b/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml @@ -56,7 +56,7 @@ tests: minValue: 1 - label: "Open commissioning window from alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestGeneralCommissioning.yaml b/src/app/tests/suites/TestGeneralCommissioning.yaml index b42e6cb263e98e..01345d9dbe85d6 100644 --- a/src/app/tests/suites/TestGeneralCommissioning.yaml +++ b/src/app/tests/suites/TestGeneralCommissioning.yaml @@ -102,7 +102,7 @@ tests: value: 1 - label: "Open Commissioning Window from alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml index f13d2d0f65f706..b4806bedd3e5f3 100644 --- a/src/app/tests/suites/TestGroupMessaging.yaml +++ b/src/app/tests/suites/TestGroupMessaging.yaml @@ -259,7 +259,7 @@ tests: ] - label: "Open Commissioning Window from alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestMultiAdmin.yaml b/src/app/tests/suites/TestMultiAdmin.yaml index 4603834b5d4915..3f8c135c83a915 100644 --- a/src/app/tests/suites/TestMultiAdmin.yaml +++ b/src/app/tests/suites/TestMultiAdmin.yaml @@ -70,7 +70,7 @@ tests: error: FAILURE - label: "Open Commissioning Window from alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -101,12 +101,12 @@ tests: value: [{ "NodeID": nodeId }] - label: "Close Commissioning Window after failed commissioning" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" timedInteractionTimeoutMs: 10000 - label: "Open Commissioning Window from alpha again" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -136,7 +136,7 @@ tests: - label: "Open Commissioning Window from beta" identity: "beta" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml b/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml index ecda538f57fd55..86c850d922bca3 100644 --- a/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml +++ b/src/app/tests/suites/TestSubscribe_AdministratorCommissioning.yaml @@ -16,7 +16,7 @@ name: Subscribe Tests - Administrator Commissioning Cluster config: nodeId: 0x12344321 - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" endpoint: 0 ourVendorId: type: int16u diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml index 59e09a8dd7010f..10388d8833bda9 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml @@ -62,7 +62,7 @@ tests: - label: "Step 3:TH1 puts DUT into commissioning mode, TH2 commissions DUT using admin node ID N2" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml index dfa1dbcf72fcc1..a76bdfabd4278e 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml @@ -72,7 +72,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" PICS: CADMIN.S.C01.Rsp timedInteractionTimeoutMs: 10000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml index 886481db376132..eb4342ee8f8b19 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml @@ -70,7 +70,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -139,7 +139,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -179,7 +179,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -200,7 +200,7 @@ tests: set in step 5, TH_CR1 opens a 2nd commissioning window on DUT_CE using a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using ECM" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -249,7 +249,7 @@ tests: "TH_CR1 re-opens a commissioning window on DUT_CE using a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM" PICS: CADMIN.S.C01.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -285,7 +285,7 @@ tests: commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM" PICS: CADMIN.S.C01.Rsp identity: "gamma" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -324,7 +324,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM" PICS: CADMIN.S.C01.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -338,7 +338,7 @@ tests: a commissioning timeout of PIXIT.CADMIN.CwDuration seconds using BCM" PICS: CADMIN.S.C01.Rsp identity: "beta" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml index d7be6a30a4324e..2e460bf02af872 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml @@ -75,7 +75,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -85,7 +85,7 @@ tests: value: 180 - label: "TH_CR1 reads WindowStatus attribute from DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -228,7 +228,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -259,7 +259,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -270,7 +270,7 @@ tests: - label: "TH_CR1 opens a 2nd commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C00.Rsp @@ -317,7 +317,7 @@ tests: - label: "TH_CR1 re-opens new commissioning window on DUT_CE using ECM" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C00.Rsp @@ -335,7 +335,7 @@ tests: value: "SPAKE2P Key Salt" - label: "TH_CR1 reads WindowStatus attribute from DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -372,7 +372,7 @@ tests: - label: "TH_CR3 opens a 2nd commissioning window on DUT_CE" identity: "gamma" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C00.Rsp @@ -419,7 +419,7 @@ tests: - label: "TH_CR1 opens a new commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C00.Rsp @@ -438,7 +438,7 @@ tests: - label: "TH_CR2 opens a 2nd commissioning window on DUT_CE using ECM" identity: "beta" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C00.Rsp @@ -467,7 +467,7 @@ tests: value: 180000 - label: "TH_CR1 reads WindowStatus attribute from DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -475,7 +475,7 @@ tests: value: 0 - label: "TH_CR1 reads AdminFabricIndex attribute from DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "AdminFabricIndex" PICS: CADMIN.S.A0001 @@ -483,7 +483,7 @@ tests: value: null - label: "TH_CR1 reads AdminVendorId attribute from DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "AdminVendorId" PICS: CADMIN.S.A0002 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml index 9bf61682fbf04a..8988e74ce12330 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml @@ -70,7 +70,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM" identity: "alpha" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -111,7 +111,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM" identity: "alpha" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: @@ -261,7 +261,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using ECM" identity: "alpha" PICS: CADMIN.S.C00.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml index 67ba737a677130..b394dac2b2b550 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml @@ -67,7 +67,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -100,7 +100,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -213,7 +213,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM" identity: "alpha" PICS: CADMIN.S.C01.Rsp - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 arguments: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml index bf406e89eef9b5..daf266f2e8dc63 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml @@ -58,7 +58,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -77,7 +77,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -85,7 +85,7 @@ tests: value: 0 - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" PICS: CADMIN.S.C01.Rsp timedInteractionTimeoutMs: 10000 @@ -98,7 +98,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml index bf49318f426879..3ee200f35f5454 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml @@ -60,7 +60,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -87,7 +87,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -95,7 +95,7 @@ tests: value: 0 - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -116,7 +116,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml index af87d1682cadd6..331e7f07921cd3 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml @@ -58,7 +58,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" PICS: CADMIN.S.C01.Rsp timedInteractionTimeoutMs: 10000 @@ -77,7 +77,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -85,7 +85,7 @@ tests: value: 0 - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" PICS: CADMIN.S.C01.Rsp timedInteractionTimeoutMs: 10000 @@ -98,7 +98,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml index 6fea52d25582a4..4074198ae56331 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml @@ -60,7 +60,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -87,7 +87,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 @@ -95,7 +95,7 @@ tests: value: 0 - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -116,7 +116,7 @@ tests: - label: "TH_CR1 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "readAttribute" attribute: "WindowStatus" PICS: CADMIN.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml index ef066738f9ff4b..cfc054736ef1b2 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml @@ -63,7 +63,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -252,7 +252,7 @@ tests: maxLength: 32 - label: "TH_CR2 opens a commissioning window on DUT_CE using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp identity: "beta" @@ -280,7 +280,7 @@ tests: - label: "TH_CR2 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" PICS: CADMIN.S.A0000 command: "readAttribute" attribute: "WindowStatus" @@ -288,7 +288,7 @@ tests: value: 0 - label: "TH_CR2 opens a commissioning window on DUT_CE using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp identity: "beta" diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml index 8b47aa85724201..411c0b85faccf6 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml @@ -61,7 +61,7 @@ tests: value: nodeId - label: "TH_CR1 opens a commissioning window on DUT_CE using BCM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" PICS: CADMIN.S.C01.Rsp timedInteractionTimeoutMs: 10000 @@ -239,7 +239,7 @@ tests: maxLength: 32 - label: "TH_CR2 opens a commissioning window on DUT_CE using BCM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" identity: "beta" PICS: CADMIN.S.C01.Rsp @@ -259,7 +259,7 @@ tests: - label: "TH_CR2 reads the window status to verify the DUT_CE window is closed" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" PICS: CADMIN.S.A0000 command: "readAttribute" attribute: "WindowStatus" @@ -267,7 +267,7 @@ tests: value: 0 - label: "TH_CR2 opens a commissioning window on DUT_CE using BCM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" identity: "beta" PICS: CADMIN.S.C01.Rsp diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml index d875e904cd0754..ffca897082c8ea 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml @@ -74,7 +74,7 @@ tests: value: nodeId - label: "TH_CR1 opens a new commissioning window on DUT_CE using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -136,7 +136,7 @@ tests: error: FAILURE - label: "TH_CR1 opens a new commissioning window on DUT_CE using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -154,7 +154,7 @@ tests: value: "SPAKE2P Key Salt" - label: "TH_CR1 revokes the commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" PICS: CADMIN.S.C02.Rsp timedInteractionTimeoutMs: 10000 @@ -174,7 +174,7 @@ tests: error: FAILURE - label: "TH_CR1 revokes the commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" PICS: CADMIN.S.C02.Rsp timedInteractionTimeoutMs: 10000 @@ -200,7 +200,7 @@ tests: - label: "TH_CR1 opens a new commissioning window on DUT_CE using wrong PakeVerifier value using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -221,7 +221,7 @@ tests: clusterError: 3 - label: "TH_CR1 opens a new commissioning window on DUT_CE using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -239,7 +239,7 @@ tests: value: "SPAKE2P Key Salt" - label: "TH_CR1 opens another commissioning window on DUT_CE using ECM" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" PICS: CADMIN.S.C00.Rsp timedInteractionTimeoutMs: 10000 @@ -284,7 +284,7 @@ tests: - label: "TH_CR1 tries to revoke the commissioning window on DUT_CE using RevokeCommissioning command" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" PICS: CADMIN.S.C02.Rsp timedInteractionTimeoutMs: 10000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml index d0b35b4ab4988c..ac2783fb867155 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml @@ -70,7 +70,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -130,7 +130,7 @@ tests: error: FAILURE - label: "TH_CR1 opens a commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -140,7 +140,7 @@ tests: value: 180 - label: "TH_CR1 revokes the commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" PICS: CADMIN.S.C02.Rsp timedInteractionTimeoutMs: 10000 @@ -159,7 +159,7 @@ tests: error: FAILURE - label: "TH_CR1 revokes the commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C02.Rsp @@ -186,7 +186,7 @@ tests: - label: "TH_CR1 opens a commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -197,7 +197,7 @@ tests: - label: "TH_CR1 opens another commissioning window on DUT_CE" identity: "alpha" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenBasicCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C01.Rsp @@ -233,7 +233,7 @@ tests: - label: "TH_CR1 tries to revoke the commissioning window on DUT_CE using RevokeCommissioning command" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "RevokeCommissioning" PICS: CADMIN.S.C02.Rsp timedInteractionTimeoutMs: 10000 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml index 271bff73b81104..61c352e1920877 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml @@ -74,7 +74,7 @@ tests: value: nodeId - label: "TH_CR1 opens a new commissioning window on DUT_CE" - cluster: "AdministratorCommissioning" + cluster: "Administrator Commissioning" command: "OpenCommissioningWindow" timedInteractionTimeoutMs: 10000 PICS: CADMIN.S.C00.Rsp diff --git a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml index ede89c9600affe..aa34ca9828508d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/administrator-commissioning-cluster.xml @@ -24,7 +24,7 @@ limitations under the License. - + @@ -32,13 +32,13 @@ limitations under the License. - AdministratorCommissioning + Administrator Commissioning General 0x003c ADMINISTRATOR_COMMISSIONING_CLUSTER Commands to trigger a Node to allow a new Administrator to commission it. - WindowStatus + WindowStatus AdminFabricIndex AdminVendorId diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index e265c5f9a00222..5d2b71245f2d31 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -108,7 +108,7 @@ "TargetsPerAccessControlEntry", "AccessControlEntriesPerFabric" ], - "AdministratorCommissioning": [ + "Administrator Commissioning": [ "WindowStatus", "AdminFabricIndex", "AdminVendorId" diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 2f106b8eab2fa5..2208625738e146 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -102,7 +102,7 @@ "TargetsPerAccessControlEntry", "AccessControlEntriesPerFabric" ], - "AdministratorCommissioning": [ + "Administrator Commissioning": [ "WindowStatus", "AdminFabricIndex", "AdminVendorId" diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 43271ab64f42a0..4cdbb8c4a883d6 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1769,7 +1769,7 @@ client cluster Switch = 59 { } client cluster AdministratorCommissioning = 60 { - enum CommissioningWindowStatus : ENUM8 { + enum CommissioningWindowStatusEnum : ENUM8 { kWindowNotOpen = 0; kEnhancedWindowOpen = 1; kBasicWindowOpen = 2; @@ -1781,7 +1781,7 @@ client cluster AdministratorCommissioning = 60 { kWindowNotOpen = 4; } - readonly attribute CommissioningWindowStatus windowStatus = 0; + readonly attribute CommissioningWindowStatusEnum windowStatus = 0; readonly attribute nullable fabric_idx adminFabricIndex = 1; readonly attribute nullable int16u adminVendorId = 2; readonly attribute command_id generatedCommandList[] = 65528; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 15ddb88707a840..a7bae8bd29abf7 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -7959,7 +7959,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -8011,7 +8011,7 @@ ] }, { - "name": "AdministratorCommissioning", + "name": "Administrator Commissioning", "code": 60, "mfgCode": null, "define": "ADMINISTRATOR_COMMISSIONING_CLUSTER", @@ -8023,7 +8023,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "CommissioningWindowStatus", + "type": "CommissioningWindowStatusEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 12be11841c9b74..44048a0213cb8e 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -11226,7 +11226,7 @@ class AdministratorCommissioning(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="windowStatus", Tag=0x00000000, Type=AdministratorCommissioning.Enums.CommissioningWindowStatus), + ClusterObjectFieldDescriptor(Label="windowStatus", Tag=0x00000000, Type=AdministratorCommissioning.Enums.CommissioningWindowStatusEnum), ClusterObjectFieldDescriptor(Label="adminFabricIndex", Tag=0x00000001, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="adminVendorId", Tag=0x00000002, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), @@ -11236,7 +11236,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - windowStatus: 'AdministratorCommissioning.Enums.CommissioningWindowStatus' = None + windowStatus: 'AdministratorCommissioning.Enums.CommissioningWindowStatusEnum' = None adminFabricIndex: 'typing.Union[Nullable, uint]' = None adminVendorId: 'typing.Union[Nullable, uint]' = None generatedCommandList: 'typing.List[uint]' = None @@ -11246,7 +11246,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class CommissioningWindowStatus(IntEnum): + class CommissioningWindowStatusEnum(IntEnum): kWindowNotOpen = 0x00 kEnhancedWindowOpen = 0x01 kBasicWindowOpen = 0x02 @@ -11339,9 +11339,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=AdministratorCommissioning.Enums.CommissioningWindowStatus) + return ClusterObjectFieldDescriptor(Type=AdministratorCommissioning.Enums.CommissioningWindowStatusEnum) - value: 'AdministratorCommissioning.Enums.CommissioningWindowStatus' = 0 + value: 'AdministratorCommissioning.Enums.CommissioningWindowStatusEnum' = 0 @dataclass class AdminFabricIndex(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 325c4cb33f8730..ff3a4e8bca9423 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3108,7 +3108,10 @@ - GranularityEnum - TimeSourceEnum AdministratorCommissioning: - - CommissioningWindowStatus + # CommissioningWindowStatusEnum was originally just named + # CommissioningWindowStatus, but we generate the same API for both + # of those names, so the name can just change here. + - CommissioningWindowStatusEnum - StatusCode OperationalCredentials: - OperationalCertStatus @@ -3532,7 +3535,10 @@ - Ptp - Gnss AdministratorCommissioning: - CommissioningWindowStatus: + # CommissioningWindowStatusEnum was originally just named + # CommissioningWindowStatus, but we generate the same API for both + # of those names, so the name can just change here. + CommissioningWindowStatusEnum: - WindowNotOpen - EnhancedWindowOpen - BasicWindowOpen diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 25611a8a442aa9..da0c4f63840736 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -5894,7 +5894,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @end /** - * Cluster AdministratorCommissioning + * Cluster Administrator Commissioning * * Commands to trigger a Node to allow a new Administrator to commission it. */ diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 20c4855392e385..66eacc15acbf73 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -39516,7 +39516,7 @@ - (void)readAttributeWindowStatusWithCompletion:(void (^)(NSNumber * _Nullable v { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -39526,7 +39526,7 @@ - (void)subscribeAttributeWindowStatusWithParams:(MTRSubscribeParams * _Nonnull) reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -39536,9 +39536,9 @@ + (void)readAttributeWindowStatusWithClusterStateCache:(MTRClusterStateCacheCont queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = AdministratorCommissioning::Attributes::WindowStatus::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 1c25c0ef1a88ec..4cb75725460a05 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -334,10 +334,10 @@ typedef void (*TimeSynchronizationClusterTimeSourceEnumAttributeCallback)(void * chip::app::Clusters::TimeSynchronization::TimeSourceEnum); typedef void (*NullableTimeSynchronizationClusterTimeSourceEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*AdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback)( - void *, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus); -typedef void (*NullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*AdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback)( + void *, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum); +typedef void (*NullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*AdministratorCommissioningClusterStatusCodeAttributeCallback)( void *, chip::app::Clusters::AdministratorCommissioning::StatusCode); typedef void (*NullableAdministratorCommissioningClusterStatusCodeAttributeCallback)( @@ -15422,77 +15422,78 @@ class MTRNullableTimeSynchronizationClusterTimeSourceEnumAttributeCallbackSubscr MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value); }; -class MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge - : public MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge +class MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge + : public MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge { public: - MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge( + MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(queue, handler, action), + MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnDone; + using MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge( + MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( queue, handler, action, OnSuccessFn){}; static void OnSuccessFn( void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & + value); }; -class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge - : public MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge +class MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge + : public MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge { public: - MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge( + MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnDone; + using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 7166c12708cb8e..85f1ae4023bc2b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -15810,15 +15810,16 @@ } } -void MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value) +void MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge:: + OnSubscriptionEstablished() { if (!mQueue) { return; @@ -15833,8 +15834,8 @@ } } -void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value) +void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -15845,7 +15846,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusAttributeCallbackSubscriptionBridge:: +void MTRNullableAdministratorCommissioningClusterCommissioningWindowStatusEnumAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index cfbd8aec4912f1..8339e86709ddd0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2163,7 +2163,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @end /** - * Cluster AdministratorCommissioning + * Cluster Administrator Commissioning * Commands to trigger a Node to allow a new Administrator to commission it. */ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) diff --git a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h index 2c74408c647fe6..a0523bc6f43433 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attribute-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/attribute-id.h @@ -468,7 +468,7 @@ #define ZCL_CURRENT_POSITION_ATTRIBUTE_ID (0x0001) #define ZCL_MULTI_PRESS_MAX_ATTRIBUTE_ID (0x0002) -// Attribute ids for cluster: AdministratorCommissioning +// Attribute ids for cluster: Administrator Commissioning // Client attributes diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index f5db0cc7616674..eb90412e93e6ac 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -10293,9 +10293,9 @@ namespace Attributes { namespace WindowStatus { -EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = @@ -10308,9 +10308,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::app::Clusters::AdministratorC *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index a495ef2f9b0ef5..e79261c6aca364 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1773,9 +1773,10 @@ namespace AdministratorCommissioning { namespace Attributes { namespace WindowStatus { -EmberAfStatus Get(chip::EndpointId endpoint, - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus * value); // CommissioningWindowStatus -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value); +EmberAfStatus +Get(chip::EndpointId endpoint, + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum * value); // CommissioningWindowStatusEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value); } // namespace WindowStatus namespace AdminFabricIndex { diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index 268c988101ca59..e29537c05b2441 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -282,7 +282,7 @@ void emberAfBridgedDeviceBasicInformationClusterInitCallback(chip::EndpointId en */ void emberAfSwitchClusterInitCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Init +/** @brief Administrator Commissioning Cluster Init * * Cluster Init * @@ -3600,10 +3600,10 @@ void emberAfSwitchClusterServerTickCallback(chip::EndpointId endpoint); void emberAfSwitchClusterClientTickCallback(chip::EndpointId endpoint); // -// AdministratorCommissioning Cluster +// Administrator Commissioning Cluster // -/** @brief AdministratorCommissioning Cluster Server Init +/** @brief Administrator Commissioning Cluster Server Init * * Server Init * @@ -3611,7 +3611,7 @@ void emberAfSwitchClusterClientTickCallback(chip::EndpointId endpoint); */ void emberAfAdministratorCommissioningClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Client Init +/** @brief Administrator Commissioning Cluster Client Init * * Client Init * @@ -3619,7 +3619,7 @@ void emberAfAdministratorCommissioningClusterServerInitCallback(chip::EndpointId */ void emberAfAdministratorCommissioningClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Server Attribute Changed +/** @brief Administrator Commissioning Cluster Server Attribute Changed * * Server Attribute Changed * @@ -3627,7 +3627,7 @@ void emberAfAdministratorCommissioningClusterClientInitCallback(chip::EndpointId */ void MatterAdministratorCommissioningClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief AdministratorCommissioning Cluster Server Message Sent +/** @brief Administrator Commissioning Cluster Server Message Sent * * Server Message Sent * @@ -3641,7 +3641,7 @@ void emberAfAdministratorCommissioningClusterServerMessageSentCallback(const chi EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); -/** @brief AdministratorCommissioning Cluster Client Message Sent +/** @brief Administrator Commissioning Cluster Client Message Sent * * Client Message Sent * @@ -3655,7 +3655,7 @@ void emberAfAdministratorCommissioningClusterClientMessageSentCallback(const chi EmberApsFrame * apsFrame, uint16_t msgLen, uint8_t * message, EmberStatus status); -/** @brief AdministratorCommissioning Cluster Server Pre Attribute Changed +/** @brief Administrator Commissioning Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -3667,7 +3667,7 @@ void emberAfAdministratorCommissioningClusterClientMessageSentCallback(const chi chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningClusterServerPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief AdministratorCommissioning Cluster Client Pre Attribute Changed +/** @brief Administrator Commissioning Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -3679,7 +3679,7 @@ chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningCluste chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningClusterClientPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief AdministratorCommissioning Cluster Server Tick +/** @brief Administrator Commissioning Cluster Server Tick * * Server Tick * @@ -3687,7 +3687,7 @@ chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningCluste */ void emberAfAdministratorCommissioningClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Client Tick +/** @brief Administrator Commissioning Cluster Client Tick * * Client Tick * @@ -8081,19 +8081,19 @@ bool emberAfTimeSynchronizationClusterSetUtcTimeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::TimeSynchronization::Commands::SetUtcTime::DecodableType & commandData); /** - * @brief AdministratorCommissioning Cluster OpenCommissioningWindow Command callback (from client) + * @brief Administrator Commissioning Cluster OpenCommissioningWindow Command callback (from client) */ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::DecodableType & commandData); /** - * @brief AdministratorCommissioning Cluster OpenBasicCommissioningWindow Command callback (from client) + * @brief Administrator Commissioning Cluster OpenBasicCommissioningWindow Command callback (from client) */ bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::DecodableType & commandData); /** - * @brief AdministratorCommissioning Cluster RevokeCommissioning Command callback (from client) + * @brief Administrator Commissioning Cluster RevokeCommissioning Command callback (from client) */ bool emberAfAdministratorCommissioningClusterRevokeCommissioningCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, 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 e5cdd39354d065..4e6daeb8fc0218 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 @@ -1016,9 +1016,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(TimeSynchronization::Ti } } -static auto __attribute__((unused)) EnsureKnownEnumValue(AdministratorCommissioning::CommissioningWindowStatus val) +static auto __attribute__((unused)) EnsureKnownEnumValue(AdministratorCommissioning::CommissioningWindowStatusEnum val) { - using EnumType = AdministratorCommissioning::CommissioningWindowStatus; + using EnumType = AdministratorCommissioning::CommissioningWindowStatusEnum; switch (val) { case EnumType::kWindowNotOpen: 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 20b0596d737ed5..1001319b4c236e 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 @@ -945,8 +945,8 @@ enum class SwitchFeature : uint32_t namespace AdministratorCommissioning { -// Enum for CommissioningWindowStatus -enum class CommissioningWindowStatus : uint8_t +// Enum for CommissioningWindowStatusEnum +enum class CommissioningWindowStatusEnum : uint8_t { kWindowNotOpen = 0x00, kEnhancedWindowOpen = 0x01, 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 3c5f9449e97014..c796ee3375ff22 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 @@ -11158,9 +11158,9 @@ namespace Attributes { namespace WindowStatus { struct TypeInfo { - using Type = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus; - using DecodableType = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus; - using DecodableArgType = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus; + using Type = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum; + using DecodableType = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum; + using DecodableArgType = chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum; static constexpr ClusterId GetClusterId() { return Clusters::AdministratorCommissioning::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::WindowStatus::Id; } @@ -11231,7 +11231,7 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); Attributes::WindowStatus::TypeInfo::DecodableType windowStatus = - static_cast(0); + static_cast(0); Attributes::AdminFabricIndex::TypeInfo::DecodableType adminFabricIndex; Attributes::AdminVendorId::TypeInfo::DecodableType adminVendorId; Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index 7caa52c0d19bdb..5c02c7c6f6ab24 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -156,7 +156,7 @@ // Commands for cluster: Time Synchronization #define ZCL_SET_UTC_TIME_COMMAND_ID (0x00) -// Commands for cluster: AdministratorCommissioning +// Commands for cluster: Administrator Commissioning #define ZCL_OPEN_COMMISSIONING_WINDOW_COMMAND_ID (0x00) #define ZCL_OPEN_BASIC_COMMISSIONING_WINDOW_COMMAND_ID (0x01) #define ZCL_REVOKE_COMMISSIONING_COMMAND_ID (0x02) diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index ed7dedb5a5d63b..d4beeec2e80ec5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -226,7 +226,7 @@ #if defined(ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_SERVER) || defined(ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT) #define CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER \ - { chip::app::Clusters::AdministratorCommissioning::Id, "AdministratorCommissioning" }, + { chip::app::Clusters::AdministratorCommissioning::Id, "Administrator Commissioning" }, #else #define CHIP_PRINTCLUSTER_ADMINISTRATOR_COMMISSIONING_CLUSTER #endif 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 11de491ab85d35..f02cb5790831b0 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6407,7 +6407,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP switch (path.mAttributeId) { case AdministratorCommissioning::Attributes::WindowStatus::Id: { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("WindowStatus", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index aa73655fe4afbc..68f0a27b578c48 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -71576,7 +71576,7 @@ class TestCommissioningWindowSuite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -71603,7 +71603,7 @@ class TestCommissioningWindowSuite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 2U)); } @@ -71631,7 +71631,7 @@ class TestCommissioningWindowSuite : public TestCommand case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -71666,7 +71666,7 @@ class TestCommissioningWindowSuite : public TestCommand case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -71701,7 +71701,7 @@ class TestCommissioningWindowSuite : public TestCommand case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 2U)); } @@ -71734,7 +71734,7 @@ class TestCommissioningWindowSuite : public TestCommand case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 2U)); } @@ -73425,7 +73425,7 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -73436,7 +73436,7 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 2U)); } @@ -73448,7 +73448,7 @@ class TestSubscribe_AdministratorCommissioningSuite : public TestCommand case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -98343,7 +98343,7 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -98354,7 +98354,7 @@ class Test_TC_CADMIN_1_21Suite : public TestCommand case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -98520,7 +98520,7 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -98531,7 +98531,7 @@ class Test_TC_CADMIN_1_22Suite : public TestCommand case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -98826,7 +98826,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -99248,7 +99248,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -101186,7 +101186,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 2U)); } @@ -101266,7 +101266,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 1U)); } @@ -101325,7 +101325,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand case 26: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -101757,7 +101757,7 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -101768,7 +101768,7 @@ class Test_TC_CADMIN_1_23Suite : public TestCommand case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -101934,7 +101934,7 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } @@ -101945,7 +101945,7 @@ class Test_TC_CADMIN_1_24Suite : public TestCommand case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatus value; + chip::app::Clusters::AdministratorCommissioning::CommissioningWindowStatusEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("windowStatus", value, 0U)); } diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h index 0cd46e9f520462..4729fa584a8793 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h @@ -399,7 +399,7 @@ .generatedCommandList = nullptr ,\ },\ { \ - /* Endpoint: 1, Cluster: AdministratorCommissioning (client) */ \ + /* Endpoint: 1, Cluster: Administrator Commissioning (client) */ \ .clusterId = 0x0000003C, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h index b660cfc04b17a8..8918782d13bdde 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h @@ -214,7 +214,7 @@ #define ZCL_USING_SWITCH_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_SWITCH_CLIENT -// Use this macro to check if the client side of the AdministratorCommissioning cluster is included +// Use this macro to check if the client side of the Administrator Commissioning cluster is included #define ZCL_USING_ADMINISTRATOR_COMMISSIONING_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_ADMINISTRATOR_COMMISSIONING_CLIENT