From 711af03d692ace6c483c622518905a7572ed7a66 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 22 May 2023 16:23:55 -0400 Subject: [PATCH] Regenerate generated files. --- .../all-clusters-app.matter | 16 +- .../all-clusters-minimal-app.matter | 16 +- .../bridge-common/bridge-app.matter | 16 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 16 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 16 +- .../rootnode_contactsensor_lFAGG1bfRO.matter | 16 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 16 +- .../rootnode_doorlock_aNKYAreMXE.matter | 16 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 16 +- .../devices/rootnode_fan_7N2TobIlOX.matter | 16 +- .../rootnode_flowsensor_1zVxHedlaV.matter | 16 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 16 +- .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 16 +- .../rootnode_lightsensor_lZQycTFcJK.matter | 16 +- ...rootnode_occupancysensor_iHyVgifZuo.matter | 16 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 16 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 16 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 16 +- .../rootnode_pressuresensor_s0qC9wLH4k.matter | 16 +- .../rootnode_speaker_RpzeXdimqA.matter | 16 +- ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 16 +- .../rootnode_thermostat_bm3fb8dhYi.matter | 16 +- .../rootnode_windowcovering_RLCxaGi9Yx.matter | 16 +- .../contact-sensor-app.matter | 16 +- .../bridge-common/bridge-app.matter | 16 +- .../light-switch-app.matter | 16 +- .../data_model/lighting-app-thread.matter | 16 +- .../data_model/lighting-app-wifi.matter | 16 +- .../lighting-common/lighting-app.matter | 16 +- .../nxp/zap/lighting-on-off.matter | 16 +- examples/lighting-app/qpg/zap/light.matter | 16 +- .../data_model/lighting-thread-app.matter | 16 +- .../efr32/data_model/lighting-wifi-app.matter | 16 +- examples/lock-app/lock-common/lock-app.matter | 16 +- examples/lock-app/nxp/zap/lock-app.matter | 16 +- examples/lock-app/qpg/zap/lock.matter | 16 +- .../log-source-common/log-source-app.matter | 12 +- .../ota-provider-app.matter | 16 +- .../ota-requestor-app.matter | 16 +- .../placeholder/linux/apps/app1/config.matter | 32 ++-- .../placeholder/linux/apps/app2/config.matter | 32 ++-- examples/pump-app/pump-common/pump-app.matter | 16 +- .../pump-controller-app.matter | 16 +- .../temperature-measurement.matter | 16 +- .../thermostat-common/thermostat.matter | 16 +- examples/tv-app/tv-common/tv-app.matter | 32 ++-- .../tv-casting-common/tv-casting-app.matter | 16 +- examples/window-app/common/window-app.matter | 16 +- .../data_model/controller-clusters.matter | 16 +- .../python/chip/clusters/Objects.py | 36 ++--- .../CHIP/zap-generated/MTRBaseClusters.mm | 16 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 150 +++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 25 +-- .../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 +- 59 files changed, 560 insertions(+), 555 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-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/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/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/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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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/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/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/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/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-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/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/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/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/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-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/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/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/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/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/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-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/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/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/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-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/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/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/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-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/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/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/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/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/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));