From 624b49e5075981e3fddb60c3c6725123ee806f1d Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 17 Jan 2023 10:55:54 -0500 Subject: [PATCH] Regenerate generated code. --- .../all-clusters-app.matter | 4 +- .../all-clusters-minimal-app.matter | 4 +- .../bridge-common/bridge-app.matter | 4 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 4 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 4 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 +- .../rootnode_doorlock_aNKYAreMXE.matter | 4 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 4 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 4 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 4 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 4 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 4 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 4 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 4 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 4 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 4 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 4 +- .../rootnode_speaker_RpzeXdimqA.matter | 4 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 4 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 4 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 4 +- .../contact-sensor-app.matter | 4 +- .../bridge-common/bridge-app.matter | 4 +- .../light-switch-app.matter | 4 +- .../lighting-common/lighting-app.matter | 4 +- .../nxp/zap/lighting-on-off.matter | 4 +- examples/lock-app/lock-common/lock-app.matter | 4 +- .../ota-provider-app.matter | 4 +- .../ota-requestor-app.matter | 4 +- .../placeholder/linux/apps/app1/config.matter | 4 +- .../placeholder/linux/apps/app2/config.matter | 4 +- examples/pump-app/pump-common/pump-app.matter | 4 +- .../pump-controller-app.matter | 4 +- .../esp32/main/temperature-measurement.matter | 4 +- .../thermostat-common/thermostat.matter | 4 +- examples/tv-app/tv-common/tv-app.matter | 4 +- .../tv-casting-common/tv-casting-app.matter | 4 +- examples/window-app/common/window-app.matter | 4 +- .../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 +- .../data_model/controller-clusters.matter | 4 +- .../python/chip/clusters/Objects.py | 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 +- 66 files changed, 224 insertions(+), 221 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 453c4a425aaca8..b7377b90a7a0aa 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-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 41265fd93aa923..c87a5dd2e43f83 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/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 9a5e0494d24228..b92647fff4d5ad 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/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 1cc0aa78347c7e..7c2bbe9492877a 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/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 1895d3f6b39d6f..f100c9813ff72d 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_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index c69ee132add8c0..505b2546c3089c 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_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 27653cb1f7f9ad..9548cd3c32e804 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_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index ce5e5271e3d548..c1fba80b46d7cf 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_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 21f185e38eedc4..6d58995e39a552 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_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 5458817123f751..6f6a1819b26653 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_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 72618cd6321b30..58347c19160bfa 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_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 48469c89fffca6..af54f91690d9a3 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_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index f265729fd104df..ef9fc3d1530c7b 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_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index db7357e0ee1066..1cd177359dc6fd 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_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 0be99f3c8d0c9c..ec0bc397ff4fa8 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_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 59102bd916ab9f..0e61d7234e81e2 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_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index a7784c6df29601..be9d94e6d608e3 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_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 2c32faa6b37c00..ab21d862410f6c 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_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 1d12e24554afc5..40bbe6219b4cdd 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_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 7ae15fd75b220d..59094f380cc084 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_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 2049ec09dfdeac..34f3b16118bb03 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_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 27132a0f02235a..4627fa5519b805 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_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 58e6dd7c2391f1..caeb39e14b6331 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/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index 098518172743c1..75655d28ccf94a 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/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 9a5e0494d24228..b92647fff4d5ad 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/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index a192969c34f31d..2050b103505cf6 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/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 623877d919bb3c..09fd9b23942f7c 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/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index df1e83a77a9e4a..a06ca85ca35c7d 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/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 4813d33f6da103..caddb9f7711261 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/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 9fe993dff84b3b..cb00dd70e652ab 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-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index dd3281754047f5..3f29982ae3bd71 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/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 257de66ec153f0..c60542eb6a9f7d 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/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 74539476259918..caca04b5c3c7e2 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/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index baa135f952c490..6d5bd6525fdda7 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-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 263c0c8c257d2f..2948ae6b615ef2 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/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 3a70af9fcdc61a..630e5ddbcaaac8 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/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 754def5c8d2883..6ae1d3b0890740 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/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index c0918a5bcfa1b4..11de15df83c7ce 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-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 06af5df490777d..fb7480732ff0c8 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/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 58e3279f589036..00f9f687acffc7 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/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 8aa0931303b513..32ec519b87eb62 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 @@ 49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 51, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 60, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 60, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 60, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ @@ -456,9 +456,9 @@ 6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 0, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 1, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 2, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 4, /* 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 c7b4d3954fa04b..ff0ff83fdd8716 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 737f12fdc2d74c..b301a8eb0a1c01 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 @@ 49, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 51, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 60, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 60, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 60, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 60, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 60, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 60, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 62, /* Cluster: Operational Credentials, Command: CSRRequest, Privilege: administer */ \ @@ -207,9 +207,9 @@ 6, /* Cluster: Network Commissioning, Command: ConnectNetwork, Privilege: administer */ \ 8, /* Cluster: Network Commissioning, Command: ReorderNetwork, Privilege: administer */ \ 0, /* Cluster: General Diagnostics, Command: TestEventTrigger, Privilege: manage */ \ - 0, /* Cluster: AdministratorCommissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ - 1, /* Cluster: AdministratorCommissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ - 2, /* Cluster: AdministratorCommissioning, Command: RevokeCommissioning, Privilege: administer */ \ + 0, /* Cluster: Administrator Commissioning, Command: OpenCommissioningWindow, Privilege: administer */ \ + 1, /* Cluster: Administrator Commissioning, Command: OpenBasicCommissioningWindow, Privilege: administer */ \ + 2, /* Cluster: Administrator Commissioning, Command: RevokeCommissioning, Privilege: administer */ \ 0, /* Cluster: Operational Credentials, Command: AttestationRequest, Privilege: administer */ \ 2, /* Cluster: Operational Credentials, Command: CertificateChainRequest, Privilege: administer */ \ 4, /* 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 70cc6a4d50bc61..4f2eba9678e950 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/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index a4e66e691a0455..e07b9609911407 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/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 92cab8362db39a..52c5cdf3e39ba1 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/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 6122c5cfbb9052..efc3c639bcc12b 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 38e91ce6a7e511..932ad47962c271 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -39510,7 +39510,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()); } @@ -39520,7 +39520,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()); } @@ -39530,9 +39530,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 c3d79ef81d5c97..eabbe67a2eb92a 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)( @@ -15416,77 +15416,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 af6b57bc696872..bc2fe242920108 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -15809,15 +15809,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; @@ -15832,8 +15833,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()) { @@ -15844,7 +15845,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 c374d5bc9a260e..dcae0e33afcd19 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2183,7 +2183,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 cb7512e30ddd36..52855cc0073742 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 b14c05369fffce..6fdccf51cddcea 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 @@ -10259,9 +10259,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 = @@ -10274,9 +10274,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 2303534ce5f682..34d580fd6c2a6b 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 d646734249827d..15c1e7a777fd5f 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 emberAfBridgedDeviceBasicClusterInitCallback(chip::EndpointId endpoint); */ void emberAfSwitchClusterInitCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Init +/** @brief Administrator Commissioning Cluster Init * * Cluster Init * @@ -3599,10 +3599,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 * @@ -3610,7 +3610,7 @@ void emberAfSwitchClusterClientTickCallback(chip::EndpointId endpoint); */ void emberAfAdministratorCommissioningClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Client Init +/** @brief Administrator Commissioning Cluster Client Init * * Client Init * @@ -3618,7 +3618,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 * @@ -3626,7 +3626,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 * @@ -3640,7 +3640,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 * @@ -3654,7 +3654,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 * @@ -3666,7 +3666,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 * @@ -3678,7 +3678,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 * @@ -3686,7 +3686,7 @@ chip::Protocols::InteractionModel::Status MatterAdministratorCommissioningCluste */ void emberAfAdministratorCommissioningClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief AdministratorCommissioning Cluster Client Tick +/** @brief Administrator Commissioning Cluster Client Tick * * Client Tick * @@ -8080,19 +8080,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 495610c7455834..6e45220aceb3f3 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 ac289043df913b..bfae67476f983c 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 62a0fb93405645..e1990b22d6413b 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 a559ec1c8e2dfb..a5066517747cfd 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 @@ -224,7 +224,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 1545849d5e6b5b..65065a7d3ae6f1 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 d3b1c485fd4325..9b01a576fc4a7c 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -72021,7 +72021,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)); } @@ -72048,7 +72048,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)); } @@ -72076,7 +72076,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)); } @@ -72111,7 +72111,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)); } @@ -72146,7 +72146,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)); } @@ -72179,7 +72179,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)); } @@ -73870,7 +73870,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)); } @@ -73881,7 +73881,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)); } @@ -73893,7 +73893,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)); } @@ -98788,7 +98788,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)); } @@ -98799,7 +98799,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)); } @@ -98965,7 +98965,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)); } @@ -98976,7 +98976,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)); } @@ -99271,7 +99271,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)); } @@ -99693,7 +99693,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)); } @@ -101631,7 +101631,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)); } @@ -101711,7 +101711,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)); } @@ -101770,7 +101770,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)); } @@ -102202,7 +102202,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)); } @@ -102213,7 +102213,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)); } @@ -102379,7 +102379,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)); } @@ -102390,7 +102390,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 386b71a2725feb..b54dc285259f7c 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 439f069fe5a6c3..70fb62caf1fcfa 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