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/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;
}