From 2368540df6dfd6af3b032da2c5c2e121d85a8a6b Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Fri, 22 Sep 2023 12:50:14 -0400 Subject: [PATCH] Align On/Off cluster XML with the spec. (#29404) * Align On/Off cluster XML with the spec. Updates to the changes from https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/6511 and fixes some other bugs (e.g. incorrect "DeadFrontBehavior" feature name). Fixes https://github.com/project-chip/connectedhomeip/issues/27092 * Auto-update .zap files. * Regenerate generated code. --- .../all-clusters-app.matter | 52 ++-- .../all-clusters-common/all-clusters-app.zap | 7 +- .../ameba/main/include/OnOffCommands.h | 8 +- .../all-clusters-minimal-app.matter | 26 +- .../all-clusters-minimal-app.zap | 4 +- .../bridge-common/bridge-app.matter | 20 +- ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 22 +- ...noip_rootnode_dimmablelight_bCwGYSDpoe.zap | 2 +- ...r_humiditysensor_thermostat_56de3d5f45.zap | 2 +- ...ootnode_basicvideoplayer_0ff86e943b.matter | 20 +- .../rootnode_basicvideoplayer_0ff86e943b.zap | 2 +- ...de_colortemperaturelight_hbUnzYVeyn.matter | 26 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 2 +- .../rootnode_dimmablelight_bCwGYSDpoe.matter | 22 +- .../rootnode_dimmablelight_bCwGYSDpoe.zap | 2 +- .../rootnode_dishwasher_cc105034fe.zap | 2 +- .../devices/rootnode_doorlock_aNKYAreMXE.zap | 2 +- ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 22 +- ...rootnode_extendedcolorlight_8lcaaYJVAa.zap | 2 +- ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 20 +- ...rootnode_heatingcoolingunit_ncdGai1E5a.zap | 2 +- .../rootnode_laundrywasher_fb10d238c8.zap | 2 +- .../rootnode_onofflight_bbs1b7IaOV.matter | 22 +- .../rootnode_onofflight_bbs1b7IaOV.zap | 2 +- .../rootnode_onofflight_samplemei.matter | 22 +- .../devices/rootnode_onofflight_samplemei.zap | 21 +- ...ootnode_onofflightswitch_FsPlMr090Q.matter | 46 +-- .../rootnode_onofflightswitch_FsPlMr090Q.zap | 2 +- ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 22 +- .../rootnode_onoffpluginunit_Wtf8ss5EBY.zap | 2 +- .../devices/rootnode_pump_5f904818cc.matter | 20 +- .../chef/devices/rootnode_pump_5f904818cc.zap | 2 +- .../devices/rootnode_pump_a811bb33a0.matter | 20 +- .../chef/devices/rootnode_pump_a811bb33a0.zap | 2 +- ...emperaturecontrolledcabinet_ffdb696680.zap | 2 +- ...otnode_roboticvacuumcleaner_1807ff0c49.zap | 2 +- ...tnode_roomairconditioner_9cf3607804.matter | 20 +- ...rootnode_roomairconditioner_9cf3607804.zap | 2 +- .../rootnode_smokecoalarm_686fe0dcb8.zap | 2 +- .../rootnode_speaker_RpzeXdimqA.matter | 20 +- .../devices/rootnode_speaker_RpzeXdimqA.zap | 2 +- examples/chef/devices/template.zap | 2 +- .../test_files/sample_zap_file.zap | 2 +- .../contact-sensor-app.zap | 2 +- .../dishwasher-common/dishwasher-app.zap | 2 +- .../light-switch-app.matter | 26 +- .../light-switch-common/light-switch-app.zap | 2 +- .../data_model/lighting-app-ethernet.matter | 26 +- .../data_model/lighting-app-ethernet.zap | 5 +- .../data_model/lighting-app-thread.matter | 26 +- .../data_model/lighting-app-thread.zap | 2 +- .../data_model/lighting-app-wifi.matter | 26 +- .../data_model/lighting-app-wifi.zap | 2 +- .../lighting-common/lighting-app.matter | 26 +- .../lighting-common/lighting-app.zap | 2 +- .../nxp/zap/lighting-on-off.matter | 26 +- .../lighting-app/nxp/zap/lighting-on-off.zap | 2 +- examples/lighting-app/qpg/src/AppTask.cpp | 30 +- examples/lighting-app/qpg/zap/light.matter | 26 +- examples/lighting-app/qpg/zap/light.zap | 2 +- .../data_model/lighting-thread-app.matter | 26 +- .../silabs/data_model/lighting-thread-app.zap | 2 +- .../data_model/lighting-wifi-app.matter | 26 +- .../silabs/data_model/lighting-wifi-app.zap | 2 +- .../silabs/src/LightingManager.cpp | 28 +- examples/lock-app/lock-common/lock-app.matter | 22 +- examples/lock-app/lock-common/lock-app.zap | 2 +- examples/lock-app/qpg/zap/lock.zap | 2 +- .../ota-requestor-app.matter | 26 +- .../ota-requestor-app.zap | 2 +- .../placeholder/linux/apps/app1/config.matter | 52 ++-- .../placeholder/linux/apps/app1/config.zap | 2 +- .../placeholder/linux/apps/app2/config.matter | 52 ++-- .../placeholder/linux/apps/app2/config.zap | 2 +- examples/pump-app/pump-common/pump-app.matter | 20 +- examples/pump-app/pump-common/pump-app.zap | 2 +- .../silabs/data_model/pump-thread-app.matter | 20 +- .../silabs/data_model/pump-thread-app.zap | 2 +- .../silabs/data_model/pump-wifi-app.matter | 20 +- .../silabs/data_model/pump-wifi-app.zap | 2 +- .../pump-controller-app.matter | 26 +- .../refrigerator-common/refrigerator-app.zap | 2 +- examples/rvc-app/rvc-common/rvc-app.zap | 5 +- .../thermostat-common/thermostat.zap | 2 +- examples/tv-app/tv-common/tv-app.matter | 20 +- .../tv-casting-common/tv-casting-app.matter | 26 +- .../tv-casting-common/tv-casting-app.zap | 2 +- .../virtual-device-app.matter | 26 +- .../virtual-device-app.zap | 2 +- .../tests/inputs/cluster_with_commands.matter | 16 +- .../inputs/large_all_clusters_app.matter | 22 +- .../tests/inputs/large_lighting_app.matter | 22 +- .../cpp-tlvmeta/clusters_meta.cpp | 34 +-- .../zap/tests/inputs/all-clusters-app.zap | 4 +- .../tools/zap/tests/inputs/lighting-app.zap | 2 +- .../clusters/on-off-server/on-off-server.cpp | 28 +- .../clusters/on-off-server/on-off-server.h | 34 +-- .../zcl/data-model/chip/onoff-cluster.xml | 30 +- .../data_model/controller-clusters.matter | 26 +- .../data_model/controller-clusters.zap | 6 +- .../java/zap-generated/CHIPReadCallbacks.cpp | 2 +- .../python/chip/clusters/Objects.py | 32 +-- .../python/chip/clusters/TestObjects.py | 12 +- .../CHIP/templates/availability.yaml | 87 +++++- .../MTRAttributeTLVValueDecoder.mm | 2 + .../CHIP/zap-generated/MTRBaseClusters.h | 41 ++- .../CHIP/zap-generated/MTRBaseClusters.mm | 8 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 261 +++++++++--------- .../CHIP/zap-generated/MTRCallbackBridge.mm | 48 ++-- .../CHIP/zap-generated/MTRClusterConstants.h | 2 +- .../CHIP/zap-generated/MTRClusters.h | 3 +- .../zap-generated/attributes/Accessors.cpp | 12 +- .../zap-generated/attributes/Accessors.h | 6 +- .../zap-generated/cluster-enums-check.h | 24 +- .../app-common/zap-generated/cluster-enums.h | 38 +-- .../zap-generated/cluster-objects.h | 26 +- .../zap-generated/cluster/Commands.h | 2 +- .../cluster/logging/DataModelLogger.cpp | 2 +- .../zap-generated/cluster/Commands.h | 6 + 119 files changed, 1040 insertions(+), 960 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 c48282979c4341..99f4e03632f489 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 @@ -273,33 +273,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -307,7 +307,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -316,12 +316,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } @@ -342,33 +342,33 @@ client cluster OnOff = 6 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -376,7 +376,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -385,12 +385,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index fb5b94436d0176..c7ccc67b4b7089 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -11528,7 +11528,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -31622,7 +31622,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -35392,6 +35392,5 @@ "endpointId": 65534, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/all-clusters-app/ameba/main/include/OnOffCommands.h b/examples/all-clusters-app/ameba/main/include/OnOffCommands.h index dd05750f1c70e1..6b261bb052241c 100644 --- a/examples/all-clusters-app/ameba/main/include/OnOffCommands.h +++ b/examples/all-clusters-app/ameba/main/include/OnOffCommands.h @@ -124,7 +124,7 @@ void ProcessOnOffUnicastBindingCommand(BindingCommandData * data, const EmberBin break; case Clusters::OnOff::Commands::OffWithEffect::Id: - offwitheffectCommand.effectIdentifier = static_cast(data->args[0]); + offwitheffectCommand.effectIdentifier = static_cast(data->args[0]); offwitheffectCommand.effectVariant = static_cast(data->args[1]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, offwitheffectCommand, onSuccess, onFailure); @@ -136,7 +136,7 @@ void ProcessOnOffUnicastBindingCommand(BindingCommandData * data, const EmberBin break; case Clusters::OnOff::Commands::OnWithTimedOff::Id: - onwithtimedoffCommand.onOffControl = static_cast>(data->args[0]); + onwithtimedoffCommand.onOffControl = static_cast>(data->args[0]); onwithtimedoffCommand.onTime = static_cast(data->args[1]); onwithtimedoffCommand.offWaitTime = static_cast(data->args[2]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, @@ -171,7 +171,7 @@ void ProcessOnOffGroupBindingCommand(BindingCommandData * data, const EmberBindi break; case Clusters::OnOff::Commands::OffWithEffect::Id: - offwitheffectCommand.effectIdentifier = static_cast(data->args[0]); + offwitheffectCommand.effectIdentifier = static_cast(data->args[0]); offwitheffectCommand.effectVariant = static_cast(data->args[1]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, offwitheffectCommand); break; @@ -181,7 +181,7 @@ void ProcessOnOffGroupBindingCommand(BindingCommandData * data, const EmberBindi break; case Clusters::OnOff::Commands::OnWithTimedOff::Id: - onwithtimedoffCommand.onOffControl = static_cast>(data->args[0]); + onwithtimedoffCommand.onOffControl = static_cast>(data->args[0]); onwithtimedoffCommand.onTime = static_cast(data->args[1]); onwithtimedoffCommand.offWaitTime = static_cast(data->args[2]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, onwithtimedoffCommand); 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 d514d42061268a..e6858070f9c11e 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 @@ -273,33 +273,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -307,7 +307,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -316,12 +316,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 083a0b4b543559..97f716a40c3269 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -10580,7 +10580,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -23818,7 +23818,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index a29ae49e0dd910..5111e370e1a985 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -81,33 +81,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index c8112e40f45c7a..05dc8ef9696a65 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index 0b878ebd10de52..05baaf59dccc0f 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -6351,7 +6351,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap index 27843c4d757b5a..3a9b9aa0d7f2ff 100644 --- a/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap +++ b/examples/chef/devices/rootnode_airpurifier_airqualitysensor_temperaturesensor_humiditysensor_thermostat_56de3d5f45.zap @@ -6416,7 +6416,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter index d8907397cc26ce..6cb07c0bc2364f 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter @@ -35,33 +35,33 @@ struct OperationalStateStruct { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap index 6045c6ad877191..509ca99cef5a5a 100644 --- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap +++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.zap @@ -5586,7 +5586,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 73bdaee361b6bb..0bb886f9804e4a 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 4f2688c3b159be..8d1e28a776dc2c 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -6440,7 +6440,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 20bce9f69fbb11..6f350800db93f9 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index df5f636f2ef587..0a583474f8baa9 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -6376,7 +6376,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap index e3343e5584a29a..b23c65d7f2ed34 100644 --- a/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap +++ b/examples/chef/devices/rootnode_dishwasher_cc105034fe.zap @@ -7088,7 +7088,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index bd3428ab431c05..76a6204f168b17 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -6328,7 +6328,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 2b604b1359008d..738dffa4521ed6 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 369c83511afb78..27c898dffb1c4e 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -6328,7 +6328,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 2a19e48ae23c20..d140d844339064 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 6971f422bb4ab8..6e007179c428ca 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -6294,7 +6294,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap index 5a340b0e9a37a5..33c624a3dff1d9 100644 --- a/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap +++ b/examples/chef/devices/rootnode_laundrywasher_fb10d238c8.zap @@ -7088,7 +7088,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 6a14be6cc644ee..4397a34688c88e 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index 8f2c4aa64fd79a..eb4082f7fa7aeb 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -6328,7 +6328,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.matter b/examples/chef/devices/rootnode_onofflight_samplemei.matter index dc75c0a2d44b8e..0ea88c693193ac 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 4d6bc2c3c09493..38346c05072ee3 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -1,5 +1,5 @@ { - "featureLevel": 97, + "featureLevel": 98, "creator": "zap", "keyValuePairs": [ { @@ -33,10 +33,9 @@ ], "endpointTypes": [ { - "id": 4, + "id": 1, "name": "MA-rootdevice", "deviceTypeRef": { - "id": 2, "code": 22, "profileId": 259, "label": "MA-rootdevice", @@ -44,16 +43,12 @@ }, "deviceTypes": [ { - "id": 2, "code": 22, "profileId": 259, "label": "MA-rootdevice", "name": "MA-rootdevice" } ], - "deviceTypeRefs": [ - 2 - ], "deviceVersions": [ 1 ], @@ -5420,10 +5415,9 @@ ] }, { - "id": 3, + "id": 2, "name": "Anonymous Endpoint Type", "deviceTypeRef": { - "id": 8, "code": 256, "profileId": 259, "label": "MA-onofflight", @@ -5431,16 +5425,12 @@ }, "deviceTypes": [ { - "id": 8, "code": 256, "profileId": 259, "label": "MA-onofflight", "name": "MA-onofflight" } ], - "deviceTypeRefs": [ - 8 - ], "deviceVersions": [ 1 ], @@ -6338,7 +6328,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7731,6 +7721,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 631106d3a10183..6b2dcdab7f8581 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -187,12 +187,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } @@ -213,33 +213,33 @@ client cluster OnOff = 6 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 993b6fba9bc591..704b31b666dba0 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -6328,7 +6328,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index ace5834e82bf55..c607ab395a9581 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 669e146e5966d9..d21afe667b04a8 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -6328,7 +6328,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.matter b/examples/chef/devices/rootnode_pump_5f904818cc.matter index ab82d2f670c300..9b474971040bae 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.matter +++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter @@ -81,33 +81,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_pump_5f904818cc.zap b/examples/chef/devices/rootnode_pump_5f904818cc.zap index 6966139ba33d50..a1d85a96ae5b3f 100644 --- a/examples/chef/devices/rootnode_pump_5f904818cc.zap +++ b/examples/chef/devices/rootnode_pump_5f904818cc.zap @@ -6721,7 +6721,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index b10f2d6f123378..ed927511f501a9 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -81,33 +81,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.zap b/examples/chef/devices/rootnode_pump_a811bb33a0.zap index 025f35026f65f8..feae196fe210a6 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.zap +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.zap @@ -6721,7 +6721,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap index 1fffb622c1af4a..0c8edccbc50fb5 100644 --- a/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap +++ b/examples/chef/devices/rootnode_refrigerator_temperaturecontrolledcabinet_temperaturecontrolledcabinet_ffdb696680.zap @@ -7152,7 +7152,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap index 9c8af2af0a8813..b9f4ebb8516683 100644 --- a/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap +++ b/examples/chef/devices/rootnode_roboticvacuumcleaner_1807ff0c49.zap @@ -6416,7 +6416,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter index c93e4888147843..f9ccfdc9f07097 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap index 2d8721152ec487..051e023ef53585 100644 --- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap +++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.zap @@ -6416,7 +6416,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap index 9903f33942ae14..b6d777ad37213a 100644 --- a/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap +++ b/examples/chef/devices/rootnode_smokecoalarm_686fe0dcb8.zap @@ -6424,7 +6424,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 36ead72a1ec2ba..eb67e68af1954c 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -75,33 +75,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 7a3660d0ef8f51..f418856d0aafa0 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -5760,7 +5760,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/template.zap b/examples/chef/devices/template.zap index d81d430809fa5d..254795438c046e 100644 --- a/examples/chef/devices/template.zap +++ b/examples/chef/devices/template.zap @@ -6416,7 +6416,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/sample_app_util/test_files/sample_zap_file.zap b/examples/chef/sample_app_util/test_files/sample_zap_file.zap index 7de53320310a9b..2488ad155e52d3 100644 --- a/examples/chef/sample_app_util/test_files/sample_zap_file.zap +++ b/examples/chef/sample_app_util/test_files/sample_zap_file.zap @@ -6093,7 +6093,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap index 750d403a8d5764..63dcae936080e9 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.zap @@ -6263,7 +6263,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap index 3832adf0bb7d01..d2b832c1921a50 100644 --- a/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap +++ b/examples/dishwasher-app/dishwasher-common/dishwasher-app.zap @@ -7088,7 +7088,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 0d39b5b65a8d18..5bc18df102f218 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 @@ -376,33 +376,33 @@ client cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -410,7 +410,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -419,12 +419,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 4662666352c860..539a331482945a 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -6992,7 +6992,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter index 9cf2e7bc80bbe2..3c9d19ebb931fa 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap index e8e05aaba1f75c..92e62342328d1e 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -6188,7 +6188,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -8379,6 +8379,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index a91fb7fcc4ada7..cf72c88dfbd1e8 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap index 951855989958db..fedde31a932dd0 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -6188,7 +6188,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, 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 f599263490c64a..82bf340ab3ff40 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap index ecd8f43cba5780..ba733c923dede5 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -6188,7 +6188,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 4f555829a35b64..0a5a81e6156137 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -297,33 +297,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -331,7 +331,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -340,12 +340,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index bb3acbf79e8a5d..f76450d1cf3da0 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -5605,7 +5605,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index dbbfeb0fe01026..26175dc20230e7 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index 6ff41025de535f..2a24f5f5fd7327 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -6476,7 +6476,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/qpg/src/AppTask.cpp b/examples/lighting-app/qpg/src/AppTask.cpp index ab504abfb51a52..c4fe7ff0c06e91 100644 --- a/examples/lighting-app/qpg/src/AppTask.cpp +++ b/examples/lighting-app/qpg/src/AppTask.cpp @@ -159,30 +159,28 @@ void OnTriggerOffWithEffect(OnOffEffect * effect) auto effectVariant = effect->mEffectVariant; // Uses print outs until we can support the effects - if (effectId == Clusters::OnOff::OnOffEffectIdentifier::kDelayedAllOff) + if (effectId == Clusters::OnOff::EffectIdentifierEnum::kDelayedAllOff) { - auto typedEffectVariant = static_cast(effectVariant); - if (typedEffectVariant == Clusters::OnOff::OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds) + auto typedEffectVariant = static_cast(effectVariant); + if (typedEffectVariant == Clusters::OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffFastFade) { - ChipLogProgress(Zcl, "OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds"); + ChipLogProgress(Zcl, "DelayedAllOffEffectVariantEnum::kDelayedOffFastFade"); } - else if (typedEffectVariant == Clusters::OnOff::OnOffDelayedAllOffEffectVariant::kNoFade) + else if (typedEffectVariant == Clusters::OnOff::DelayedAllOffEffectVariantEnum::kNoFade) { - ChipLogProgress(Zcl, "OnOffDelayedAllOffEffectVariant::kNoFade"); + ChipLogProgress(Zcl, "DelayedAllOffEffectVariantEnum::kNoFade"); } - else if (typedEffectVariant == - Clusters::OnOff::OnOffDelayedAllOffEffectVariant::k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds) + else if (typedEffectVariant == Clusters::OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade) { - ChipLogProgress(Zcl, "OnOffDelayedAllOffEffectVariant::k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds"); + ChipLogProgress(Zcl, "DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade"); } } - else if (effectId == Clusters::OnOff::OnOffEffectIdentifier::kDyingLight) + else if (effectId == Clusters::OnOff::EffectIdentifierEnum::kDyingLight) { - auto typedEffectVariant = static_cast(effectVariant); - if (typedEffectVariant == - Clusters::OnOff::OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second) + auto typedEffectVariant = static_cast(effectVariant); + if (typedEffectVariant == Clusters::OnOff::DyingLightEffectVariantEnum::kDyingLightFadeOff) { - ChipLogProgress(Zcl, "OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second"); + ChipLogProgress(Zcl, "DyingLightEffectVariantEnum::kDyingLightFadeOff"); } } } @@ -190,8 +188,8 @@ void OnTriggerOffWithEffect(OnOffEffect * effect) OnOffEffect gEffect = { chip::EndpointId{ 1 }, OnTriggerOffWithEffect, - Clusters::OnOff::OnOffEffectIdentifier::kDelayedAllOff, - to_underlying(Clusters::OnOff::OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds), + Clusters::OnOff::EffectIdentifierEnum::kDelayedAllOff, + to_underlying(Clusters::OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffFastFade), }; } // namespace diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 9dabc3574e2d25..e6fff86a3fc409 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index da4aa1826cabf4..c445c18230ee70 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -7428,7 +7428,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index ffc7897209169d..aa115f0d2f7f4a 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -318,33 +318,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -352,7 +352,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -361,12 +361,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap index 9517d51134c345..d72f2154672a38 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -6866,7 +6866,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 96ac3656f24f88..b4d06928893147 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -297,33 +297,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -331,7 +331,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -340,12 +340,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap index 08d5d554c3eaeb..83ba6bb6da3a47 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -6588,7 +6588,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/lighting-app/silabs/src/LightingManager.cpp b/examples/lighting-app/silabs/src/LightingManager.cpp index 2c5807f4ea693e..769dc0071166d7 100644 --- a/examples/lighting-app/silabs/src/LightingManager.cpp +++ b/examples/lighting-app/silabs/src/LightingManager.cpp @@ -42,8 +42,8 @@ namespace { OnOffEffect gEffect = { chip::EndpointId{ 1 }, LightMgr().OnTriggerOffWithEffect, - OnOffEffectIdentifier::kDelayedAllOff, - to_underlying(OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds), + EffectIdentifierEnum::kDelayedAllOff, + to_underlying(DelayedAllOffEffectVariantEnum::kDelayedOffFastFade), }; } // namespace @@ -288,32 +288,32 @@ void LightingManager::OnTriggerOffWithEffect(OnOffEffect * effect) // Temporary print outs and delay to test OffEffect behaviour // Until dimming is supported for dev boards. - if (effectId == OnOffEffectIdentifier::kDelayedAllOff) + if (effectId == EffectIdentifierEnum::kDelayedAllOff) { - auto typedEffectVariant = static_cast(effectVariant); - if (typedEffectVariant == OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds) + auto typedEffectVariant = static_cast(effectVariant); + if (typedEffectVariant == DelayedAllOffEffectVariantEnum::kDelayedOffFastFade) { offEffectDuration = 800; - ChipLogProgress(Zcl, "OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds"); + ChipLogProgress(Zcl, "DelayedAllOffEffectVariantEnum::kDelayedOffFastFade"); } - else if (typedEffectVariant == OnOffDelayedAllOffEffectVariant::kNoFade) + else if (typedEffectVariant == DelayedAllOffEffectVariantEnum::kNoFade) { offEffectDuration = 800; - ChipLogProgress(Zcl, "OnOffDelayedAllOffEffectVariant::kNoFade"); + ChipLogProgress(Zcl, "DelayedAllOffEffectVariantEnum::kNoFade"); } - else if (typedEffectVariant == OnOffDelayedAllOffEffectVariant::k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds) + else if (typedEffectVariant == DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade) { offEffectDuration = 12800; - ChipLogProgress(Zcl, "OnOffDelayedAllOffEffectVariant::k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds"); + ChipLogProgress(Zcl, "DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade"); } } - else if (effectId == OnOffEffectIdentifier::kDyingLight) + else if (effectId == EffectIdentifierEnum::kDyingLight) { - auto typedEffectVariant = static_cast(effectVariant); - if (typedEffectVariant == OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second) + auto typedEffectVariant = static_cast(effectVariant); + if (typedEffectVariant == DyingLightEffectVariantEnum::kDyingLightFadeOff) { offEffectDuration = 1500; - ChipLogProgress(Zcl, "OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second"); + ChipLogProgress(Zcl, "DyingLightEffectVariantEnum::kDyingLightFadeOff"); } } diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 9d9759848783f3..51d3ca92d6df48 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -81,33 +81,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -115,7 +115,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index 026f356fdba7a5..713ba1343ea42e 100644 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -8067,7 +8067,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lock-app/qpg/zap/lock.zap b/examples/lock-app/qpg/zap/lock.zap index 60987b13d94882..f4d4af5d2c222e 100644 --- a/examples/lock-app/qpg/zap/lock.zap +++ b/examples/lock-app/qpg/zap/lock.zap @@ -7175,7 +7175,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index b54cf5a38e8df7..44664ec830b86d 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 @@ -150,33 +150,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -184,7 +184,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -193,12 +193,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index e3ce15fdd068e1..adf9ab41b36743 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -6072,7 +6072,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index fa283c471267b3..e0c658d8c7f27d 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -318,33 +318,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -352,7 +352,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -361,12 +361,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } @@ -387,33 +387,33 @@ client cluster OnOff = 6 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -421,7 +421,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -430,12 +430,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index d3c3fec0f6ff7a..51adb3f9d7a7e1 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -13085,7 +13085,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 78a45b3636cede..6b12e603a9780d 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -318,33 +318,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -352,7 +352,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -361,12 +361,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } @@ -387,33 +387,33 @@ client cluster OnOff = 6 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -421,7 +421,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -430,12 +430,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index a9abe620d374c6..9aaeacc1997e87 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -13169,7 +13169,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 426fbbc2912bc4..b1a6ba1c9fe095 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -75,33 +75,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 26a52650f37a3d..06a4cb4fdba2ad 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -6010,7 +6010,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.matter b/examples/pump-app/silabs/data_model/pump-thread-app.matter index 8e8a10858ea042..3c87212a10cd6a 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -75,33 +75,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/pump-app/silabs/data_model/pump-thread-app.zap b/examples/pump-app/silabs/data_model/pump-thread-app.zap index 4f943ac9a1ee32..0ebd5349fc49f0 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -6010,7 +6010,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.matter b/examples/pump-app/silabs/data_model/pump-wifi-app.matter index 8e8a10858ea042..3c87212a10cd6a 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -75,33 +75,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } diff --git a/examples/pump-app/silabs/data_model/pump-wifi-app.zap b/examples/pump-app/silabs/data_model/pump-wifi-app.zap index 4f943ac9a1ee32..0ebd5349fc49f0 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -6010,7 +6010,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 594dabd32d0368..c94f2234a4a9a2 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 @@ -75,33 +75,33 @@ server cluster Identify = 3 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -109,7 +109,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -118,12 +118,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap index 733e241cdf1e6f..be2fa2dc3ce2ba 100644 --- a/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap +++ b/examples/refrigerator-app/refrigerator-common/refrigerator-app.zap @@ -7152,7 +7152,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "External", "singleton": 0, diff --git a/examples/rvc-app/rvc-common/rvc-app.zap b/examples/rvc-app/rvc-common/rvc-app.zap index b51d888203a786..c2ee5e51f06378 100644 --- a/examples/rvc-app/rvc-common/rvc-app.zap +++ b/examples/rvc-app/rvc-common/rvc-app.zap @@ -6416,7 +6416,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -10881,6 +10881,5 @@ "endpointId": 1, "networkId": 0 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index c72838cef8db59..1742f0034cd315 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -8347,7 +8347,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 2f5019a4fd0768..7ab6da7482e14c 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -35,33 +35,33 @@ struct OperationalStateStruct { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } 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 b789255710aacc..e4b0b8b25d0d42 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 @@ -144,33 +144,33 @@ server cluster Groups = 4 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -178,7 +178,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -187,12 +187,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index 42bd7e60647a13..cd6650c3d9f938 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -7786,7 +7786,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter index def5cf413ece03..78ca16545266ff 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.matter @@ -272,33 +272,33 @@ server cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -306,7 +306,7 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -315,12 +315,12 @@ server cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap index 5b04932c6989b1..d68f66d656a730 100644 --- a/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap +++ b/examples/virtual-device-app/virtual-device-common/virtual-device-app.zap @@ -8001,7 +8001,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter index d978642f26ef1b..dce4c5e9308db5 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/cluster_with_commands.matter @@ -1,24 +1,24 @@ server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap OnOffControl : BITMAP8 { diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter index cc0c601f7dd505..bd73950bd94dcc 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_all_clusters_app.matter @@ -216,25 +216,25 @@ server cluster Scenes = 5 { } server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap OnOffControl : BITMAP8 { @@ -253,13 +253,13 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; - OnOffDelayedAllOffEffectVariant effectVariant = 1; + EffectIdentifierEnum effectId = 0; + DelayedAllOffEffectVariantEnum effectVariant = 1; } request struct OnWithTimedOffRequest { diff --git a/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter b/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter index 6020196c85103e..c0c8391d6a93c8 100644 --- a/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter +++ b/scripts/py_matter_idl/matter_idl/tests/inputs/large_lighting_app.matter @@ -108,25 +108,25 @@ server cluster Groups = 4 { } server cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap OnOffControl : BITMAP8 { @@ -145,13 +145,13 @@ server cluster OnOff = 6 { readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; attribute int16u offWaitTime = 16386; - attribute access(write: manage) nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectId = 0; - OnOffDelayedAllOffEffectVariant effectVariant = 1; + EffectIdentifierEnum effectId = 0; + DelayedAllOffEffectVariantEnum effectVariant = 1; } request struct OnWithTimedOffRequest { diff --git a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp index 66462f8a497554..0e63899c417c59 100644 --- a/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp +++ b/scripts/py_matter_idl/matter_idl/tests/outputs/cluster_with_commands/cpp-tlvmeta/clusters_meta.cpp @@ -16,25 +16,25 @@ const Entry _OnOff[] = { { { CommandTag(2), "Toggle", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::Toggle::() }; -const Entry _OnOff_OnOffDelayedAllOffEffectVariant[] = { - { { ConstantValueTag(0x0), "kFadeToOffIn0p8Seconds", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds - { { ConstantValueTag(0x1), "kNoFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffDelayedAllOffEffectVariant::kNoFade - { { ConstantValueTag(0x2), "k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffDelayedAllOffEffectVariant::k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds +const Entry _OnOff_DelayedAllOffEffectVariantEnum[] = { + { { ConstantValueTag(0x0), "kDelayedOffFastFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffFastFade + { { ConstantValueTag(0x1), "kNoFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kNoFade + { { ConstantValueTag(0x2), "kDelayedOffSlowFade", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffSlowFade }; -const Entry _OnOff_OnOffDyingLightEffectVariant[] = { - { { ConstantValueTag(0x0), "k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second +const Entry _OnOff_DyingLightEffectVariantEnum[] = { + { { ConstantValueTag(0x0), "kDyingLightFadeOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::DyingLightEffectVariantEnum::kDyingLightFadeOff }; -const Entry _OnOff_OnOffEffectIdentifier[] = { - { { ConstantValueTag(0x0), "kDelayedAllOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffEffectIdentifier::kDelayedAllOff - { { ConstantValueTag(0x1), "kDyingLight", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffEffectIdentifier::kDyingLight +const Entry _OnOff_EffectIdentifierEnum[] = { + { { ConstantValueTag(0x0), "kDelayedAllOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::EffectIdentifierEnum::kDelayedAllOff + { { ConstantValueTag(0x1), "kDyingLight", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::EffectIdentifierEnum::kDyingLight }; -const Entry _OnOff_OnOffStartUpOnOff[] = { - { { ConstantValueTag(0x0), "kOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffStartUpOnOff::kOff - { { ConstantValueTag(0x1), "kOn", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffStartUpOnOff::kOn - { { ConstantValueTag(0x2), "kTogglePreviousOnOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::OnOffStartUpOnOff::kTogglePreviousOnOff +const Entry _OnOff_StartUpOnOffEnum[] = { + { { ConstantValueTag(0x0), "kOff", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kOff + { { ConstantValueTag(0x1), "kOn", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kOn + { { ConstantValueTag(0x2), "kToggle", ItemType::kDefault }, kInvalidNodeIndex }, // OnOff::StartUpOnOffEnum::kToggle }; const Entry _OnOff_OnOffControl[] = { @@ -66,10 +66,10 @@ const std::array, 8 + 2> clusters_meta = { { _ENTRY(_all_clusters), // 0 _ENTRY(_primitive_type_list), // 1 _ENTRY(_OnOff), // 2 - _ENTRY(_OnOff_OnOffDelayedAllOffEffectVariant), // 3 - _ENTRY(_OnOff_OnOffDyingLightEffectVariant), // 4 - _ENTRY(_OnOff_OnOffEffectIdentifier), // 5 - _ENTRY(_OnOff_OnOffStartUpOnOff), // 6 + _ENTRY(_OnOff_DelayedAllOffEffectVariantEnum), // 3 + _ENTRY(_OnOff_DyingLightEffectVariantEnum), // 4 + _ENTRY(_OnOff_EffectIdentifierEnum), // 5 + _ENTRY(_OnOff_StartUpOnOffEnum), // 6 _ENTRY(_OnOff_OnOffControl), // 7 _ENTRY(_OnOff_OnOffFeature), // 8 _ENTRY(_OnOff_ScenesFeature), // 9 diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index bd003251162fc8..8d46896f7eec70 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -10803,7 +10803,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, @@ -23521,7 +23521,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index d89edd6f164c73..3b2cda8a30b3bb 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -6156,7 +6156,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "NVM", "singleton": 0, diff --git a/src/app/clusters/on-off-server/on-off-server.cpp b/src/app/clusters/on-off-server/on-off-server.cpp index a3ebc06d740b7c..bbd35235e99555 100644 --- a/src/app/clusters/on-off-server/on-off-server.cpp +++ b/src/app/clusters/on-off-server/on-off-server.cpp @@ -634,7 +634,7 @@ void OnOffServer::initOnOffServer(chip::EndpointId endpoint) */ EmberAfStatus OnOffServer::getOnOffValueForStartUp(chip::EndpointId endpoint, bool & onOffValueForStartUp) { - app::DataModel::Nullable startUpOnOff; + app::DataModel::Nullable startUpOnOff; EmberAfStatus status = Attributes::StartUpOnOff::Get(endpoint, startUpOnOff); if (status == EMBER_ZCL_STATUS_SUCCESS) { @@ -647,13 +647,13 @@ EmberAfStatus OnOffServer::getOnOffValueForStartUp(chip::EndpointId endpoint, bo { switch (startUpOnOff.Value()) { - case OnOff::OnOffStartUpOnOff::kOff: + case OnOff::StartUpOnOffEnum::kOff: updatedOnOff = false; // Off break; - case OnOff::OnOffStartUpOnOff::kOn: + case OnOff::StartUpOnOffEnum::kOn: updatedOnOff = true; // On break; - case OnOff::OnOffStartUpOnOff::kTogglePreviousOnOff: + case OnOff::StartUpOnOffEnum::kToggle: updatedOnOff = !updatedOnOff; break; default: @@ -811,14 +811,14 @@ uint32_t OnOffServer::calculateNextWaitTimeMS() bool OnOffServer::OnWithTimedOffCommand(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::OnWithTimedOff::DecodableType & commandData) { - BitFlags onOffControl = commandData.onOffControl; - uint16_t onTime = commandData.onTime; - uint16_t offWaitTime = commandData.offWaitTime; - Status status = Status::Success; - chip::EndpointId endpoint = commandPath.mEndpointId; - bool isOn = false; - uint16_t currentOffWaitTime = MAX_ON_OFF_TIME_VALUE; - uint16_t currentOnTime = 0; + BitFlags onOffControl = commandData.onOffControl; + uint16_t onTime = commandData.onTime; + uint16_t offWaitTime = commandData.offWaitTime; + Status status = Status::Success; + chip::EndpointId endpoint = commandPath.mEndpointId; + bool isOn = false; + uint16_t currentOffWaitTime = MAX_ON_OFF_TIME_VALUE; + uint16_t currentOnTime = 0; EmberEventControl * event = configureEventControl(endpoint); VerifyOrExit(event != nullptr, status = Status::UnsupportedEndpoint); @@ -827,7 +827,7 @@ bool OnOffServer::OnWithTimedOffCommand(app::CommandHandler * commandObj, const OnOff::Attributes::OnOff::Get(endpoint, &isOn); // OnOff is off and the commands is only accepted if on - if (onOffControl.Has(OnOffControl::kAcceptOnlyWhenOn) && !isOn) + if (onOffControl.Has(OnOffControlBitmap::kAcceptOnlyWhenOn) && !isOn) { commandObj->AddStatus(commandPath, Status::Success); return true; @@ -1024,7 +1024,7 @@ static inline void unreg(OnOffEffect * inst) } OnOffEffect::OnOffEffect(chip::EndpointId endpoint, OffWithEffectTriggerCommand offWithEffectTrigger, - OnOffEffectIdentifier effectIdentifier, uint8_t effectVariant) : + EffectIdentifierEnum effectIdentifier, uint8_t effectVariant) : mEndpoint(endpoint), mOffWithEffectTrigger(offWithEffectTrigger), mEffectIdentifier(effectIdentifier), mEffectVariant(effectVariant) { diff --git a/src/app/clusters/on-off-server/on-off-server.h b/src/app/clusters/on-off-server/on-off-server.h index aead913b911726..26e62fb2ea1a73 100644 --- a/src/app/clusters/on-off-server/on-off-server.h +++ b/src/app/clusters/on-off-server/on-off-server.h @@ -101,30 +101,30 @@ class OnOffServer struct OnOffEffect { using OffWithEffectTriggerCommand = void (*)(OnOffEffect *); - using EffectVariantType = std::underlying_type_t; + using EffectVariantType = std::underlying_type_t; static_assert( - std::is_same>::value, - "chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant and " - "chip::app::Clusters::OnOff::OnOffDyingLightEffectVariant underlying types differ."); + std::is_same>::value, + "chip::app::Clusters::OnOff::DelayedAllOffEffectVariantEnum and " + "chip::app::Clusters::OnOff::DyingLightEffectVariantEnum underlying types differ."); chip::EndpointId mEndpoint; OffWithEffectTriggerCommand mOffWithEffectTrigger = nullptr; - chip::app::Clusters::OnOff::OnOffEffectIdentifier mEffectIdentifier; + chip::app::Clusters::OnOff::EffectIdentifierEnum mEffectIdentifier; EffectVariantType mEffectVariant; OnOffEffect * nextEffect = nullptr; - OnOffEffect(chip::EndpointId endpoint, OffWithEffectTriggerCommand offWithEffectTrigger, - chip::app::Clusters::OnOff::OnOffEffectIdentifier effectIdentifier = - chip::app::Clusters::OnOff::OnOffEffectIdentifier::kDelayedAllOff, - - /* - * effectVariant's type depends on the effectIdentifier so we don't know the type at compile time. - * The assertion at the beginning of this method ensures the effect variants share the same base type. - * Casting to the common base type for more flexibility since the type can be OnOffDelayedAllOffEffectVariant or - * OnOffDelayedAllOffEffectVariant - */ - EffectVariantType = - chip::to_underlying(chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds)); + OnOffEffect( + chip::EndpointId endpoint, OffWithEffectTriggerCommand offWithEffectTrigger, + chip::app::Clusters::OnOff::EffectIdentifierEnum effectIdentifier = + chip::app::Clusters::OnOff::EffectIdentifierEnum::kDelayedAllOff, + + /* + * effectVariant's type depends on the effectIdentifier so we don't know the type at compile time. + * The assertion at the beginning of this method ensures the effect variants share the same base type. + * Casting to the common base type for more flexibility since the type can be DelayedAllOffEffectVariantEnum or + * DelayedAllOffEffectVariantEnum + */ + EffectVariantType = chip::to_underlying(chip::app::Clusters::OnOff::DelayedAllOffEffectVariantEnum::kDelayedOffFastFade)); ~OnOffEffect(); bool hasNext() { return this->nextEffect != nullptr; } diff --git a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml index 46689b38467deb..91af71dc367b8f 100644 --- a/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/onoff-cluster.xml @@ -17,32 +17,32 @@ limitations under the License. - + - + - + - + - + - + - + - + - + @@ -59,7 +59,7 @@ limitations under the License. GlobalSceneControl OnTime OffWaitTime - + StartUpOnOff @@ -79,7 +79,7 @@ limitations under the License. The OffWithEffect command allows devices to be turned off using enhanced ways of fading. - + @@ -89,15 +89,15 @@ limitations under the License. The OnWithTimedOff command allows devices to be turned on for a specific duration with a guarded off duration so that SHOULD the device be subsequently switched off, further OnWithTimedOff commands, received during this time, are prevented from turning the devices back on. - - - + + + - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index db4326c1145065..06f81c08a52b23 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -336,33 +336,33 @@ client cluster Scenes = 5 { /** Attributes and commands for switching devices between 'On' and 'Off' states. */ client cluster OnOff = 6 { - enum OnOffDelayedAllOffEffectVariant : ENUM8 { - kFadeToOffIn0p8Seconds = 0; + enum DelayedAllOffEffectVariantEnum : ENUM8 { + kDelayedOffFastFade = 0; kNoFade = 1; - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 2; + kDelayedOffSlowFade = 2; } - enum OnOffDyingLightEffectVariant : ENUM8 { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0; + enum DyingLightEffectVariantEnum : ENUM8 { + kDyingLightFadeOff = 0; } - enum OnOffEffectIdentifier : ENUM8 { + enum EffectIdentifierEnum : ENUM8 { kDelayedAllOff = 0; kDyingLight = 1; } - enum OnOffStartUpOnOff : ENUM8 { + enum StartUpOnOffEnum : ENUM8 { kOff = 0; kOn = 1; - kTogglePreviousOnOff = 2; + kToggle = 2; } bitmap Feature : BITMAP32 { kLighting = 0x1; - kDeadFront = 0x2; + kDeadFrontBehavior = 0x2; } - bitmap OnOffControl : BITMAP8 { + bitmap OnOffControlBitmap : BITMAP8 { kAcceptOnlyWhenOn = 0x1; } @@ -370,7 +370,7 @@ client cluster OnOff = 6 { readonly attribute optional boolean globalSceneControl = 16384; attribute optional int16u onTime = 16385; attribute optional int16u offWaitTime = 16386; - attribute access(write: manage) optional nullable OnOffStartUpOnOff startUpOnOff = 16387; + attribute access(write: manage) optional nullable StartUpOnOffEnum startUpOnOff = 16387; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -379,12 +379,12 @@ client cluster OnOff = 6 { readonly attribute int16u clusterRevision = 65533; request struct OffWithEffectRequest { - OnOffEffectIdentifier effectIdentifier = 0; + EffectIdentifierEnum effectIdentifier = 0; int8u effectVariant = 1; } request struct OnWithTimedOffRequest { - OnOffControl onOffControl = 0; + OnOffControlBitmap onOffControl = 0; int16u onTime = 1; int16u offWaitTime = 2; } diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 1273f03e8d52b7..8444969ff35210 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -33,7 +33,7 @@ ], "endpointTypes": [ { - "id": 4, + "id": 1, "name": "MA-rootdevice", "deviceTypeRef": { "code": 22, @@ -978,7 +978,7 @@ "code": 16387, "mfgCode": null, "side": "server", - "type": "OnOffStartUpOnOff", + "type": "StartUpOnOffEnum", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -28976,4 +28976,4 @@ "networkId": 0 } ] -} +} \ No newline at end of file diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index fd598c47904b1c..47ecaa3c2c3b74 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -974,7 +974,7 @@ CHIPOnOffStartUpOnOffAttributeCallback::~CHIPOnOffStartUpOnOffAttributeCallback( } void CHIPOnOffStartUpOnOffAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::Nullable & value) + void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index ca33a46589350a..39a3294b0470da 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -1285,7 +1285,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="globalSceneControl", Tag=0x00004000, Type=typing.Optional[bool]), ClusterObjectFieldDescriptor(Label="onTime", Tag=0x00004001, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="offWaitTime", Tag=0x00004002, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="startUpOnOff", Tag=0x00004003, Type=typing.Union[None, Nullable, OnOff.Enums.OnOffStartUpOnOff]), + ClusterObjectFieldDescriptor(Label="startUpOnOff", Tag=0x00004003, Type=typing.Union[None, Nullable, OnOff.Enums.StartUpOnOffEnum]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -1298,7 +1298,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: globalSceneControl: 'typing.Optional[bool]' = None onTime: 'typing.Optional[uint]' = None offWaitTime: 'typing.Optional[uint]' = None - startUpOnOff: 'typing.Union[None, Nullable, OnOff.Enums.OnOffStartUpOnOff]' = None + startUpOnOff: 'typing.Union[None, Nullable, OnOff.Enums.StartUpOnOffEnum]' = None generatedCommandList: 'typing.List[uint]' = None acceptedCommandList: 'typing.List[uint]' = None eventList: 'typing.List[uint]' = None @@ -1307,25 +1307,25 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class OnOffDelayedAllOffEffectVariant(MatterIntEnum): - kFadeToOffIn0p8Seconds = 0x00 + class DelayedAllOffEffectVariantEnum(MatterIntEnum): + kDelayedOffFastFade = 0x00 kNoFade = 0x01 - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 0x02 + kDelayedOffSlowFade = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown # enum value. This specific should never be transmitted. kUnknownEnumValue = 3, - class OnOffDyingLightEffectVariant(MatterIntEnum): - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0x00 + class DyingLightEffectVariantEnum(MatterIntEnum): + kDyingLightFadeOff = 0x00 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown # enum value. This specific should never be transmitted. kUnknownEnumValue = 1, - class OnOffEffectIdentifier(MatterIntEnum): + class EffectIdentifierEnum(MatterIntEnum): kDelayedAllOff = 0x00 kDyingLight = 0x01 # All received enum values that are not listed above will be mapped @@ -1334,10 +1334,10 @@ class OnOffEffectIdentifier(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 2, - class OnOffStartUpOnOff(MatterIntEnum): + class StartUpOnOffEnum(MatterIntEnum): kOff = 0x00 kOn = 0x01 - kTogglePreviousOnOff = 0x02 + kToggle = 0x02 # All received enum values that are not listed above will be mapped # to kUnknownEnumValue. This is a helper enum value that should only # be used by code to process how it handles receiving and unknown @@ -1347,9 +1347,9 @@ class OnOffStartUpOnOff(MatterIntEnum): class Bitmaps: class Feature(IntFlag): kLighting = 0x1 - kDeadFront = 0x2 + kDeadFrontBehavior = 0x2 - class OnOffControl(IntFlag): + class OnOffControlBitmap(IntFlag): kAcceptOnlyWhenOn = 0x1 class Commands: @@ -1403,11 +1403,11 @@ class OffWithEffect(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="effectIdentifier", Tag=0, Type=OnOff.Enums.OnOffEffectIdentifier), + ClusterObjectFieldDescriptor(Label="effectIdentifier", Tag=0, Type=OnOff.Enums.EffectIdentifierEnum), ClusterObjectFieldDescriptor(Label="effectVariant", Tag=1, Type=uint), ]) - effectIdentifier: 'OnOff.Enums.OnOffEffectIdentifier' = 0 + effectIdentifier: 'OnOff.Enums.EffectIdentifierEnum' = 0 effectVariant: 'uint' = 0 @dataclass @@ -1520,9 +1520,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, OnOff.Enums.OnOffStartUpOnOff]) + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, OnOff.Enums.StartUpOnOffEnum]) - value: 'typing.Union[None, Nullable, OnOff.Enums.OnOffStartUpOnOff]' = None + value: 'typing.Union[None, Nullable, OnOff.Enums.StartUpOnOffEnum]' = None @dataclass class GeneratedCommandList(ClusterAttributeDescriptor): diff --git a/src/controller/python/chip/clusters/TestObjects.py b/src/controller/python/chip/clusters/TestObjects.py index 6e9f5bd8c0af36..cf8733dfd5a3bd 100644 --- a/src/controller/python/chip/clusters/TestObjects.py +++ b/src/controller/python/chip/clusters/TestObjects.py @@ -29,15 +29,15 @@ class OnOff: id: typing.ClassVar[int] = 0x0006 - class OnOffDelayedAllOffEffectVariant(IntEnum): - kFadeToOffIn0p8Seconds = 0x00 + class DelayedAllOffEffectVariantEnum(IntEnum): + kDelayedOffFastFade = 0x00 kNoFade = 0x01 - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 0x02 + kDelayedOffSlowFade = 0x02 - class OnOffDyingLightEffectVariant(IntEnum): - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0x00 + class DyingLightEffectVariantEnum(IntEnum): + kDyingLightFadeOff = 0x00 - class OnOffEffectIdentifier(IntEnum): + class EffectIdentifierEnum(IntEnum): kDelayedAllOff = 0x00 kDyingLight = 0x01 diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index c8f0a6b4767829..c69649abde125a 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3062,10 +3062,17 @@ - EffectVariantEnum - IdentifyTypeEnum OnOff: - - OnOffDelayedAllOffEffectVariant - - OnOffDyingLightEffectVariant - - OnOffEffectIdentifier - - OnOffStartUpOnOff + # DelayedOnOffEffectVariantEnum, DyingLightEffectVariantEnum, + # EffectIdentifierEnum, and StartUpOnOffEnum were originally named + # OnOffDelayedAllOffEffectVariant, + # OnOffDelayedAllOffEffectVariant, OnOffEffectIdentifier, and + # OnOffStartUpOnOff, but we generate the same API for the names + # with/without "Enum" at the end, and with/without the cluster + # name at the beginning, so the name can just change here. + - DelayedAllOffEffectVariantEnum + - DyingLightEffectVariantEnum + - EffectIdentifierEnum + - StartUpOnOffEnum LevelControl: - MoveMode - StepMode @@ -3283,16 +3290,23 @@ - Display - Actuator OnOff: - OnOffDelayedAllOffEffectVariant: + # DelayedOnOffEffectVariantEnum, DyingLightEffectVariantEnum, + # EffectIdentifierEnum, and StartUpOnOffEnum were originally named + # OnOffDelayedAllOffEffectVariant, + # OnOffDelayedAllOffEffectVariant, OnOffEffectIdentifier, and + # OnOffStartUpOnOff, but we generate the same API for the names + # with/without "Enum" at the end, and with/without the cluster + # name at the beginning, so the name can just change here. + DelayedAllOffEffectVariantEnum: - FadeToOffIn0p8Seconds - NoFade - 50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds - OnOffDyingLightEffectVariant: + DyingLightEffectVariantEnum: - 20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second - OnOffEffectIdentifier: + EffectIdentifierEnum: - DelayedAllOff - DyingLight - OnOffStartUpOnOff: + StartUpOnOffEnum: - Off - On - TogglePreviousOnOff @@ -7562,8 +7576,65 @@ - release: "Future" versions: "future" + introduced: + enum values: + OnOff: + DelayedAllOffEffectVariantEnum: + - DelayedOffFastFade + - DelayedOffSlowFade + DyingLightEffectVariantEnum: + - DyingLightFadeOff + StartUpOnOffEnum: + - Toggle + bitmaps: + OnOff: + - OnOffControlBitmap + bitmap values: + OnOff: + Feature: + - DeadFrontBehavior + OnOffControlBitmap: + - AcceptOnlyWhenOn + deprecated: + enum values: + OnOff: + DelayedAllOffEffectVariantEnum: + - FadeToOffIn0p8Seconds + - 50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds + DyingLightEffectVariantEnum: + - 20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second + StartUpOnOffEnum: + - TogglePreviousOnOff + bitmaps: + OnOff: + - OnOffControl + bitmap values: + OnOff: + Feature: + - DeadFront provisional: bitmaps: BarrierControl: - BarrierControlCapabilities - BarrierControlSafetyStatus + attributes: + GeneralDiagnostics: + # Not in the spec yet. + - AverageWearCount + renames: + enum values: + OnOff: + DelayedAllOffEffectVariantEnum: + DelayedOffFastFade: FadeToOffIn0p8Seconds + DelayedOffSlowFade: 50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds + DyingLightEffectVariantEnum: + DyingLightFadeOff: 20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second + StartUpOnOffEnum: + Toggle: TogglePreviousOnOff + bitmaps: + OnOff: + OnOffControlBitmap: OnOffControl + bitmap values: + OnOff: + Feature: + DeadFrontBehavior: DeadFront diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index c1100d389c1ce8..e1ffc83ada1cac 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -2772,6 +2772,7 @@ static id _Nullable DecodeAttributeValueForGeneralDiagnosticsCluster( value = [NSNumber numberWithBool:cppValue]; return value; } +#if MTR_ENABLE_PROVISIONAL case Attributes::AverageWearCount::Id: { using TypeInfo = Attributes::AverageWearCount::TypeInfo; TypeInfo::DecodableType cppValue; @@ -2783,6 +2784,7 @@ static id _Nullable DecodeAttributeValueForGeneralDiagnosticsCluster( value = [NSNumber numberWithUnsignedInt:cppValue]; return value; } +#endif // MTR_ENABLE_PROVISIONAL default: { break; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 2ca810eff72c96..7099a5d570eb61 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -4881,16 +4881,16 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); - (void)readAttributeAverageWearCountWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion - MTR_NEWLY_AVAILABLE; + MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeAverageWearCountWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler - MTR_NEWLY_AVAILABLE; + MTR_PROVISIONALLY_AVAILABLE; + (void)readAttributeAverageWearCountWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, - NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; + NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); @@ -25627,16 +25627,21 @@ typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) { } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTROnOffDelayedAllOffEffectVariant) { - MTROnOffDelayedAllOffEffectVariantFadeToOffIn0p8Seconds API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, + MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade MTR_NEWLY_AVAILABLE = 0x00, + MTROnOffDelayedAllOffEffectVariantFadeToOffIn0p8Seconds API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTROnOffDelayedAllOffEffectVariantDelayedOffFastFade") + = 0x00, MTROnOffDelayedAllOffEffectVariantNoFade API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTROnOffDelayedAllOffEffectVariant50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds API_AVAILABLE( - ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTROnOffDelayedAllOffEffectVariantDelayedOffSlowFade MTR_NEWLY_AVAILABLE = 0x02, + MTROnOffDelayedAllOffEffectVariant50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds API_AVAILABLE(ios(16.1), macos(13.0), + watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTROnOffDelayedAllOffEffectVariantDelayedOffSlowFade") = 0x02, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_ENUM(uint8_t, MTROnOffDyingLightEffectVariant) { - MTROnOffDyingLightEffectVariant20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second API_AVAILABLE( - ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTROnOffDyingLightEffectVariantDyingLightFadeOff MTR_NEWLY_AVAILABLE = 0x00, + MTROnOffDyingLightEffectVariant20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second API_AVAILABLE(ios(16.1), macos(13.0), + watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTROnOffDyingLightEffectVariantDyingLightFadeOff") = 0x00, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -25648,17 +25653,29 @@ typedef NS_ENUM(uint8_t, MTROnOffEffectIdentifier) { typedef NS_ENUM(uint8_t, MTROnOffStartUpOnOff) { MTROnOffStartUpOnOffOff API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTROnOffStartUpOnOffOn API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, - MTROnOffStartUpOnOffTogglePreviousOnOff API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x02, + MTROnOffStartUpOnOffToggle MTR_NEWLY_AVAILABLE = 0x02, + MTROnOffStartUpOnOffTogglePreviousOnOff API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTROnOffStartUpOnOffToggle") + = 0x02, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); typedef NS_OPTIONS(uint32_t, MTROnOffFeature) { MTROnOffFeatureLighting API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, - MTROnOffFeatureDeadFront API_AVAILABLE(ios(17.1), macos(14.1), watchos(10.1), tvos(17.1)) = 0x2, + MTROnOffFeatureDeadFrontBehavior MTR_NEWLY_AVAILABLE = 0x2, + MTROnOffFeatureDeadFront API_AVAILABLE(ios(17.1), macos(14.1), watchos(10.1), tvos(17.1)) + MTR_NEWLY_DEPRECATED("Please use MTROnOffFeatureDeadFrontBehavior") + = 0x2, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint8_t, MTROnOffControlBitmap) { + MTROnOffControlBitmapAcceptOnlyWhenOn MTR_NEWLY_AVAILABLE = 0x1, +} MTR_NEWLY_AVAILABLE; + typedef NS_OPTIONS(uint8_t, MTROnOffControl) { - MTROnOffControlAcceptOnlyWhenOn API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + MTROnOffControlAcceptOnlyWhenOn API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use MTROnOffControlBitmapAcceptOnlyWhenOn") + = 0x1, +} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) MTR_NEWLY_DEPRECATED("Please use MTROnOffControlBitmap"); typedef NS_ENUM(uint8_t, MTRLevelControlMoveMode) { MTRLevelControlMoveModeUp API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 4a836a0ee0f31f..25a07b19d080eb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -3909,7 +3909,7 @@ - (void)readAttributeStartUpOnOffWithCompletion:(void (^)(NSNumber * _Nullable v { MTRReadParams * params = [[MTRReadParams alloc] init]; using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo; - return MTRReadAttribute( + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self.endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -3960,7 +3960,7 @@ - (void)subscribeAttributeStartUpOnOffWithParams:(MTRSubscribeParams * _Nonnull) reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self.endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -3970,9 +3970,9 @@ + (void)readAttributeStartUpOnOffWithClusterStateCache:(MTRClusterStateCacheCont queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(NullableOnOffClusterOnOffStartUpOnOffAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(NullableOnOffClusterStartUpOnOffEnumAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; using TypeInfo = OnOff::Attributes::StartUpOnOff::TypeInfo; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index e8bd7d7267f71f..db2cda745ccbc1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -169,20 +169,20 @@ typedef void (*NullableIdentifyClusterEffectVariantEnumAttributeCallback)( typedef void (*IdentifyClusterIdentifyTypeEnumAttributeCallback)(void *, chip::app::Clusters::Identify::IdentifyTypeEnum); typedef void (*NullableIdentifyClusterIdentifyTypeEnumAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*OnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallback)( - void *, chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant); -typedef void (*NullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OnOffClusterOnOffDyingLightEffectVariantAttributeCallback)(void *, - chip::app::Clusters::OnOff::OnOffDyingLightEffectVariant); -typedef void (*NullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OnOffClusterOnOffEffectIdentifierAttributeCallback)(void *, chip::app::Clusters::OnOff::OnOffEffectIdentifier); -typedef void (*NullableOnOffClusterOnOffEffectIdentifierAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*OnOffClusterOnOffStartUpOnOffAttributeCallback)(void *, chip::app::Clusters::OnOff::OnOffStartUpOnOff); -typedef void (*NullableOnOffClusterOnOffStartUpOnOffAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*OnOffClusterDelayedAllOffEffectVariantEnumAttributeCallback)( + void *, chip::app::Clusters::OnOff::DelayedAllOffEffectVariantEnum); +typedef void (*NullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OnOffClusterDyingLightEffectVariantEnumAttributeCallback)(void *, + chip::app::Clusters::OnOff::DyingLightEffectVariantEnum); +typedef void (*NullableOnOffClusterDyingLightEffectVariantEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OnOffClusterEffectIdentifierEnumAttributeCallback)(void *, chip::app::Clusters::OnOff::EffectIdentifierEnum); +typedef void (*NullableOnOffClusterEffectIdentifierEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*OnOffClusterStartUpOnOffEnumAttributeCallback)(void *, chip::app::Clusters::OnOff::StartUpOnOffEnum); +typedef void (*NullableOnOffClusterStartUpOnOffEnumAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*LevelControlClusterMoveModeAttributeCallback)(void *, chip::app::Clusters::LevelControl::MoveMode); typedef void (*NullableLevelControlClusterMoveModeAttributeCallback)( void *, const chip::app::DataModel::Nullable &); @@ -20074,271 +20074,270 @@ class MTRNullableIdentifyClusterIdentifyTypeEnumAttributeCallbackSubscriptionBri MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge - : public MTRCallbackBridge +class MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant value); + static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::DelayedAllOffEffectVariantEnum value); }; -class MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackSubscriptionBridge - : public MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge +class MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackSubscriptionBridge + : public MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge { public: - MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackSubscriptionBridge( + MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge(queue, handler, action), + MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge::KeepAliveOnCallback; - using MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge::OnDone; + using MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge(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 MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackSubscriptionBridge - : public MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge +class MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge { public: - MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackSubscriptionBridge( + MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge(queue, handler, action), + MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge::OnDone; + using MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge - : public MTRCallbackBridge +class MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::OnOffDyingLightEffectVariant value); + static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::DyingLightEffectVariantEnum value); }; -class MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackSubscriptionBridge - : public MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge +class MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackSubscriptionBridge + : public MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge { public: - MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackSubscriptionBridge( + MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge(queue, handler, action), + MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge::KeepAliveOnCallback; - using MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge::OnDone; + using MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge(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 MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackSubscriptionBridge - : public MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge +class MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge { public: - MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackSubscriptionBridge( + MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge(queue, handler, action), + MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge::OnDone; + using MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge - : public MTRCallbackBridge +class MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::OnOffEffectIdentifier value); + static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::EffectIdentifierEnum value); }; -class MTROnOffClusterOnOffEffectIdentifierAttributeCallbackSubscriptionBridge - : public MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge +class MTROnOffClusterEffectIdentifierEnumAttributeCallbackSubscriptionBridge + : public MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge { public: - MTROnOffClusterOnOffEffectIdentifierAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge(queue, handler, action), + MTROnOffClusterEffectIdentifierEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge::KeepAliveOnCallback; - using MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge::OnDone; + using MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge(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 MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackSubscriptionBridge - : public MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge +class MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge { public: - MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackSubscriptionBridge( + MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge(queue, handler, action), + MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge::OnDone; + using MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge - : public MTRCallbackBridge +class MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::OnOffStartUpOnOff value); + static void OnSuccessFn(void * context, chip::app::Clusters::OnOff::StartUpOnOffEnum value); }; -class MTROnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge - : public MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge +class MTROnOffClusterStartUpOnOffEnumAttributeCallbackSubscriptionBridge + : public MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge { public: - MTROnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(queue, handler, action), + MTROnOffClusterStartUpOnOffEnumAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge::KeepAliveOnCallback; - using MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge::OnDone; + using MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge(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 MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge - : public MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge +class MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackSubscriptionBridge + : public MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge { public: - MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge( + MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge(queue, handler, action), + MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge::OnDone; + using MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge::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 1030ef7ffac311..e7139f25dc848b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -20743,15 +20743,15 @@ } } -void MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::OnOff::OnOffDelayedAllOffEffectVariant value) +void MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::OnOff::DelayedAllOffEffectVariantEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20766,8 +20766,8 @@ } } -void MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20778,7 +20778,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOnOffClusterOnOffDelayedAllOffEffectVariantAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOnOffClusterDelayedAllOffEffectVariantEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20793,15 +20793,15 @@ } } -void MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::OnOff::OnOffDyingLightEffectVariant value) +void MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::OnOff::DyingLightEffectVariantEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROnOffClusterOnOffDyingLightEffectVariantAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROnOffClusterDyingLightEffectVariantEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20816,8 +20816,8 @@ } } -void MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20828,7 +20828,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOnOffClusterOnOffDyingLightEffectVariantAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOnOffClusterDyingLightEffectVariantEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20843,15 +20843,15 @@ } } -void MTROnOffClusterOnOffEffectIdentifierAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::OnOff::OnOffEffectIdentifier value) +void MTROnOffClusterEffectIdentifierEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::OnOff::EffectIdentifierEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROnOffClusterOnOffEffectIdentifierAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROnOffClusterEffectIdentifierEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20866,8 +20866,8 @@ } } -void MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20878,7 +20878,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOnOffClusterOnOffEffectIdentifierAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOnOffClusterEffectIdentifierEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20893,15 +20893,15 @@ } } -void MTROnOffClusterOnOffStartUpOnOffAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::OnOff::OnOffStartUpOnOff value) +void MTROnOffClusterStartUpOnOffEnumAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::OnOff::StartUpOnOffEnum value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTROnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTROnOffClusterStartUpOnOffEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -20916,8 +20916,8 @@ } } -void MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -20928,7 +20928,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableOnOffClusterOnOffStartUpOnOffAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableOnOffClusterStartUpOnOffEnumAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 0037872c3e9406..9fed7c112d5aba 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -2103,7 +2103,7 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeTestEventTriggersEnabledID API_AVAILABLE( ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000008, - MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeAverageWearCountID MTR_NEWLY_AVAILABLE = 0x00000009, + MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeAverageWearCountID MTR_PROVISIONALLY_AVAILABLE = 0x00000009, MTRAttributeIDTypeClusterGeneralDiagnosticsAttributeGeneratedCommandListID API_AVAILABLE( ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 2c29065af237e8..f3dc1132af3bb8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -1902,7 +1902,8 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - (NSDictionary *)readAttributeTestEventTriggersEnabledWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -- (NSDictionary *)readAttributeAverageWearCountWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; +- (NSDictionary *)readAttributeAverageWearCountWithParams:(MTRReadParams * _Nullable)params + MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index d9055c043433a6..545e369130780a 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -670,9 +670,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) namespace StartUpOnOff { -EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::OnOff::Id, Id, readable, sizeof(temp)); @@ -687,9 +687,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -702,7 +702,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::OnOffSt EmberAfStatus SetNull(chip::EndpointId endpoint) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); @@ -710,7 +710,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) } EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value) + const chip::app::DataModel::Nullable & value) { if (value.IsNull()) { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 604cf366de9fad..1430ddedd7efd8 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -154,11 +154,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); namespace StartUpOnOff { EmberAfStatus Get(chip::EndpointId endpoint, - DataModel::Nullable & value); // OnOffStartUpOnOff -EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::OnOffStartUpOnOff value); + DataModel::Nullable & value); // StartUpOnOffEnum +EmberAfStatus Set(chip::EndpointId endpoint, chip::app::Clusters::OnOff::StartUpOnOffEnum value); EmberAfStatus SetNull(chip::EndpointId endpoint); EmberAfStatus Set(chip::EndpointId endpoint, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); } // namespace StartUpOnOff namespace FeatureMap { 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 4587208e0cc40c..949458b352d355 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 @@ -68,33 +68,33 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(Identify::IdentifyTypeE } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::OnOffDelayedAllOffEffectVariant val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::DelayedAllOffEffectVariantEnum val) { - using EnumType = OnOff::OnOffDelayedAllOffEffectVariant; + using EnumType = OnOff::DelayedAllOffEffectVariantEnum; switch (val) { - case EnumType::kFadeToOffIn0p8Seconds: + case EnumType::kDelayedOffFastFade: case EnumType::kNoFade: - case EnumType::k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds: + case EnumType::kDelayedOffSlowFade: return val; default: return static_cast(3); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::OnOffDyingLightEffectVariant val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::DyingLightEffectVariantEnum val) { - using EnumType = OnOff::OnOffDyingLightEffectVariant; + using EnumType = OnOff::DyingLightEffectVariantEnum; switch (val) { - case EnumType::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second: + case EnumType::kDyingLightFadeOff: return val; default: return static_cast(1); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::OnOffEffectIdentifier val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::EffectIdentifierEnum val) { - using EnumType = OnOff::OnOffEffectIdentifier; + using EnumType = OnOff::EffectIdentifierEnum; switch (val) { case EnumType::kDelayedAllOff: @@ -104,14 +104,14 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::OnOffEffectIdent return static_cast(2); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::OnOffStartUpOnOff val) +static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::StartUpOnOffEnum val) { - using EnumType = OnOff::OnOffStartUpOnOff; + using EnumType = OnOff::StartUpOnOffEnum; switch (val) { case EnumType::kOff: case EnumType::kOn: - case EnumType::kTogglePreviousOnOff: + case EnumType::kToggle: return val; default: return static_cast(3); 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 ba288e2a87d987..af53f77a8b9ef6 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 @@ -108,12 +108,12 @@ enum class ScenesCopyMode : uint8_t namespace OnOff { -// Enum for OnOffDelayedAllOffEffectVariant -enum class OnOffDelayedAllOffEffectVariant : uint8_t +// Enum for DelayedAllOffEffectVariantEnum +enum class DelayedAllOffEffectVariantEnum : uint8_t { - kFadeToOffIn0p8Seconds = 0x00, - kNoFade = 0x01, - k50PercentDimDownIn0p8SecondsThenFadeToOffIn12Seconds = 0x02, + kDelayedOffFastFade = 0x00, + kNoFade = 0x01, + kDelayedOffSlowFade = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -121,10 +121,10 @@ enum class OnOffDelayedAllOffEffectVariant : uint8_t kUnknownEnumValue = 3, }; -// Enum for OnOffDyingLightEffectVariant -enum class OnOffDyingLightEffectVariant : uint8_t +// Enum for DyingLightEffectVariantEnum +enum class DyingLightEffectVariantEnum : uint8_t { - k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second = 0x00, + kDyingLightFadeOff = 0x00, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -132,8 +132,8 @@ enum class OnOffDyingLightEffectVariant : uint8_t kUnknownEnumValue = 1, }; -// Enum for OnOffEffectIdentifier -enum class OnOffEffectIdentifier : uint8_t +// Enum for EffectIdentifierEnum +enum class EffectIdentifierEnum : uint8_t { kDelayedAllOff = 0x00, kDyingLight = 0x01, @@ -144,12 +144,12 @@ enum class OnOffEffectIdentifier : uint8_t kUnknownEnumValue = 2, }; -// Enum for OnOffStartUpOnOff -enum class OnOffStartUpOnOff : uint8_t +// Enum for StartUpOnOffEnum +enum class StartUpOnOffEnum : uint8_t { - kOff = 0x00, - kOn = 0x01, - kTogglePreviousOnOff = 0x02, + kOff = 0x00, + kOn = 0x01, + kToggle = 0x02, // All received enum values that are not listed above will be mapped // to kUnknownEnumValue. This is a helper enum value that should only // be used by code to process how it handles receiving and unknown @@ -160,12 +160,12 @@ enum class OnOffStartUpOnOff : uint8_t // Bitmap for Feature enum class Feature : uint32_t { - kLighting = 0x1, - kDeadFront = 0x2, + kLighting = 0x1, + kDeadFrontBehavior = 0x2, }; -// Bitmap for OnOffControl -enum class OnOffControl : uint8_t +// Bitmap for OnOffControlBitmap +enum class OnOffControlBitmap : uint8_t { kAcceptOnlyWhenOn = 0x1, }; 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 2da4c0b7916186..a10542a3222de2 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 @@ -2103,8 +2103,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::OffWithEffect::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - OnOffEffectIdentifier effectIdentifier = static_cast(0); - uint8_t effectVariant = static_cast(0); + EffectIdentifierEnum effectIdentifier = static_cast(0); + uint8_t effectVariant = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2119,8 +2119,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::OffWithEffect::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - OnOffEffectIdentifier effectIdentifier = static_cast(0); - uint8_t effectVariant = static_cast(0); + EffectIdentifierEnum effectIdentifier = static_cast(0); + uint8_t effectVariant = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace OffWithEffect @@ -2167,9 +2167,9 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::OnWithTimedOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - chip::BitMask onOffControl = static_cast>(0); - uint16_t onTime = static_cast(0); - uint16_t offWaitTime = static_cast(0); + chip::BitMask onOffControl = static_cast>(0); + uint16_t onTime = static_cast(0); + uint16_t offWaitTime = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2184,9 +2184,9 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::OnWithTimedOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } - chip::BitMask onOffControl = static_cast>(0); - uint16_t onTime = static_cast(0); - uint16_t offWaitTime = static_cast(0); + chip::BitMask onOffControl = static_cast>(0); + uint16_t onTime = static_cast(0); + uint16_t offWaitTime = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace OnWithTimedOff @@ -2245,9 +2245,9 @@ struct TypeInfo namespace StartUpOnOff { struct TypeInfo { - using Type = chip::app::DataModel::Nullable; - using DecodableType = chip::app::DataModel::Nullable; - using DecodableArgType = const chip::app::DataModel::Nullable &; + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; static constexpr ClusterId GetClusterId() { return Clusters::OnOff::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpOnOff::Id; } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index a85437d32e538f..653d8d659d2ed5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -11738,7 +11738,7 @@ void registerClusterOnOff(Commands & commands, CredentialIssuerCommands * credsI credsIssuerConfig), // make_unique>(Id, "off-wait-time", 0, UINT16_MAX, Attributes::OffWaitTime::Id, WriteCommandType::kWrite, credsIssuerConfig), // - make_unique>>( + make_unique>>( Id, "start-up-on-off", 0, UINT8_MAX, Attributes::StartUpOnOff::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>>( Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, 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 951dfcd79506fb..14f88167fe5b44 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5281,7 +5281,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("OffWaitTime", 1, value); } case OnOff::Attributes::StartUpOnOff::Id: { - chip::app::DataModel::Nullable value; + chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpOnOff", 1, value); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index ad359cde71a567..c0eb8ad256e33b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -29913,6 +29913,8 @@ class SubscribeAttributeGeneralDiagnosticsTestEventTriggersEnabled : public Subs } }; +#if MTR_ENABLE_PROVISIONAL + /* * Attribute AverageWearCount */ @@ -29999,6 +30001,8 @@ class SubscribeAttributeGeneralDiagnosticsAverageWearCount : public SubscribeAtt } }; +#endif // MTR_ENABLE_PROVISIONAL + /* * Attribute GeneratedCommandList */ @@ -163567,8 +163571,10 @@ void registerClusterGeneralDiagnostics(Commands & commands) make_unique(), // make_unique(), // make_unique(), // +#if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // make_unique(), //