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.
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 c482829..99f4e03 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 @@
/** 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 @@
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 @@
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 @@
/** 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 @@
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 @@
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 fb5b944..c7ccc67 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 dd05750..6b261bb 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 @@
break;
case Clusters::OnOff::Commands::OffWithEffect::Id:
- offwitheffectCommand.effectIdentifier = static_cast<Clusters::OnOff::OnOffEffectIdentifier>(data->args[0]);
+ offwitheffectCommand.effectIdentifier = static_cast<Clusters::OnOff::EffectIdentifierEnum>(data->args[0]);
offwitheffectCommand.effectVariant = static_cast<uint8_t>(data->args[1]);
Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
offwitheffectCommand, onSuccess, onFailure);
@@ -136,7 +136,7 @@
break;
case Clusters::OnOff::Commands::OnWithTimedOff::Id:
- onwithtimedoffCommand.onOffControl = static_cast<chip::BitMask<Clusters::OnOff::OnOffControl>>(data->args[0]);
+ onwithtimedoffCommand.onOffControl = static_cast<chip::BitMask<Clusters::OnOff::OnOffControlBitmap>>(data->args[0]);
onwithtimedoffCommand.onTime = static_cast<uint16_t>(data->args[1]);
onwithtimedoffCommand.offWaitTime = static_cast<uint16_t>(data->args[2]);
Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote,
@@ -171,7 +171,7 @@
break;
case Clusters::OnOff::Commands::OffWithEffect::Id:
- offwitheffectCommand.effectIdentifier = static_cast<Clusters::OnOff::OnOffEffectIdentifier>(data->args[0]);
+ offwitheffectCommand.effectIdentifier = static_cast<Clusters::OnOff::EffectIdentifierEnum>(data->args[0]);
offwitheffectCommand.effectVariant = static_cast<uint8_t>(data->args[1]);
Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, offwitheffectCommand);
break;
@@ -181,7 +181,7 @@
break;
case Clusters::OnOff::Commands::OnWithTimedOff::Id:
- onwithtimedoffCommand.onOffControl = static_cast<chip::BitMask<Clusters::OnOff::OnOffControl>>(data->args[0]);
+ onwithtimedoffCommand.onOffControl = static_cast<chip::BitMask<Clusters::OnOff::OnOffControlBitmap>>(data->args[0]);
onwithtimedoffCommand.onTime = static_cast<uint16_t>(data->args[1]);
onwithtimedoffCommand.offWaitTime = static_cast<uint16_t>(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 d514d42..e685807 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 @@
/** 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 @@
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 @@
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 083a0b4..97f716a 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 a29ae49..5111e37 100644
--- a/examples/bridge-app/bridge-common/bridge-app.matter
+++ b/examples/bridge-app/bridge-common/bridge-app.matter
@@ -81,33 +81,33 @@
/** 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 c8112e4..05dc8ef 100644
--- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 0b878eb..05baaf5 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 27843c4..3a9b9aa 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 d890739..6cb07c0 100644
--- a/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
+++ b/examples/chef/devices/rootnode_basicvideoplayer_0ff86e943b.matter
@@ -35,33 +35,33 @@
/** 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 6045c6a..509ca99 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 73bdaee..0bb886f 100644
--- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
+++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -150,33 +150,33 @@
/** 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 @@
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 @@
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 4f2688c..8d1e28a 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 20bce9f..6f35080 100644
--- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
+++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 df5f636..0a58347 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 e3343e5..b23c65d 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 bd3428a..76a6204 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 2b604b1..738dffa 100644
--- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
+++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 369c835..27c898d 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 2a19e48..d140d84 100644
--- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
+++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter
@@ -144,33 +144,33 @@
/** 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 6971f42..6e00717 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 5a340b0..33c624a 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 6a14be6..4397a34 100644
--- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
+++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 8f2c4aa..eb4082f 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 dc75c0a..0ea88c6 100644
--- a/examples/chef/devices/rootnode_onofflight_samplemei.matter
+++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 4d6bc2c..38346c0 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 631106d..6b2dcda 100644
--- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
+++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 @@
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 @@
/** 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 993b6fb..704b31b 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 ace5834..c607ab3 100644
--- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
+++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter
@@ -144,33 +144,33 @@
/** 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 @@
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 669e146..d21afe6 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 ab82d2f..9b47497 100644
--- a/examples/chef/devices/rootnode_pump_5f904818cc.matter
+++ b/examples/chef/devices/rootnode_pump_5f904818cc.matter
@@ -81,33 +81,33 @@
/** 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 6966139..a1d85a9 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 b10f2d6..ed92751 100644
--- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter
+++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter
@@ -81,33 +81,33 @@
/** 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 025f350..feae196 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 1fffb62..0c8edcc 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 9c8af2a..b9f4ebb 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 c93e488..f9ccfdc9 100644
--- a/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
+++ b/examples/chef/devices/rootnode_roomairconditioner_9cf3607804.matter
@@ -150,33 +150,33 @@
/** 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 2d87211..051e023 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 9903f33..b6d777a 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 36ead72..eb67e68 100644
--- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
+++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter
@@ -75,33 +75,33 @@
/** 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 7a3660d..f418856 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 d81d430..2547954 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 7de5332..2488ad1 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 750d403..63dcae9 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 3832adf..d2b832c 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 0d39b5b..5bc18df 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 @@
/** 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 @@
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 @@
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 4662666..539a331 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 9cf2e7b..3c9d19e 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 @@
/** 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 @@
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 @@
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 e8e05aa..92e6234 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 a91fb7f..cf72c88 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 @@
/** 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 @@
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 @@
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 9518559..fedde31 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 f599263..82bf340 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 @@
/** 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 @@
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 @@
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 ecd8f43..ba733c9 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 4f55582..0a5a81e 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -297,33 +297,33 @@
/** 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 @@
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 @@
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 bb3acbf..f76450d 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 dbbfeb0..26175dc 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 @@
/** 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 @@
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 @@
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 6ff4102..2a24f5f 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 ab504ab..c4fe7ff 100644
--- a/examples/lighting-app/qpg/src/AppTask.cpp
+++ b/examples/lighting-app/qpg/src/AppTask.cpp
@@ -159,30 +159,28 @@
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<Clusters::OnOff::OnOffDelayedAllOffEffectVariant>(effectVariant);
- if (typedEffectVariant == Clusters::OnOff::OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds)
+ auto typedEffectVariant = static_cast<Clusters::OnOff::DelayedAllOffEffectVariantEnum>(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<Clusters::OnOff::OnOffDyingLightEffectVariant>(effectVariant);
- if (typedEffectVariant ==
- Clusters::OnOff::OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second)
+ auto typedEffectVariant = static_cast<Clusters::OnOff::DyingLightEffectVariantEnum>(effectVariant);
+ if (typedEffectVariant == Clusters::OnOff::DyingLightEffectVariantEnum::kDyingLightFadeOff)
{
- ChipLogProgress(Zcl, "OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second");
+ ChipLogProgress(Zcl, "DyingLightEffectVariantEnum::kDyingLightFadeOff");
}
}
}
@@ -190,8 +188,8 @@
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 9dabc35..e6fff86 100644
--- a/examples/lighting-app/qpg/zap/light.matter
+++ b/examples/lighting-app/qpg/zap/light.matter
@@ -150,33 +150,33 @@
/** 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 @@
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 @@
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 da4aa18..c445c18 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 ffc7897..aa115f0 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 @@
/** 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 @@
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 @@
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 9517d51..d72f215 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 96ac365..b4d0692 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 @@
/** 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 @@
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 @@
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 08d5d55..83ba6bb 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 2c5807f..769dc00 100644
--- a/examples/lighting-app/silabs/src/LightingManager.cpp
+++ b/examples/lighting-app/silabs/src/LightingManager.cpp
@@ -42,8 +42,8 @@
OnOffEffect gEffect = {
chip::EndpointId{ 1 },
LightMgr().OnTriggerOffWithEffect,
- OnOffEffectIdentifier::kDelayedAllOff,
- to_underlying(OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds),
+ EffectIdentifierEnum::kDelayedAllOff,
+ to_underlying(DelayedAllOffEffectVariantEnum::kDelayedOffFastFade),
};
} // namespace
@@ -288,32 +288,32 @@
// 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<OnOffDelayedAllOffEffectVariant>(effectVariant);
- if (typedEffectVariant == OnOffDelayedAllOffEffectVariant::kFadeToOffIn0p8Seconds)
+ auto typedEffectVariant = static_cast<DelayedAllOffEffectVariantEnum>(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<OnOffDyingLightEffectVariant>(effectVariant);
- if (typedEffectVariant == OnOffDyingLightEffectVariant::k20PercenterDimUpIn0p5SecondsThenFadeToOffIn1Second)
+ auto typedEffectVariant = static_cast<DyingLightEffectVariantEnum>(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 9d97598..51d3ca9 100644
--- a/examples/lock-app/lock-common/lock-app.matter
+++ b/examples/lock-app/lock-common/lock-app.matter
@@ -81,33 +81,33 @@
/** 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 @@
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 026f356..713ba13 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 60987b1..f4d4af5 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 b54cf5a..44664ec 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 @@
/** 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 @@
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 @@
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 e3ce15f..adf9ab4 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 fa283c4..e0c658d 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -318,33 +318,33 @@
/** 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 @@
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 @@
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 @@
/** 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 @@
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 @@
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 d3c3fec..51adb3f 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 78a45b3..6b12e60 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -318,33 +318,33 @@
/** 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 @@
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 @@
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 @@
/** 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 @@
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 @@
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 a9abe62..9aaeacc 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 426fbbc..b1a6ba1 100644
--- a/examples/pump-app/pump-common/pump-app.matter
+++ b/examples/pump-app/pump-common/pump-app.matter
@@ -75,33 +75,33 @@
/** 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 26a5265..06a4cb4 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 8e8a108..3c87212 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 @@
/** 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 4f943ac..0ebd534 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 8e8a108..3c87212 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 @@
/** 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 4f943ac..0ebd534 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 594dabd..c94f223 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 @@
/** 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 @@
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 @@
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 733e241..be2fa2d 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 b51d888..c2ee5e5 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 c72838c..1742f00 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 2f5019a..7ab6da7 100644
--- a/examples/tv-app/tv-common/tv-app.matter
+++ b/examples/tv-app/tv-common/tv-app.matter
@@ -35,33 +35,33 @@
/** 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 b789255..e4b0b8b 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 @@
/** 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 @@
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 @@
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 42bd7e6..cd6650c 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 def5cf4..78ca165 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 @@
/** 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 @@
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 @@
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 5b04932..d68f66d 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,
