From 1267364f25b4de5af03c6ff4e639ae86b822ad5c Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 23 May 2023 12:01:23 -0400 Subject: [PATCH] Align General Commissioning cluster XML to spec changes. (#26732) * Align General Commissioning cluster XML to spec changes. Spec changes happened in https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6179 and https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6338 Fixes https://github.com/project-chip/connectedhomeip/issues/24997 * Auto-update ZAP files. * Regenerate generated files. --- .../all-clusters-app.matter | 16 +- .../all-clusters-common/all-clusters-app.zap | 7 +- .../all-clusters-minimal-app.matter | 16 +- .../all-clusters-minimal-app.zap | 6 +- .../bridge-common/bridge-app.matter | 16 +- .../bridge-app/bridge-common/bridge-app.zap | 7 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 16 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 7 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 16 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 7 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 16 +- .../rootnode_contactsensor_lFAGG1bfRO.zap | 7 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 16 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 7 +- .../rootnode_doorlock_aNKYAreMXE.matter | 16 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 7 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 16 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 7 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 16 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 7 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 16 +- .../rootnode_flowsensor_1zVxHedlaV.zap | 7 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 16 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 7 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 16 +- .../rootnode_humiditysensor_Xyj4gda6Hb.zap | 7 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 16 +- .../rootnode_lightsensor_lZQycTFcJK.zap | 7 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 16 +- .../rootnode_occupancysensor_iHyVgifZuo.zap | 7 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 16 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 7 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 16 +- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 7 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 16 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 7 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 16 +- .../rootnode_pressuresensor_s0qC9wLH4k.zap | 7 +- .../rootnode_speaker_RpzeXdimqA.matter | 16 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 7 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 16 +- .../rootnode_temperaturesensor_Qy1zkNW7c3.zap | 7 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 16 +- .../rootnode_thermostat_bm3fb8dhYi.zap | 7 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 16 +- .../rootnode_windowcovering_RLCxaGi9Yx.zap | 7 +- .../contact-sensor-app.matter | 16 +- .../contact-sensor-app.zap | 7 +- .../bridge-common/bridge-app.matter | 16 +- .../bridge-common/bridge-app.zap | 7 +- .../light-switch-app.matter | 16 +- .../light-switch-common/light-switch-app.zap | 7 +- .../data_model/lighting-app-thread.matter | 16 +- .../data_model/lighting-app-thread.zap | 7 +- .../data_model/lighting-app-wifi.matter | 16 +- .../data_model/lighting-app-wifi.zap | 7 +- .../lighting-common/lighting-app.matter | 16 +- .../lighting-common/lighting-app.zap | 7 +- .../nxp/zap/lighting-on-off.matter | 16 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 6 +- examples/lighting-app/qpg/zap/light.matter | 16 +- examples/lighting-app/qpg/zap/light.zap | 7 +- .../data_model/lighting-thread-app.matter | 16 +- .../efr32/data_model/lighting-thread-app.zap | 19 ++- .../efr32/data_model/lighting-wifi-app.matter | 16 +- .../efr32/data_model/lighting-wifi-app.zap | 7 +- examples/lock-app/lock-common/lock-app.matter | 16 +- examples/lock-app/lock-common/lock-app.zap | 7 +- examples/lock-app/nxp/zap/lock-app.matter | 16 +- examples/lock-app/nxp/zap/lock-app.zap | 6 +- examples/lock-app/qpg/zap/lock.matter | 16 +- examples/lock-app/qpg/zap/lock.zap | 7 +- .../log-source-common/log-source-app.matter | 12 +- .../log-source-common/log-source-app.zap | 3 +- .../ota-provider-app.matter | 16 +- .../ota-provider-common/ota-provider-app.zap | 7 +- .../ota-requestor-app.matter | 16 +- .../ota-requestor-app.zap | 7 +- .../placeholder/linux/apps/app1/config.matter | 32 ++-- .../placeholder/linux/apps/app1/config.zap | 7 +- .../placeholder/linux/apps/app2/config.matter | 32 ++-- .../placeholder/linux/apps/app2/config.zap | 7 +- examples/pump-app/pump-common/pump-app.matter | 16 +- examples/pump-app/pump-common/pump-app.zap | 6 +- .../pump-controller-app.matter | 16 +- .../pump-controller-app.zap | 6 +- .../temperature-measurement.matter | 16 +- .../temperature-measurement.zap | 7 +- .../thermostat-common/thermostat.matter | 16 +- .../thermostat-common/thermostat.zap | 11 +- examples/tv-app/tv-common/tv-app.matter | 32 ++-- examples/tv-app/tv-common/tv-app.zap | 13 +- .../tv-casting-common/tv-casting-app.matter | 16 +- .../tv-casting-common/tv-casting-app.zap | 13 +- examples/window-app/common/window-app.matter | 16 +- examples/window-app/common/window-app.zap | 7 +- .../zap/tests/inputs/all-clusters-app.zap | 6 +- .../tools/zap/tests/inputs/lighting-app.zap | 6 +- .../general-commissioning-server.cpp | 24 +-- .../chip/general-commissioning-cluster.xml | 16 +- src/controller/CHIPDeviceController.cpp | 14 +- src/controller/CommissioningDelegate.h | 32 ++-- .../data_model/controller-clusters.matter | 16 +- .../data_model/controller-clusters.zap | 27 ++-- .../java/CHIPDeviceController-JNI.cpp | 8 +- .../devicecontroller/ControllerParams.java | 8 +- .../python/chip/clusters/Objects.py | 36 ++--- .../commissioning_flow_blocks.py | 2 +- .../chip/utils/CommissioningBuildingBlocks.py | 8 +- .../python/test/test_scripts/base.py | 4 +- .../CHIP/templates/availability.yaml | 42 ++++- .../CHIP/zap-generated/MTRBaseClusters.mm | 16 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 150 +++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 25 +-- src/include/platform/ConfigurationManager.h | 2 +- .../Ameba/ConfigurationManagerImpl.cpp | 7 +- .../Darwin/ConfigurationManagerImpl.cpp | 4 +- .../ESP32/ConfigurationManagerImpl.cpp | 2 +- .../Linux/ConfigurationManagerImpl.cpp | 4 +- .../webos/ConfigurationManagerImpl.cpp | 4 +- src/python_testing/TC_CGEN_2_4.py | 16 +- .../zap-generated/cluster-enums-check.h | 8 +- .../app-common/zap-generated/cluster-enums.h | 8 +- .../zap-generated/cluster-objects.h | 32 ++-- .../zap-generated/cluster/Commands.h | 4 +- .../cluster/logging/DataModelLogger.cpp | 4 +- .../chip-tool/zap-generated/test/Commands.h | 4 +- 127 files changed, 848 insertions(+), 858 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 453ccbeb43063e..e7dd2a91cfd493 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 @@ -1256,7 +1256,7 @@ server cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1264,7 +1264,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1277,8 +1277,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1293,23 +1293,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 518a2fedd0f0a6..c8145f2aed189a 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -2967,7 +2967,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2983,7 +2983,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -25580,6 +25580,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] + ] } \ No newline at end of file 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 e2d103ea7bd982..7a0673a1258820 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 @@ -1112,7 +1112,7 @@ server cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1120,7 +1120,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1133,8 +1133,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1149,23 +1149,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 8ccacaf941e931..9b143d014c8d08 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2930,7 +2930,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2946,7 +2946,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index d558ae34047de1..d124f8ac6d96a3 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -651,7 +651,7 @@ server cluster UnitLocalization = 45 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -659,7 +659,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -672,8 +672,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -688,23 +688,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index c7f1b81a3f95d8..793efe840795bc 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -1561,7 +1561,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -1577,7 +1577,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7625,6 +7625,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 8ff93234ef2895..f877b18150cb75 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -667,7 +667,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -675,7 +675,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -688,8 +688,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -704,23 +704,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 3b9dacec8cd93b..4404009e1d74e2 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7514,6 +7514,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index ef9a4d53af6fe5..95535c1230eeb7 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -615,7 +615,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -623,7 +623,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -636,8 +636,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -652,23 +652,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index add54ac827902b..f13e181b9c6ff4 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8169,6 +8169,5 @@ "endpointVersion": 1, "deviceIdentifier": 268 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index a356d411099d0d..0640defe3eaa8d 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -518,7 +518,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -526,7 +526,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -539,8 +539,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -555,23 +555,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index c89f444b22f4e1..f3f1129523b420 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6319,6 +6319,5 @@ "endpointVersion": 1, "deviceIdentifier": 21 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index f486c7bfa6bcae..3b2901c8a7a177 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -667,7 +667,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -675,7 +675,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -688,8 +688,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -704,23 +704,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 427d91f778d64d..0dc6b3d2530c70 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -2285,7 +2285,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2301,7 +2301,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7539,6 +7539,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index ab8a6a47db56a8..97343489973995 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -518,7 +518,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -526,7 +526,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -539,8 +539,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -555,23 +555,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 070614d2552400..0ebac74aefbfe3 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -9312,6 +9312,5 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 6e8ea74316488d..da48fd8620215e 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -667,7 +667,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -675,7 +675,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -688,8 +688,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -704,23 +704,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 23a361e271368b..c95d1a4b2358d7 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8609,6 +8609,5 @@ "endpointVersion": 1, "deviceIdentifier": 269 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 851b45db1b8f32..27823b667a74b2 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -505,7 +505,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -513,7 +513,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -526,8 +526,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -542,23 +542,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 41ab37e804b286..b36e305dec64d1 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -2285,7 +2285,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2301,7 +2301,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6387,6 +6387,5 @@ "endpointVersion": 1, "deviceIdentifier": 43 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 53d445c699253c..4ecf95da1ebf9b 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -589,7 +589,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -610,8 +610,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -626,23 +626,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index 5e2eb092ff701d..6585a513242fce 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6367,6 +6367,5 @@ "endpointVersion": 1, "deviceIdentifier": 774 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 165dcef3ba859e..b57fb12677d7c9 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -661,7 +661,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -669,7 +669,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -682,8 +682,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -698,23 +698,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index b34ca684831211..35d4cea96c0d94 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8187,6 +8187,5 @@ "endpointVersion": 1, "deviceIdentifier": 768 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 27382f831a45e9..5d6d52e5d51ee2 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -589,7 +589,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -610,8 +610,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -626,23 +626,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 269c850874557d..26c2e6ffdcd102 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6367,6 +6367,5 @@ "endpointVersion": 1, "deviceIdentifier": 775 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 16743eba1d7914..a1d3bd0dbb437f 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -589,7 +589,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -610,8 +610,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -626,23 +626,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 68b146d451d158..136f09ce5b8502 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6383,6 +6383,5 @@ "endpointVersion": 1, "deviceIdentifier": 262 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 1fefc725bc8028..ac8a603b1269eb 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -589,7 +589,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -610,8 +610,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -626,23 +626,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index d35ed962806f8a..8592f417d6ef41 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6495,6 +6495,5 @@ "endpointVersion": 1, "deviceIdentifier": 263 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index bfe31a8d7e6690..d60e467378e6c8 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -667,7 +667,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -675,7 +675,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -688,8 +688,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -704,23 +704,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 982dacd48f8766..f4eed36dec4ff4 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7491,6 +7491,5 @@ "endpointVersion": 1, "deviceIdentifier": 256 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index d4931fcbc21ef0..889f6dbe0895ed 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -630,7 +630,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -638,7 +638,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -651,8 +651,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -667,23 +667,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 0b7369a8c68c0e..8ba85842300f3e 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7491,6 +7491,5 @@ "endpointVersion": 1, "deviceIdentifier": 259 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 5650ccf8855554..a2334a9ac6fd6a 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -566,7 +566,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -574,7 +574,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -587,8 +587,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -603,23 +603,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index f3d05fcf91c01e..ebc3f803aa9dd7 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7167,6 +7167,5 @@ "endpointVersion": 1, "deviceIdentifier": 266 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index a4029fc04c28c1..e25f30f691fbf6 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -589,7 +589,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -610,8 +610,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -626,23 +626,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 76a26d5b0c3404..5d2bee8911aae7 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6447,6 +6447,5 @@ "endpointVersion": 1, "deviceIdentifier": 773 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index aa1a118d2b0c16..75b4b86c9f1443 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -661,7 +661,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -669,7 +669,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -682,8 +682,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -698,23 +698,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index a8142c637b0d93..60cea1a4156efe 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6599,6 +6599,5 @@ "endpointVersion": 1, "deviceIdentifier": 34 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 828375a4f5324d..38b122b44ea457 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -589,7 +589,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -597,7 +597,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -610,8 +610,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -626,23 +626,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index b336f9aa8c81b5..31b4d8c516a83e 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -6367,6 +6367,5 @@ "endpointVersion": 1, "deviceIdentifier": 770 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 8953a2ccc3ea2a..d3b1db26b286dc 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -518,7 +518,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -526,7 +526,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -539,8 +539,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -555,23 +555,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index 41db456660bdf0..27aa256dd32d10 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7847,6 +7847,5 @@ "endpointVersion": 1, "deviceIdentifier": 769 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 62168a4c7a5ff1..4fb63ee98280f7 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -518,7 +518,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -526,7 +526,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -539,8 +539,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -555,23 +555,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index 8a900bc80d1b16..c621ba12e29adf 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7049,6 +7049,5 @@ "endpointVersion": 1, "deviceIdentifier": 514 } - ], - "log": [] + ] } \ No newline at end of file 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 0da59f91f3d219..492e2d81c7fc67 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 @@ -505,7 +505,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -513,7 +513,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -526,8 +526,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -542,23 +542,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index c31f3f5868b11e..38a25fdf1a4f01 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8785,6 +8785,5 @@ "endpointVersion": 1, "deviceIdentifier": 21 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 658114c33da5b4..1509a4b1a3e89c 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -651,7 +651,7 @@ server cluster UnitLocalization = 45 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -659,7 +659,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -672,8 +672,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -688,23 +688,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index a360a32c025fc0..5dc2c5467556b2 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -1568,7 +1568,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -1584,7 +1584,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7614,6 +7614,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file 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 6b68c5f8367c9f..d6121d1d021e52 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 @@ -813,7 +813,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -821,7 +821,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -834,8 +834,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -850,23 +850,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 71ec40c2b6d97f..0a352117f7abbd 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -2219,7 +2219,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2235,7 +2235,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -9334,6 +9334,5 @@ "endpointVersion": 1, "deviceIdentifier": 15 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 998de0fd9c685c..fb480cc02709f3 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -675,7 +675,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -683,7 +683,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -696,8 +696,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -712,23 +712,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index 99f60b937f3162..cd739fba7c86ee 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8341,6 +8341,5 @@ "endpointVersion": 1, "deviceIdentifier": 269 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index 9b29c95ad74972..1bd328d9902415 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -675,7 +675,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -683,7 +683,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -696,8 +696,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -712,23 +712,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index 55e4b7aa8adea0..c3ab76494a5ab9 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8341,6 +8341,5 @@ "endpointVersion": 1, "deviceIdentifier": 269 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 4b936d4078c212..95ebbc9ec993d4 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -675,7 +675,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -683,7 +683,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -696,8 +696,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -712,23 +712,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 664ec3b5bd9dd5..9d02ec6206d9a6 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8341,6 +8341,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index fc34993bb6a99f..387a168abe9443 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -609,7 +609,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -617,7 +617,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -630,8 +630,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -646,23 +646,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 42c0aa1a90db37..ef56a8504394a6 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 8b57da10b365cf..a92a666f4710e9 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -619,7 +619,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -627,7 +627,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -640,8 +640,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -656,23 +656,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index 2b5010994b9700..c182e39448ddbd 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -2477,7 +2477,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2493,7 +2493,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -10281,6 +10281,5 @@ "endpointVersion": 1, "deviceIdentifier": 269 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter index 1807e3174d5ca9..250b1f18ebb39f 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.matter @@ -675,7 +675,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -683,7 +683,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -696,8 +696,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -712,23 +712,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap index a301ef4c0d33cf..5ca225af311490 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-thread-app.zap @@ -16,12 +16,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../../../../src/app/zap-templates/zcl/zcl.json", @@ -29,6 +23,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -2149,7 +2149,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2165,7 +2165,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8076,6 +8076,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter index 5678a95a50c440..20248c67383065 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.matter @@ -675,7 +675,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -683,7 +683,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -696,8 +696,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -712,23 +712,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap index a7b2737e97f4f6..c769ae54178b5d 100644 --- a/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/efr32/data_model/lighting-wifi-app.zap @@ -2175,7 +2175,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2191,7 +2191,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -8194,6 +8194,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 5fd26c2a019a9b..805736e96c7bba 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -726,7 +726,7 @@ server cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -734,7 +734,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -747,8 +747,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -763,23 +763,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index c2cd392271397d..6365791e8c54d9 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -2174,7 +2174,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2190,7 +2190,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7919,6 +7919,5 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index ea66c465e17a39..a417b7f3f53522 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -232,7 +232,7 @@ server cluster BasicInformation = 40 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -240,7 +240,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -253,8 +253,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -269,23 +269,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lock-app/nxp/zap/lock-app.zap b/examples/lock-app/nxp/zap/lock-app.zap index 5e68c0346481b1..715c22702788c7 100644 --- a/examples/lock-app/nxp/zap/lock-app.zap +++ b/examples/lock-app/nxp/zap/lock-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index be43704a7ffebb..f77fed34c24f25 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -453,7 +453,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -461,7 +461,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -474,8 +474,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -490,23 +490,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index 626470736fcc08..ddeceea2b20477 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -2414,7 +2414,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2430,7 +2430,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -9399,6 +9399,5 @@ "endpointVersion": 1, "deviceIdentifier": 10 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index 8d2cdf1ede6d19..28a4b171b81e71 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -86,7 +86,7 @@ server cluster AccessControl = 31 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -94,7 +94,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -121,23 +121,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index b084545f88519d..e783e808370a88 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -3527,6 +3527,5 @@ "endpointVersion": 1, "deviceIdentifier": null } - ], - "log": [] + ] } \ No newline at end of file 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 ad45ed456c163f..4e61fd9904cffd 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 @@ -389,7 +389,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -397,7 +397,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -410,8 +410,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -426,23 +426,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 1b19d3cc68417e..63d1160b4275a8 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -2056,7 +2056,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2072,7 +2072,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -4991,6 +4991,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file 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 80cfa9376dfabb..e2b8ee36f81270 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 @@ -567,7 +567,7 @@ server cluster TimeFormatLocalization = 44 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -575,7 +575,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -588,8 +588,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -604,23 +604,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index e72b4bd18643c0..8751dbff75cb8c 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -2151,7 +2151,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2167,7 +2167,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -7468,6 +7468,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index fe00f39babd7ea..dcf760c6988109 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1117,7 +1117,7 @@ server cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ client cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1125,7 +1125,7 @@ client cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1138,8 +1138,8 @@ client cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1154,23 +1154,23 @@ client cluster GeneralCommissioning = 48 { } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } @@ -1184,7 +1184,7 @@ client cluster GeneralCommissioning = 48 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1192,7 +1192,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1205,8 +1205,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1221,23 +1221,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 792cecc48722dd..e4d8f4d12b5046 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -2056,7 +2056,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2072,7 +2072,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -10265,6 +10265,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 06a656a0bf8432..1b3cce593cf064 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1078,7 +1078,7 @@ server cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ client cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1086,7 +1086,7 @@ client cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1099,8 +1099,8 @@ client cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1115,23 +1115,23 @@ client cluster GeneralCommissioning = 48 { } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } @@ -1145,7 +1145,7 @@ client cluster GeneralCommissioning = 48 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1153,7 +1153,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1166,8 +1166,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1182,23 +1182,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 12201697f898d7..431464e472546b 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -2256,7 +2256,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2272,7 +2272,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -10265,6 +10265,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 47bd66c357f9c9..295e3a28d25392 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -543,7 +543,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -551,7 +551,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -564,8 +564,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -580,23 +580,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index e4d2ea5488b764..b0d3b2a2ee8d5b 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2461,7 +2461,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2477,7 +2477,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 5c3920bcca5318..a6569cfe537871 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 @@ -468,7 +468,7 @@ server cluster OtaSoftwareUpdateRequestor = 42 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -476,7 +476,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -489,8 +489,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -505,23 +505,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 2b88845ed5cc26..f9f526c1d320c0 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2409,7 +2409,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2425,7 +2425,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index c2a700b182f560..80bcc673f64119 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -269,7 +269,7 @@ server cluster UnitLocalization = 45 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -277,7 +277,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -290,8 +290,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -306,23 +306,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap index 3dfa8891495ef0..c4e5b88c5aaabb 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.zap @@ -1342,7 +1342,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -1358,7 +1358,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -4207,6 +4207,5 @@ "endpointVersion": 1, "deviceIdentifier": 770 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 85fd54ea0e540a..55377700429ea6 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -713,7 +713,7 @@ server cluster UnitLocalization = 45 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -721,7 +721,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -734,8 +734,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -750,23 +750,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 642f8acae39fb7..d2c13346fe1e8f 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -2251,7 +2251,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2267,7 +2267,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -13403,7 +13403,7 @@ "side": "server", "type": "LineupInfoStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -13419,7 +13419,7 @@ "side": "server", "type": "ChannelInfoStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -14782,6 +14782,5 @@ "endpointVersion": 1, "deviceIdentifier": 769 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 0f5a0b997709ec..ccec137cbe0382 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -530,7 +530,7 @@ server cluster UnitLocalization = 45 { /** This cluster is used to manage global aspects of the Commissioning flow. */ client cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -538,7 +538,7 @@ client cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -551,8 +551,8 @@ client cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -567,23 +567,23 @@ client cluster GeneralCommissioning = 48 { } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } @@ -597,7 +597,7 @@ client cluster GeneralCommissioning = 48 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -605,7 +605,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -618,8 +618,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -634,23 +634,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 4b73fdefc8e1d7..06a95f4f532e24 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -2006,7 +2006,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2022,7 +2022,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -10909,7 +10909,7 @@ "side": "server", "type": "LineupInfoStruct", "included": 0, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0", @@ -10925,7 +10925,7 @@ "side": "server", "type": "ChannelInfoStruct", "included": 0, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0", @@ -11965,7 +11965,7 @@ "side": "server", "type": "ApplicationEPStruct", "included": 0, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0", @@ -12460,6 +12460,5 @@ "endpointVersion": 1, "deviceIdentifier": 36 } - ], - "log": [] + ] } \ No newline at end of file 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 5042f6d3dbad94..679f0da2f11e81 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 @@ -616,7 +616,7 @@ server cluster UnitLocalization = 45 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -624,7 +624,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -637,8 +637,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -653,23 +653,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index ad1f0d7ca2c3b0..ee418d36d68128 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -1988,7 +1988,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2004,7 +2004,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -13640,7 +13640,7 @@ "side": "server", "type": "PlaybackPositionStruct", "included": 0, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -14840,7 +14840,7 @@ "side": "server", "type": "ApplicationEPStruct", "included": 0, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "0x0", @@ -15068,7 +15068,7 @@ "side": "server", "type": "ApplicationStruct", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -15429,6 +15429,5 @@ "endpointVersion": 1, "deviceIdentifier": 41 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 88211bcee71282..144b19bd761a57 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -879,7 +879,7 @@ server cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ server cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -887,7 +887,7 @@ server cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -900,8 +900,8 @@ server cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -916,23 +916,23 @@ server cluster GeneralCommissioning = 48 { } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index ef2182ccae36d3..2d99981ddfeffe 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -2765,7 +2765,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2781,7 +2781,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -9345,6 +9345,5 @@ "endpointVersion": 2, "deviceIdentifier": 514 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index 9eced6973e343e..0dc276b118b9d4 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2951,7 +2951,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2967,7 +2967,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index 111412a75256c4..c16ff445d06a1d 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 92, + "featureLevel": 96, "creator": "zap", "keyValuePairs": [ { @@ -2237,7 +2237,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -2253,7 +2253,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp index 8e31c4ec720ce6..763bb15c47f5be 100644 --- a/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp +++ b/src/app/clusters/general-commissioning-server/general-commissioning-server.cpp @@ -181,7 +181,7 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler * Server::GetInstance().GetCommissioningWindowManager().IsCommissioningWindowOpen() && commandObj->GetSubjectDescriptor().authMode == Access::AuthMode::kCase) { - response.errorCode = CommissioningError::kBusyWithOtherAdmin; + response.errorCode = CommissioningErrorEnum::kBusyWithOtherAdmin; commandObj->AddResponse(commandPath, response); } else if (commandData.expiryLengthSeconds == 0) @@ -190,7 +190,7 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler * failSafeContext.ForceFailSafeTimerExpiry(); // Don't set the breadcrumb, since expiring the failsafe should // reset it anyway. - response.errorCode = CommissioningError::kOk; + response.errorCode = CommissioningErrorEnum::kOk; commandObj->AddResponse(commandPath, response); } else @@ -199,13 +199,13 @@ bool emberAfGeneralCommissioningClusterArmFailSafeCallback(app::CommandHandler * failSafeContext.ArmFailSafe(accessingFabricIndex, System::Clock::Seconds16(commandData.expiryLengthSeconds)), Failure); Breadcrumb::Set(commandPath.mEndpointId, commandData.breadcrumb); - response.errorCode = CommissioningError::kOk; + response.errorCode = CommissioningErrorEnum::kOk; commandObj->AddResponse(commandPath, response); } } else { - response.errorCode = CommissioningError::kBusyWithOtherAdmin; + response.errorCode = CommissioningErrorEnum::kBusyWithOtherAdmin; commandObj->AddResponse(commandPath, response); } @@ -227,7 +227,7 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback( Commands::CommissioningCompleteResponse::Type response; if (!failSafe.IsFailSafeArmed()) { - response.errorCode = CommissioningError::kNoFailSafe; + response.errorCode = CommissioningErrorEnum::kNoFailSafe; } else { @@ -238,7 +238,7 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback( handle->AsSecureSession()->GetSecureSessionType() != SecureSession::Type::kCASE || !failSafe.MatchesFabricIndex(commandObj->GetAccessingFabricIndex())) { - response.errorCode = CommissioningError::kInvalidAuthentication; + response.errorCode = CommissioningErrorEnum::kInvalidAuthentication; ChipLogError(FailSafe, "GeneralCommissioning: Got commissioning complete in invalid security context"); } else @@ -270,7 +270,7 @@ bool emberAfGeneralCommissioningClusterCommissioningCompleteCallback( Failure); Breadcrumb::Set(commandPath.mEndpointId, 0); - response.errorCode = CommissioningError::kOk; + response.errorCode = CommissioningErrorEnum::kOk; } } @@ -287,9 +287,9 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH DeviceControlServer * server = &DeviceLayer::DeviceControlServer::DeviceControlSvr(); Commands::SetRegulatoryConfigResponse::Type response; - if (commandData.newRegulatoryConfig > RegulatoryLocationType::kIndoorOutdoor) + if (commandData.newRegulatoryConfig > RegulatoryLocationTypeEnum::kIndoorOutdoor) { - response.errorCode = CommissioningError::kValueOutsideRange; + response.errorCode = CommissioningErrorEnum::kValueOutsideRange; response.debugText = commandData.countryCode; } else @@ -301,16 +301,16 @@ bool emberAfGeneralCommissioningClusterSetRegulatoryConfigCallback(app::CommandH // If the LocationCapability attribute is not Indoor/Outdoor and the NewRegulatoryConfig value received does not match // either the Indoor or Outdoor fixed value in LocationCapability. - if ((locationCapability != to_underlying(RegulatoryLocationType::kIndoorOutdoor)) && (location != locationCapability)) + if ((locationCapability != to_underlying(RegulatoryLocationTypeEnum::kIndoorOutdoor)) && (location != locationCapability)) { - response.errorCode = CommissioningError::kValueOutsideRange; + response.errorCode = CommissioningErrorEnum::kValueOutsideRange; response.debugText = commandData.countryCode; } else { CheckSuccess(server->SetRegulatoryConfig(location, commandData.countryCode), Failure); Breadcrumb::Set(commandPath.mEndpointId, commandData.breadcrumb); - response.errorCode = CommissioningError::kOk; + response.errorCode = CommissioningErrorEnum::kOk; } } diff --git a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml index cde1addf326305..390da4c31d2bd1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/general-commissioning-cluster.xml @@ -16,7 +16,7 @@ limitations under the License. --> - + @@ -24,7 +24,7 @@ limitations under the License. - + @@ -47,8 +47,8 @@ limitations under the License. BasicCommissioningInfo - RegulatoryConfig - LocationCapability + RegulatoryConfig + LocationCapability SupportsConcurrentConnection @@ -59,19 +59,19 @@ limitations under the License. Success/failure response for ArmFailSafe command - + Set the regulatory configuration to be used during commissioning - + Success/failure response for SetRegulatoryConfig command - + @@ -80,7 +80,7 @@ limitations under the License. Indicates to client whether CommissioningComplete command succeeded - + diff --git a/src/controller/CHIPDeviceController.cpp b/src/controller/CHIPDeviceController.cpp index f9cc5a282d8737..5b27cc358429ce 100644 --- a/src/controller/CHIPDeviceController.cpp +++ b/src/controller/CHIPDeviceController.cpp @@ -2070,7 +2070,7 @@ void DeviceCommissioner::OnArmFailSafe(void * context, CHIP_ERROR err = CHIP_NO_ERROR; ChipLogProgress(Controller, "Received ArmFailSafe response errorCode=%u", to_underlying(data.errorCode)); - if (data.errorCode != GeneralCommissioning::CommissioningError::kOk) + if (data.errorCode != GeneralCommissioning::CommissioningErrorEnum::kOk) { err = CHIP_ERROR_INTERNAL; report.Set(data.errorCode); @@ -2087,7 +2087,7 @@ void DeviceCommissioner::OnSetRegulatoryConfigResponse( CHIP_ERROR err = CHIP_NO_ERROR; ChipLogProgress(Controller, "Received SetRegulatoryConfig response errorCode=%u", to_underlying(data.errorCode)); - if (data.errorCode != GeneralCommissioning::CommissioningError::kOk) + if (data.errorCode != GeneralCommissioning::CommissioningErrorEnum::kOk) { err = CHIP_ERROR_INTERNAL; report.Set(data.errorCode); @@ -2181,7 +2181,7 @@ void DeviceCommissioner::OnCommissioningCompleteResponse( CHIP_ERROR err = CHIP_NO_ERROR; ChipLogProgress(Controller, "Received CommissioningComplete response, errorCode=%u", to_underlying(data.errorCode)); - if (data.errorCode != GeneralCommissioning::CommissioningError::kOk) + if (data.errorCode != GeneralCommissioning::CommissioningErrorEnum::kOk) { err = CHIP_ERROR_INTERNAL; report.Set(data.errorCode); @@ -2309,10 +2309,10 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio // TODO(cecille): Where is the country config actually set? ChipLogProgress(Controller, "Setting Regulatory Config"); auto capability = - params.GetLocationCapability().ValueOr(app::Clusters::GeneralCommissioning::RegulatoryLocationType::kOutdoor); - app::Clusters::GeneralCommissioning::RegulatoryLocationType regulatoryConfig; + params.GetLocationCapability().ValueOr(app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kOutdoor); + app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum regulatoryConfig; // Value is only switchable on the devices with indoor/outdoor capability - if (capability == app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoorOutdoor) + if (capability == app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoorOutdoor) { // If the device supports indoor and outdoor configs, use the setting from the commissioner, otherwise fall back to // the current device setting then to outdoor (most restrictive) @@ -2330,7 +2330,7 @@ void DeviceCommissioner::PerformCommissioningStep(DeviceProxy * proxy, Commissio } else { - regulatoryConfig = app::Clusters::GeneralCommissioning::RegulatoryLocationType::kOutdoor; + regulatoryConfig = app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kOutdoor; ChipLogProgress(Controller, "No overrride or device regulatory config supplied, setting to outdoor"); } } diff --git a/src/controller/CommissioningDelegate.h b/src/controller/CommissioningDelegate.h index d34f8fff234526..3499a8ea9bc22a 100644 --- a/src/controller/CommissioningDelegate.h +++ b/src/controller/CommissioningDelegate.h @@ -85,7 +85,7 @@ struct CompletionStatus CHIP_ERROR err; Optional failedStage; Optional attestationResult; - Optional commissioningError; + Optional commissioningError; Optional networkCommissioningStatus; }; @@ -125,7 +125,7 @@ class CommissioningParameters // (from GetLocationCapability - see below). If the regulatory location is not supplied, this will fall back to the location in // GetDefaultRegulatoryLocation and then to Outdoor (most restrictive). // This value should be set before calling PerformCommissioningStep for the kConfigRegulatory step. - const Optional GetDeviceRegulatoryLocation() const + const Optional GetDeviceRegulatoryLocation() const { return mDeviceRegulatoryLocation; } @@ -228,7 +228,7 @@ class CommissioningParameters // Default regulatory location set by the node, as read from the GeneralCommissioning cluster. In the AutoCommissioner, this is // automatically set from report from the kReadCommissioningInfo stage. // This should be set before calling PerformCommissioningStep for the kConfigRegulatory step. - const Optional GetDefaultRegulatoryLocation() const + const Optional GetDefaultRegulatoryLocation() const { return mDefaultRegulatoryLocation; } @@ -236,7 +236,7 @@ class CommissioningParameters // Location capabilities of the node, as read from the GeneralCommissioning cluster. In the AutoCommissioner, this is // automatically set from report from the kReadCommissioningInfo stage. // This should be set before calling PerformCommissioningStep for the kConfigRegulatory step. - const Optional GetLocationCapability() const + const Optional GetLocationCapability() const { return mLocationCapability; } @@ -257,7 +257,7 @@ class CommissioningParameters return *this; } - CommissioningParameters & SetDeviceRegulatoryLocation(app::Clusters::GeneralCommissioning::RegulatoryLocationType location) + CommissioningParameters & SetDeviceRegulatoryLocation(app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum location) { mDeviceRegulatoryLocation.SetValue(location); return *this; @@ -368,12 +368,12 @@ class CommissioningParameters mRemoteProductId = MakeOptional(id); return *this; } - CommissioningParameters & SetDefaultRegulatoryLocation(app::Clusters::GeneralCommissioning::RegulatoryLocationType location) + CommissioningParameters & SetDefaultRegulatoryLocation(app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum location) { mDefaultRegulatoryLocation = MakeOptional(location); return *this; } - CommissioningParameters & SetLocationCapability(app::Clusters::GeneralCommissioning::RegulatoryLocationType capability) + CommissioningParameters & SetLocationCapability(app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum capability) { mLocationCapability = MakeOptional(capability); return *this; @@ -451,7 +451,7 @@ class CommissioningParameters // Items that can be set by the commissioner Optional mFailsafeTimerSeconds; Optional mCASEFailsafeTimerSeconds; - Optional mDeviceRegulatoryLocation; + Optional mDeviceRegulatoryLocation; Optional mCSRNonce; Optional mAttestationNonce; Optional mWiFiCreds; @@ -471,8 +471,8 @@ class CommissioningParameters Optional mRemoteNodeId; Optional mRemoteVendorId; Optional mRemoteProductId; - Optional mDefaultRegulatoryLocation; - Optional mLocationCapability; + Optional mDefaultRegulatoryLocation; + Optional mLocationCapability; CompletionStatus completionStatus; Credentials::DeviceAttestationDelegate * mDeviceAttestationDelegate = nullptr; // Delegate to handle device attestation failures during commissioning @@ -542,10 +542,10 @@ struct GeneralCommissioningInfo { uint64_t breadcrumb = 0; uint16_t recommendedFailsafe = 0; - app::Clusters::GeneralCommissioning::RegulatoryLocationType currentRegulatoryLocation = - app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoorOutdoor; - app::Clusters::GeneralCommissioning::RegulatoryLocationType locationCapability = - app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoorOutdoor; + app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum currentRegulatoryLocation = + app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoorOutdoor; + app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum locationCapability = + app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoorOutdoor; ; }; @@ -565,8 +565,8 @@ struct AttestationErrorInfo struct CommissioningErrorInfo { - CommissioningErrorInfo(app::Clusters::GeneralCommissioning::CommissioningError result) : commissioningError(result) {} - app::Clusters::GeneralCommissioning::CommissioningError commissioningError; + CommissioningErrorInfo(app::Clusters::GeneralCommissioning::CommissioningErrorEnum result) : commissioningError(result) {} + app::Clusters::GeneralCommissioning::CommissioningErrorEnum commissioningError; }; struct NetworkCommissioningStatusInfo diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 8c5cc231d0eca2..0eb643f80cf4b3 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1408,7 +1408,7 @@ client cluster PowerSource = 47 { /** This cluster is used to manage global aspects of the Commissioning flow. */ client cluster GeneralCommissioning = 48 { - enum CommissioningError : ENUM8 { + enum CommissioningErrorEnum : ENUM8 { kOk = 0; kValueOutsideRange = 1; kInvalidAuthentication = 2; @@ -1416,7 +1416,7 @@ client cluster GeneralCommissioning = 48 { kBusyWithOtherAdmin = 4; } - enum RegulatoryLocationType : ENUM8 { + enum RegulatoryLocationTypeEnum : ENUM8 { kIndoor = 0; kOutdoor = 1; kIndoorOutdoor = 2; @@ -1429,8 +1429,8 @@ client cluster GeneralCommissioning = 48 { attribute access(write: administer) int64u breadcrumb = 0; readonly attribute BasicCommissioningInfo basicCommissioningInfo = 1; - readonly attribute RegulatoryLocationType regulatoryConfig = 2; - readonly attribute RegulatoryLocationType locationCapability = 3; + readonly attribute RegulatoryLocationTypeEnum regulatoryConfig = 2; + readonly attribute RegulatoryLocationTypeEnum locationCapability = 3; readonly attribute boolean supportsConcurrentConnection = 4; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -1445,23 +1445,23 @@ client cluster GeneralCommissioning = 48 { } response struct ArmFailSafeResponse = 1 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } request struct SetRegulatoryConfigRequest { - RegulatoryLocationType newRegulatoryConfig = 0; + RegulatoryLocationTypeEnum newRegulatoryConfig = 0; CHAR_STRING countryCode = 1; INT64U breadcrumb = 2; } response struct SetRegulatoryConfigResponse = 3 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } response struct CommissioningCompleteResponse = 5 { - CommissioningError errorCode = 0; + CommissioningErrorEnum errorCode = 0; CHAR_STRING debugText = 1; } diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index ae71d90be8fb73..4726c9905368ad 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -16,12 +16,6 @@ } ], "package": [ - { - "pathRelativity": "relativeToZap", - "path": "../../app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" - }, { "pathRelativity": "relativeToZap", "path": "../../app/zap-templates/zcl/zcl.json", @@ -29,6 +23,12 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data" + }, + { + "pathRelativity": "relativeToZap", + "path": "../../app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" } ], "endpointTypes": [ @@ -5013,7 +5013,7 @@ "code": 2, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -5029,7 +5029,7 @@ "code": 3, "mfgCode": null, "side": "server", - "type": "RegulatoryLocationType", + "type": "RegulatoryLocationTypeEnum", "included": 1, "storageOption": "External", "singleton": 0, @@ -10391,7 +10391,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10407,7 +10407,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10423,7 +10423,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10439,7 +10439,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -24845,6 +24845,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/src/controller/java/CHIPDeviceController-JNI.cpp b/src/controller/java/CHIPDeviceController-JNI.cpp index d7bb27b126b3f3..297b22ac449bc0 100644 --- a/src/controller/java/CHIPDeviceController-JNI.cpp +++ b/src/controller/java/CHIPDeviceController-JNI.cpp @@ -428,11 +428,11 @@ JNI_METHOD(jlong, newDeviceController)(JNIEnv * env, jobject self, jobject contr using namespace app::Clusters::GeneralCommissioning; jint regulatoryLocationJint = chip::JniReferences::GetInstance().IntegerToPrimitive(regulatoryLocation); - VerifyOrExit(chip::CanCastTo(regulatoryLocationJint), err = CHIP_ERROR_INVALID_ARGUMENT); + VerifyOrExit(chip::CanCastTo(regulatoryLocationJint), err = CHIP_ERROR_INVALID_ARGUMENT); - RegulatoryLocationType regulatoryLocationType = static_cast(regulatoryLocationJint); - VerifyOrExit(regulatoryLocationType >= RegulatoryLocationType::kIndoor, err = CHIP_ERROR_INVALID_ARGUMENT); - VerifyOrExit(regulatoryLocationType <= RegulatoryLocationType::kIndoorOutdoor, err = CHIP_ERROR_INVALID_ARGUMENT); + auto regulatoryLocationType = static_cast(regulatoryLocationJint); + VerifyOrExit(regulatoryLocationType >= RegulatoryLocationTypeEnum::kIndoor, err = CHIP_ERROR_INVALID_ARGUMENT); + VerifyOrExit(regulatoryLocationType <= RegulatoryLocationTypeEnum::kIndoorOutdoor, err = CHIP_ERROR_INVALID_ARGUMENT); chip::Controller::CommissioningParameters commissioningParams = wrapper->GetCommissioningParameters(); commissioningParams.SetDeviceRegulatoryLocation(regulatoryLocationType); diff --git a/src/controller/java/src/chip/devicecontroller/ControllerParams.java b/src/controller/java/src/chip/devicecontroller/ControllerParams.java index a746dd43ad6e17..93f9eedae343de 100644 --- a/src/controller/java/src/chip/devicecontroller/ControllerParams.java +++ b/src/controller/java/src/chip/devicecontroller/ControllerParams.java @@ -288,15 +288,15 @@ public Builder setCountryCode(final String countryCode) { *

Setting the regulatory location type will set the NewRegulatoryConfig when the * SetRegulatoryConfig command is sent by this ChipDeviceCommissioner. * - * @param regulatoryLocation an app::Clusters::GeneralCommissioning::RegulatoryLocationType enum - * value + * @param regulatoryLocation an app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum + * enum value * @return */ public Builder setRegulatoryLocation(int regulatoryLocation) { if ((regulatoryLocation < 0) || (regulatoryLocation > 2)) { throw new IllegalArgumentException( - "regulatoryLocation value must be between RegulatoryLocationType::kIndoor and " - + "RegulatoryLocationType::kIndoorOutdoor"); + "regulatoryLocation value must be between RegulatoryLocationTypeEnum::kIndoor and " + + "RegulatoryLocationTypeEnum::kIndoorOutdoor"); } this.regulatoryLocationType = Optional.of(regulatoryLocation); return this; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 81f22de95f359d..1b26cf02151a32 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -6936,8 +6936,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="breadcrumb", Tag=0x00000000, Type=uint), ClusterObjectFieldDescriptor(Label="basicCommissioningInfo", Tag=0x00000001, Type=GeneralCommissioning.Structs.BasicCommissioningInfo), - ClusterObjectFieldDescriptor(Label="regulatoryConfig", Tag=0x00000002, Type=GeneralCommissioning.Enums.RegulatoryLocationType), - ClusterObjectFieldDescriptor(Label="locationCapability", Tag=0x00000003, Type=GeneralCommissioning.Enums.RegulatoryLocationType), + ClusterObjectFieldDescriptor(Label="regulatoryConfig", Tag=0x00000002, Type=GeneralCommissioning.Enums.RegulatoryLocationTypeEnum), + ClusterObjectFieldDescriptor(Label="locationCapability", Tag=0x00000003, Type=GeneralCommissioning.Enums.RegulatoryLocationTypeEnum), ClusterObjectFieldDescriptor(Label="supportsConcurrentConnection", Tag=0x00000004, Type=bool), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), @@ -6949,8 +6949,8 @@ def descriptor(cls) -> ClusterObjectDescriptor: breadcrumb: 'uint' = None basicCommissioningInfo: 'GeneralCommissioning.Structs.BasicCommissioningInfo' = None - regulatoryConfig: 'GeneralCommissioning.Enums.RegulatoryLocationType' = None - locationCapability: 'GeneralCommissioning.Enums.RegulatoryLocationType' = None + regulatoryConfig: 'GeneralCommissioning.Enums.RegulatoryLocationTypeEnum' = None + locationCapability: 'GeneralCommissioning.Enums.RegulatoryLocationTypeEnum' = None supportsConcurrentConnection: 'bool' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None @@ -6960,7 +6960,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class CommissioningError(MatterIntEnum): + class CommissioningErrorEnum(MatterIntEnum): kOk = 0x00 kValueOutsideRange = 0x01 kInvalidAuthentication = 0x02 @@ -6972,7 +6972,7 @@ class CommissioningError(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 5, - class RegulatoryLocationType(MatterIntEnum): + class RegulatoryLocationTypeEnum(MatterIntEnum): kIndoor = 0x00 kOutdoor = 0x01 kIndoorOutdoor = 0x02 @@ -7026,11 +7026,11 @@ class ArmFailSafeResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="errorCode", Tag=0, Type=GeneralCommissioning.Enums.CommissioningError), + ClusterObjectFieldDescriptor(Label="errorCode", Tag=0, Type=GeneralCommissioning.Enums.CommissioningErrorEnum), ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=str), ]) - errorCode: 'GeneralCommissioning.Enums.CommissioningError' = 0 + errorCode: 'GeneralCommissioning.Enums.CommissioningErrorEnum' = 0 debugText: 'str' = "" @dataclass @@ -7044,12 +7044,12 @@ class SetRegulatoryConfig(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="newRegulatoryConfig", Tag=0, Type=GeneralCommissioning.Enums.RegulatoryLocationType), + ClusterObjectFieldDescriptor(Label="newRegulatoryConfig", Tag=0, Type=GeneralCommissioning.Enums.RegulatoryLocationTypeEnum), ClusterObjectFieldDescriptor(Label="countryCode", Tag=1, Type=str), ClusterObjectFieldDescriptor(Label="breadcrumb", Tag=2, Type=uint), ]) - newRegulatoryConfig: 'GeneralCommissioning.Enums.RegulatoryLocationType' = 0 + newRegulatoryConfig: 'GeneralCommissioning.Enums.RegulatoryLocationTypeEnum' = 0 countryCode: 'str' = "" breadcrumb: 'uint' = 0 @@ -7064,11 +7064,11 @@ class SetRegulatoryConfigResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="errorCode", Tag=0, Type=GeneralCommissioning.Enums.CommissioningError), + ClusterObjectFieldDescriptor(Label="errorCode", Tag=0, Type=GeneralCommissioning.Enums.CommissioningErrorEnum), ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=str), ]) - errorCode: 'GeneralCommissioning.Enums.CommissioningError' = 0 + errorCode: 'GeneralCommissioning.Enums.CommissioningErrorEnum' = 0 debugText: 'str' = "" @dataclass @@ -7095,11 +7095,11 @@ class CommissioningCompleteResponse(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="errorCode", Tag=0, Type=GeneralCommissioning.Enums.CommissioningError), + ClusterObjectFieldDescriptor(Label="errorCode", Tag=0, Type=GeneralCommissioning.Enums.CommissioningErrorEnum), ClusterObjectFieldDescriptor(Label="debugText", Tag=1, Type=str), ]) - errorCode: 'GeneralCommissioning.Enums.CommissioningError' = 0 + errorCode: 'GeneralCommissioning.Enums.CommissioningErrorEnum' = 0 debugText: 'str' = "" class Attributes: @@ -7147,9 +7147,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=GeneralCommissioning.Enums.RegulatoryLocationType) + return ClusterObjectFieldDescriptor(Type=GeneralCommissioning.Enums.RegulatoryLocationTypeEnum) - value: 'GeneralCommissioning.Enums.RegulatoryLocationType' = 0 + value: 'GeneralCommissioning.Enums.RegulatoryLocationTypeEnum' = 0 @dataclass class LocationCapability(ClusterAttributeDescriptor): @@ -7163,9 +7163,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=GeneralCommissioning.Enums.RegulatoryLocationType) + return ClusterObjectFieldDescriptor(Type=GeneralCommissioning.Enums.RegulatoryLocationTypeEnum) - value: 'GeneralCommissioning.Enums.RegulatoryLocationType' = 0 + value: 'GeneralCommissioning.Enums.RegulatoryLocationTypeEnum' = 0 @dataclass class SupportsConcurrentConnection(ClusterAttributeDescriptor): diff --git a/src/controller/python/chip/commissioning/commissioning_flow_blocks.py b/src/controller/python/chip/commissioning/commissioning_flow_blocks.py index 986064af8b6e9e..6a5603bbc5d08c 100644 --- a/src/controller/python/chip/commissioning/commissioning_flow_blocks.py +++ b/src/controller/python/chip/commissioning/commissioning_flow_blocks.py @@ -233,7 +233,7 @@ async def network_commissioning(self, parameter: commissioning.Parameters, node_ async def send_regulatory_config(self, parameter: commissioning.Parameters, node_id: int): self._logger.info("Sending Regulatory Config") response = await self._devCtrl.SendCommand(node_id, commissioning.ROOT_ENDPOINT_ID, Clusters.GeneralCommissioning.Commands.SetRegulatoryConfig( - newRegulatoryConfig=Clusters.GeneralCommissioning.Enums.RegulatoryLocationType( + newRegulatoryConfig=Clusters.GeneralCommissioning.Enums.RegulatoryLocationTypeEnum( parameter.regulatory_config.location_type), countryCode=parameter.regulatory_config.country_code )) diff --git a/src/controller/python/chip/utils/CommissioningBuildingBlocks.py b/src/controller/python/chip/utils/CommissioningBuildingBlocks.py index 773f05748f51bc..c85866003c7207 100644 --- a/src/controller/python/chip/utils/CommissioningBuildingBlocks.py +++ b/src/controller/python/chip/utils/CommissioningBuildingBlocks.py @@ -142,7 +142,7 @@ async def AddNOCForNewFabricFromExisting(commissionerDevCtrl, newFabricDevCtrl, ''' resp = await commissionerDevCtrl.SendCommand(existingNodeId, 0, generalCommissioning.Commands.ArmFailSafe(60)) - if resp.errorCode is not generalCommissioning.Enums.CommissioningError.kOk: + if resp.errorCode is not generalCommissioning.Enums.CommissioningErrorEnum.kOk: return False csrForAddNOC = await commissionerDevCtrl.SendCommand(existingNodeId, 0, opCreds.Commands.CSRRequest(CSRNonce=os.urandom(32))) @@ -161,7 +161,7 @@ async def AddNOCForNewFabricFromExisting(commissionerDevCtrl, newFabricDevCtrl, return False resp = await newFabricDevCtrl.SendCommand(newNodeId, 0, generalCommissioning.Commands.CommissioningComplete()) - if resp.errorCode is not generalCommissioning.Enums.CommissioningError.kOk: + if resp.errorCode is not generalCommissioning.Enums.CommissioningErrorEnum.kOk: # Expiring the failsafe timer in an attempt to clean up. await commissionerDevCtrl.SendCommand(existingNodeId, 0, generalCommissioning.Commands.ArmFailSafe(0)) return False @@ -189,7 +189,7 @@ async def UpdateNOC(devCtrl, existingNodeId, newNodeId): """ resp = await devCtrl.SendCommand(existingNodeId, 0, generalCommissioning.Commands.ArmFailSafe(600)) - if resp.errorCode is not generalCommissioning.Enums.CommissioningError.kOk: + if resp.errorCode is not generalCommissioning.Enums.CommissioningErrorEnum.kOk: return False csrForUpdateNOC = await devCtrl.SendCommand( existingNodeId, 0, opCreds.Commands.CSRRequest(CSRNonce=os.urandom(32), isForUpdateNOC=True)) @@ -208,7 +208,7 @@ async def UpdateNOC(devCtrl, existingNodeId, newNodeId): devCtrl.ExpireSessions(existingNodeId) resp = await devCtrl.SendCommand(newNodeId, 0, generalCommissioning.Commands.CommissioningComplete()) - if resp.errorCode is not generalCommissioning.Enums.CommissioningError.kOk: + if resp.errorCode is not generalCommissioning.Enums.CommissioningErrorEnum.kOk: # Expiring the failsafe timer in an attempt to clean up. await devCtrl.SendCommand(existingNodeId, 0, generalCommissioning.Commands.ArmFailSafe(0)) return False diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py index 65d774618f1f79..57a757401eeec5 100644 --- a/src/controller/python/test/test_scripts/base.py +++ b/src/controller/python/test/test_scripts/base.py @@ -351,7 +351,7 @@ def TestFailsafe(self, nodeid: int): "Failed to send arm failsafe command error is {} with im response{}".format(err, resp)) return False - if resp.errorCode is not Clusters.GeneralCommissioning.Enums.CommissioningError.kOk: + if resp.errorCode is not Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kOk: self.logger.error( "Incorrect response received from arm failsafe - wanted OK, received {}".format(resp)) return False @@ -431,7 +431,7 @@ def TestFailsafe(self, nodeid: int): self.logger.error( "Failed to send arm failsafe command error is {} with im response{}".format(err, resp)) return False - if resp.errorCode is Clusters.GeneralCommissioning.Enums.CommissioningError.kBusyWithOtherAdmin: + if resp.errorCode is Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kBusyWithOtherAdmin: return True return False diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 33919c12e7a70c..8b4c8c1b204665 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3098,8 +3098,16 @@ - WiredCurrentTypeEnum - WiredFaultEnum GeneralCommissioning: - - CommissioningError - - RegulatoryLocationType + # CommissioningErrorEnum was originally just named + # CommissioningError, but we generate the same API + # for both of those names, so the name can just change + # here. + - CommissioningErrorEnum + # RegulatoryLocationTypeEnum was originally just named + # RegulatoryLocationType, but we generate the same API + # for both of those names, so the name can just change + # here. + - RegulatoryLocationTypeEnum NetworkCommissioning: - NetworkCommissioningStatus - WiFiBand @@ -3414,13 +3422,21 @@ - OverVoltage - UnderVoltage GeneralCommissioning: - CommissioningError: + # CommissioningErrorEnum was originally just named + # CommissioningError, but we generate the same API + # for both of those names, so the name can just change + # here. + CommissioningErrorEnum: - Ok - ValueOutsideRange - InvalidAuthentication - NoFailSafe - BusyWithOtherAdmin - RegulatoryLocationType: + # RegulatoryLocationTypeEnum was originally just named + # RegulatoryLocationType, but we generate the same API + # for both of those names, so the name can just change + # here. + RegulatoryLocationTypeEnum: - Indoor - Outdoor - IndoorOutdoor @@ -5646,7 +5662,11 @@ - ValueB - ValueC GeneralCommissioning: - CommissioningError: + # CommissioningErrorEnum was originally just named + # CommissioningError, but we generate the same API + # for both of those names, so the name can just change + # here. + CommissioningErrorEnum: - OK AccessControl: AccessControlEntryPrivilegeEnum: @@ -6211,7 +6231,11 @@ - DoorLockProgrammingEventCode enum values: GeneralCommissioning: - CommissioningError: + # CommissioningErrorEnum was originally just named + # CommissioningError, but we generate the same API + # for both of those names, so the name can just change + # here. + CommissioningErrorEnum: - Ok PowerSource: BatChargeLevelEnum: @@ -6569,7 +6593,11 @@ UserTypeEnum: DlUserType enum values: GeneralCommissioning: - CommissioningError: + # CommissioningErrorEnum was originally just named + # CommissioningError, but we generate the same API + # for both of those names, so the name can just change + # here. + CommissioningErrorEnum: OK: Ok PowerSource: BatChargeLevelEnum: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 10844c383222b6..0d495ffe954171 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -24097,7 +24097,7 @@ - (void)readAttributeRegulatoryConfigWithCompletion:(void (^)(NSNumber * _Nullab { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -24107,7 +24107,7 @@ - (void)subscribeAttributeRegulatoryConfigWithParams:(MTRSubscribeParams * _Nonn reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -24118,9 +24118,9 @@ + (void)readAttributeRegulatoryConfigWithClusterStateCache:(MTRClusterStateCache completion: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(GeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = GeneralCommissioning::Attributes::RegulatoryConfig::TypeInfo; @@ -24142,7 +24142,7 @@ - (void)readAttributeLocationCapabilityWithCompletion:(void (^)(NSNumber * _Null { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -24153,7 +24153,7 @@ - (void)subscribeAttributeLocationCapabilityWithParams:(MTRSubscribeParams * _No (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -24164,9 +24164,9 @@ + (void)readAttributeLocationCapabilityWithClusterStateCache:(MTRClusterStateCac completion: (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(GeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = GeneralCommissioning::Attributes::LocationCapability::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index c2c0430bdcb2a1..19ce55f7c414ea 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -268,14 +268,14 @@ typedef void (*NullablePowerSourceClusterWiredCurrentTypeEnumAttributeCallback)( typedef void (*PowerSourceClusterWiredFaultEnumAttributeCallback)(void *, chip::app::Clusters::PowerSource::WiredFaultEnum); typedef void (*NullablePowerSourceClusterWiredFaultEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*GeneralCommissioningClusterCommissioningErrorAttributeCallback)( - void *, chip::app::Clusters::GeneralCommissioning::CommissioningError); -typedef void (*NullableGeneralCommissioningClusterCommissioningErrorAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*GeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback)( - void *, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType); -typedef void (*NullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*GeneralCommissioningClusterCommissioningErrorEnumAttributeCallback)( + void *, chip::app::Clusters::GeneralCommissioning::CommissioningErrorEnum); +typedef void (*NullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*GeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallback)( + void *, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum); +typedef void (*NullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*NetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback)( void *, chip::app::Clusters::NetworkCommissioning::NetworkCommissioningStatus); typedef void (*NullableNetworkCommissioningClusterNetworkCommissioningStatusAttributeCallback)( @@ -19233,144 +19233,148 @@ class MTRNullablePowerSourceClusterWiredFaultEnumAttributeCallbackSubscriptionBr MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge - : public MTRCallbackBridge +class MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::GeneralCommissioning::CommissioningError value); + static void OnSuccessFn(void * context, chip::app::Clusters::GeneralCommissioning::CommissioningErrorEnum value); }; -class MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackSubscriptionBridge - : public MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge +class MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackSubscriptionBridge + : public MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge { public: - MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackSubscriptionBridge( + MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge(queue, handler, action), + MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge::KeepAliveOnCallback; - using MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge::OnDone; + using MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge(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 MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackSubscriptionBridge - : public MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge +class MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackSubscriptionBridge + : public MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge { public: - MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackSubscriptionBridge( + MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge(queue, handler, action), + MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge::OnDone; + using MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value); + static void OnSuccessFn(void * context, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value); }; -class MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge - : public MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge +class MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackSubscriptionBridge + : public MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge { public: - MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge( + MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(queue, handler, action), + MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge::OnDone; + using MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void - OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void OnSuccessFn( + void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge - : public MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge +class MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackSubscriptionBridge + : public MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge { public: - MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge( + MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge(queue, handler, action), + MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge::OnDone; + using MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge::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 d750d5a037aa8e..5062aff3ef13eb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -19104,15 +19104,15 @@ } } -void MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::GeneralCommissioning::CommissioningError value) +void MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::GeneralCommissioning::CommissioningErrorEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRGeneralCommissioningClusterCommissioningErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -19127,8 +19127,8 @@ } } -void MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -19139,7 +19139,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableGeneralCommissioningClusterCommissioningErrorAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableGeneralCommissioningClusterCommissioningErrorEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -19154,15 +19154,15 @@ } } -void MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value) +void MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -19177,8 +19177,8 @@ } } -void MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -19189,7 +19189,8 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableGeneralCommissioningClusterRegulatoryLocationTypeEnumAttributeCallbackSubscriptionBridge:: + OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/include/platform/ConfigurationManager.h b/src/include/platform/ConfigurationManager.h index 8da89c2223d6ff..a7decf94224786 100644 --- a/src/include/platform/ConfigurationManager.h +++ b/src/include/platform/ConfigurationManager.h @@ -202,7 +202,7 @@ void SetConfigurationMgr(ConfigurationManager * configurationManager); inline CHIP_ERROR ConfigurationManager::GetLocationCapability(uint8_t & location) { - location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); return CHIP_NO_ERROR; } diff --git a/src/platform/Ameba/ConfigurationManagerImpl.cpp b/src/platform/Ameba/ConfigurationManagerImpl.cpp index 9eb8e08d3867f4..16d7a8f45e75f7 100644 --- a/src/platform/Ameba/ConfigurationManagerImpl.cpp +++ b/src/platform/Ameba/ConfigurationManagerImpl.cpp @@ -82,15 +82,16 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!AmebaConfig::ConfigValueExists(AmebaConfig::kConfigKey_RegulatoryLocation)) { - uint32_t regulatoryLocation = to_underlying(app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + uint32_t regulatoryLocation = to_underlying(app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); err = WriteConfigValue(AmebaConfig::kConfigKey_RegulatoryLocation, regulatoryLocation); SuccessOrExit(err); } if (!AmebaConfig::ConfigValueExists(AmebaConfig::kConfigKey_LocationCapability)) { - uint32_t locationCapability = to_underlying(app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoorOutdoor); - err = WriteConfigValue(AmebaConfig::kConfigKey_LocationCapability, locationCapability); + uint32_t locationCapability = + to_underlying(app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoorOutdoor); + err = WriteConfigValue(AmebaConfig::kConfigKey_LocationCapability, locationCapability); SuccessOrExit(err); } diff --git a/src/platform/Darwin/ConfigurationManagerImpl.cpp b/src/platform/Darwin/ConfigurationManagerImpl.cpp index a24e9b84e07c27..45957a5c37ee32 100644 --- a/src/platform/Darwin/ConfigurationManagerImpl.cpp +++ b/src/platform/Darwin/ConfigurationManagerImpl.cpp @@ -191,13 +191,13 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_RegulatoryLocation)) { - uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); ReturnErrorOnFailure(WriteConfigValue(PosixConfig::kConfigKey_RegulatoryLocation, location)); } if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_LocationCapability)) { - uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); ReturnErrorOnFailure(WriteConfigValue(PosixConfig::kConfigKey_LocationCapability, location)); } diff --git a/src/platform/ESP32/ConfigurationManagerImpl.cpp b/src/platform/ESP32/ConfigurationManagerImpl.cpp index 8cec8f46f9f92f..889ccb8abdb776 100644 --- a/src/platform/ESP32/ConfigurationManagerImpl.cpp +++ b/src/platform/ESP32/ConfigurationManagerImpl.cpp @@ -231,7 +231,7 @@ CHIP_ERROR ConfigurationManagerImpl::GetLocationCapability(uint8_t & location) return err; #else - location = static_cast(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + location = static_cast(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); return CHIP_NO_ERROR; #endif } diff --git a/src/platform/Linux/ConfigurationManagerImpl.cpp b/src/platform/Linux/ConfigurationManagerImpl.cpp index 44e77e4e290ebe..f5d163487f12f9 100644 --- a/src/platform/Linux/ConfigurationManagerImpl.cpp +++ b/src/platform/Linux/ConfigurationManagerImpl.cpp @@ -106,14 +106,14 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_RegulatoryLocation)) { - uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); err = WriteConfigValue(PosixConfig::kConfigKey_RegulatoryLocation, location); SuccessOrExit(err); } if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_LocationCapability)) { - uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoorOutdoor); + uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoorOutdoor); err = WriteConfigValue(PosixConfig::kConfigKey_LocationCapability, location); SuccessOrExit(err); } diff --git a/src/platform/webos/ConfigurationManagerImpl.cpp b/src/platform/webos/ConfigurationManagerImpl.cpp index a7815277a215fd..6958e4adeff9dd 100644 --- a/src/platform/webos/ConfigurationManagerImpl.cpp +++ b/src/platform/webos/ConfigurationManagerImpl.cpp @@ -106,14 +106,14 @@ CHIP_ERROR ConfigurationManagerImpl::Init() if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_RegulatoryLocation)) { - uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); err = WriteConfigValue(PosixConfig::kConfigKey_RegulatoryLocation, location); SuccessOrExit(err); } if (!PosixConfig::ConfigValueExists(PosixConfig::kConfigKey_LocationCapability)) { - uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType::kIndoor); + uint32_t location = to_underlying(chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum::kIndoor); err = WriteConfigValue(PosixConfig::kConfigKey_LocationCapability, location); SuccessOrExit(err); } diff --git a/src/python_testing/TC_CGEN_2_4.py b/src/python_testing/TC_CGEN_2_4.py index 7ef128a787dfe3..6c8e36b907bb00 100644 --- a/src/python_testing/TC_CGEN_2_4.py +++ b/src/python_testing/TC_CGEN_2_4.py @@ -102,18 +102,18 @@ async def test_TC_CGEN_2_4(self): logging.info('Step 18 - TH1 reads the location capability') attr = Clusters.GeneralCommissioning.Attributes.LocationCapability cap = await self.read_single_attribute(dev_ctrl=self.th1, node_id=self.dut_node_id, endpoint=0, attribute=attr) - if cap == Clusters.GeneralCommissioning.Enums.RegulatoryLocationType.kIndoor: - newloc = Clusters.GeneralCommissioning.Enums.RegulatoryLocationType.kOutdoor - elif cap == Clusters.GeneralCommissioning.Enums.RegulatoryLocationType.kOutdoor: - newloc = Clusters.GeneralCommissioning.Enums.RegulatoryLocationType.kIndoor + if cap == Clusters.GeneralCommissioning.Enums.RegulatoryLocationTypeEnum.kIndoor: + newloc = Clusters.GeneralCommissioning.Enums.RegulatoryLocationTypeEnum.kOutdoor + elif cap == Clusters.GeneralCommissioning.Enums.RegulatoryLocationTypeEnum.kOutdoor: + newloc = Clusters.GeneralCommissioning.Enums.RegulatoryLocationTypeEnum.kIndoor else: - newloc = Clusters.GeneralCommissioning.Enums.RegulatoryLocationType.extend_enum_if_value_doesnt_exist(3) + newloc = Clusters.GeneralCommissioning.Enums.RegulatoryLocationTypeEnum.extend_enum_if_value_doesnt_exist(3) logging.info('Step 19 Send SetRgulatoryConfig with incorrect location newloc = {}'.format(newloc)) cmd = Clusters.GeneralCommissioning.Commands.SetRegulatoryConfig( newRegulatoryConfig=newloc, countryCode="XX", breadcrumb=0) ret = await self.th1.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=cmd) - asserts.assert_true(ret.errorCode, Clusters.GeneralCommissioning.Enums.CommissioningError.kValueOutsideRange) + asserts.assert_true(ret.errorCode, Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kValueOutsideRange) logging.info('Step 20 - TH2 sends CommissioningComplete') cmd = Clusters.GeneralCommissioning.Commands.CommissioningComplete() @@ -121,7 +121,7 @@ async def test_TC_CGEN_2_4(self): asserts.assert_true(isinstance(resp, Clusters.GeneralCommissioning.Commands.CommissioningCompleteResponse), 'Incorrect response type from command') asserts.assert_true( - resp.errorCode == Clusters.GeneralCommissioning.Enums.CommissioningError.kInvalidAuthentication, 'Incorrect error code') + resp.errorCode == Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kInvalidAuthentication, 'Incorrect error code') logging.info('Step 21 - TH1 sends an arm failsafe with timeout==0') cmd = Clusters.GeneralCommissioning.Commands.ArmFailSafe(expiryLengthSeconds=0, breadcrumb=0) @@ -133,7 +133,7 @@ async def test_TC_CGEN_2_4(self): resp = await self.th2.SendCommand(nodeid=self.dut_node_id, endpoint=0, payload=cmd) asserts.assert_true(isinstance(resp, Clusters.GeneralCommissioning.Commands.CommissioningCompleteResponse), 'Incorrect response type from command') - asserts.assert_true(resp.errorCode == Clusters.GeneralCommissioning.Enums.CommissioningError.kNoFailSafe, + asserts.assert_true(resp.errorCode == Clusters.GeneralCommissioning.Enums.CommissioningErrorEnum.kNoFailSafe, 'Incorrect error code') logging.info('Step 23 - TH2 reads fabric index') 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 743413fd66a4f3..82f4417b28bb70 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 @@ -720,9 +720,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(PowerSource::WiredFault } } -static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralCommissioning::CommissioningError val) +static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralCommissioning::CommissioningErrorEnum val) { - using EnumType = GeneralCommissioning::CommissioningError; + using EnumType = GeneralCommissioning::CommissioningErrorEnum; switch (val) { case EnumType::kOk: @@ -735,9 +735,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralCommissioning::C return static_cast(5); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralCommissioning::RegulatoryLocationType val) +static auto __attribute__((unused)) EnsureKnownEnumValue(GeneralCommissioning::RegulatoryLocationTypeEnum val) { - using EnumType = GeneralCommissioning::RegulatoryLocationType; + using EnumType = GeneralCommissioning::RegulatoryLocationTypeEnum; switch (val) { case EnumType::kIndoor: 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 d35c549954cdaf..e950636dd0e8c5 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 @@ -839,8 +839,8 @@ enum class Feature : uint32_t namespace GeneralCommissioning { -// Enum for CommissioningError -enum class CommissioningError : uint8_t +// Enum for CommissioningErrorEnum +enum class CommissioningErrorEnum : uint8_t { kOk = 0x00, kValueOutsideRange = 0x01, @@ -854,8 +854,8 @@ enum class CommissioningError : uint8_t kUnknownEnumValue = 5, }; -// Enum for RegulatoryLocationType -enum class RegulatoryLocationType : uint8_t +// Enum for RegulatoryLocationTypeEnum +enum class RegulatoryLocationTypeEnum : uint8_t { kIndoor = 0x00, kOutdoor = 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 30d3eb2f251ada..5b3532d8d28375 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 @@ -6813,7 +6813,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::ArmFailSafeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - CommissioningError errorCode = static_cast(0); + CommissioningErrorEnum errorCode = static_cast(0); chip::CharSpan debugText; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -6829,7 +6829,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::ArmFailSafeResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - CommissioningError errorCode = static_cast(0); + CommissioningErrorEnum errorCode = static_cast(0); chip::CharSpan debugText; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -6849,7 +6849,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SetRegulatoryConfig::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - RegulatoryLocationType newRegulatoryConfig = static_cast(0); + RegulatoryLocationTypeEnum newRegulatoryConfig = static_cast(0); chip::CharSpan countryCode; uint64_t breadcrumb = static_cast(0); @@ -6866,7 +6866,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SetRegulatoryConfig::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - RegulatoryLocationType newRegulatoryConfig = static_cast(0); + RegulatoryLocationTypeEnum newRegulatoryConfig = static_cast(0); chip::CharSpan countryCode; uint64_t breadcrumb = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -6886,7 +6886,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::SetRegulatoryConfigResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - CommissioningError errorCode = static_cast(0); + CommissioningErrorEnum errorCode = static_cast(0); chip::CharSpan debugText; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -6902,7 +6902,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::SetRegulatoryConfigResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - CommissioningError errorCode = static_cast(0); + CommissioningErrorEnum errorCode = static_cast(0); chip::CharSpan debugText; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -6949,7 +6949,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::CommissioningCompleteResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - CommissioningError errorCode = static_cast(0); + CommissioningErrorEnum errorCode = static_cast(0); chip::CharSpan debugText; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -6965,7 +6965,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::CommissioningCompleteResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } - CommissioningError errorCode = static_cast(0); + CommissioningErrorEnum errorCode = static_cast(0); chip::CharSpan debugText; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -7001,9 +7001,9 @@ struct TypeInfo namespace RegulatoryConfig { struct TypeInfo { - using Type = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType; - using DecodableType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType; - using DecodableArgType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType; + using Type = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum; + using DecodableType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum; + using DecodableArgType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum; static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::RegulatoryConfig::Id; } @@ -7013,9 +7013,9 @@ struct TypeInfo namespace LocationCapability { struct TypeInfo { - using Type = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType; - using DecodableType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType; - using DecodableArgType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType; + using Type = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum; + using DecodableType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum; + using DecodableArgType = chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum; static constexpr ClusterId GetClusterId() { return Clusters::GeneralCommissioning::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::LocationCapability::Id; } @@ -7082,9 +7082,9 @@ struct TypeInfo Attributes::Breadcrumb::TypeInfo::DecodableType breadcrumb = static_cast(0); Attributes::BasicCommissioningInfo::TypeInfo::DecodableType basicCommissioningInfo; Attributes::RegulatoryConfig::TypeInfo::DecodableType regulatoryConfig = - static_cast(0); + static_cast(0); Attributes::LocationCapability::TypeInfo::DecodableType locationCapability = - static_cast(0); + static_cast(0); Attributes::SupportsConcurrentConnection::TypeInfo::DecodableType supportsConcurrentConnection = static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index fe957b65e2c022..0ac52bfce3ae98 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -11074,10 +11074,10 @@ void registerClusterGeneralCommissioning(Commands & commands, CredentialIssuerCo make_unique>( Id, "basic-commissioning-info", Attributes::BasicCommissioningInfo::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "regulatory-config", 0, UINT8_MAX, Attributes::RegulatoryConfig::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>( + make_unique>( Id, "location-capability", 0, UINT8_MAX, Attributes::LocationCapability::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "supports-concurrent-connection", 0, 1, Attributes::SupportsConcurrentConnection::Id, 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 bce6c44debba4d..239d5d2d1c9660 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6029,12 +6029,12 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("BasicCommissioningInfo", 1, value); } case GeneralCommissioning::Attributes::RegulatoryConfig::Id: { - chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value; + chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("RegulatoryConfig", 1, value); } case GeneralCommissioning::Attributes::LocationCapability::Id: { - chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value; + chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("LocationCapability", 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 89e38aeae44aff..3050e1b2866d5d 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -26483,7 +26483,7 @@ class Test_TC_CGEN_2_1Suite : public TestCommand case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value; + chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2U)); @@ -26492,7 +26492,7 @@ class Test_TC_CGEN_2_1Suite : public TestCommand case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::app::Clusters::GeneralCommissioning::RegulatoryLocationType value; + chip::app::Clusters::GeneralCommissioning::RegulatoryLocationTypeEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2U));