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 9241c911093f40..da455cfcb688ac 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 @@ -436,12 +436,12 @@ server cluster OnOffSwitchConfiguration = 7 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -452,7 +452,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -464,7 +464,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -481,55 +481,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 ca0a7b9b9564c1..fb93eb979fa1c7 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 @@ -7389,7 +7389,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h b/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h index da82f0f6bbdaf9..f596534992e1bf 100644 --- a/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h +++ b/examples/all-clusters-app/ameba/main/include/LevelControlCommands.h @@ -20,6 +20,8 @@ #include "controller/ReadInteraction.h" #include +#include + #if CONFIG_ENABLE_CHIP_SHELL #include "lib/shell/Engine.h" #include "lib/shell/commands/Help.h" @@ -27,7 +29,9 @@ using namespace chip; using namespace chip::app; -using chip::app::Clusters::LevelControl::LevelControlOptions; +using chip::app::Clusters::LevelControl::MoveModeEnum; +using chip::app::Clusters::LevelControl::OptionsBitmap; +using chip::app::Clusters::LevelControl::StepModeEnum; #if CONFIG_ENABLE_CHIP_SHELL using Shell::Engine; @@ -40,6 +44,16 @@ Engine sShellSwitchLevelControlReadSubCommands; Engine sShellSwitchGroupsLevelControlSubCommands; #endif // defined(ENABLE_CHIP_SHELL) +namespace { + +template +T from_underlying(std::underlying_type_t value) +{ + return static_cast(value); +} + +} // namespace + void ProcessLevelControlUnicastBindingRead(BindingCommandData * data, const EmberBindingTableEntry & binding, OperationalDeviceProxy * peer_device) { @@ -159,34 +173,34 @@ void ProcessLevelControlUnicastBindingCommand(BindingCommandData * data, const E case Clusters::LevelControl::Commands::MoveToLevel::Id: moveToLevelCommand.level = static_cast(data->args[0]); moveToLevelCommand.transitionTime = static_cast>(data->args[1]); - moveToLevelCommand.optionsMask = static_cast>(data->args[2]); - moveToLevelCommand.optionsOverride = static_cast>(data->args[3]); + moveToLevelCommand.optionsMask = static_cast>(data->args[2]); + moveToLevelCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, moveToLevelCommand, onSuccess, onFailure); break; case Clusters::LevelControl::Commands::Move::Id: - moveCommand.moveMode = static_cast(data->args[0]); + moveCommand.moveMode = from_underlying(data->args[0]); moveCommand.rate = static_cast>(data->args[1]); - moveCommand.optionsMask = static_cast>(data->args[2]); - moveCommand.optionsOverride = static_cast>(data->args[3]); + moveCommand.optionsMask = static_cast>(data->args[2]); + moveCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, moveCommand, onSuccess, onFailure); break; case Clusters::LevelControl::Commands::Step::Id: - stepCommand.stepMode = static_cast(data->args[0]); + stepCommand.stepMode = from_underlying(data->args[0]); stepCommand.stepSize = static_cast(data->args[1]); stepCommand.transitionTime = static_cast>(data->args[2]); - stepCommand.optionsMask = static_cast>(data->args[3]); - stepCommand.optionsOverride = static_cast>(data->args[4]); + stepCommand.optionsMask = static_cast>(data->args[3]); + stepCommand.optionsOverride = static_cast>(data->args[4]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, stepCommand, onSuccess, onFailure); break; case Clusters::LevelControl::Commands::Stop::Id: - stopCommand.optionsMask = static_cast>(data->args[0]); - stopCommand.optionsOverride = static_cast>(data->args[1]); + stopCommand.optionsMask = static_cast>(data->args[0]); + stopCommand.optionsOverride = static_cast>(data->args[1]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, stopCommand, onSuccess, onFailure); break; @@ -194,34 +208,34 @@ void ProcessLevelControlUnicastBindingCommand(BindingCommandData * data, const E case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: moveToLevelWithOnOffCommand.level = static_cast(data->args[0]); moveToLevelWithOnOffCommand.transitionTime = static_cast>(data->args[1]); - moveToLevelWithOnOffCommand.optionsMask = static_cast>(data->args[2]); - moveToLevelWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); + moveToLevelWithOnOffCommand.optionsMask = static_cast>(data->args[2]); + moveToLevelWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, moveToLevelWithOnOffCommand, onSuccess, onFailure); break; case Clusters::LevelControl::Commands::MoveWithOnOff::Id: - moveWithOnOffCommand.moveMode = static_cast(data->args[0]); + moveWithOnOffCommand.moveMode = from_underlying(data->args[0]); moveWithOnOffCommand.rate = static_cast>(data->args[1]); - moveWithOnOffCommand.optionsMask = static_cast>(data->args[2]); - moveWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); + moveWithOnOffCommand.optionsMask = static_cast>(data->args[2]); + moveWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, moveWithOnOffCommand, onSuccess, onFailure); break; case Clusters::LevelControl::Commands::StepWithOnOff::Id: - stepWithOnOffCommand.stepMode = static_cast(data->args[0]); + stepWithOnOffCommand.stepMode = from_underlying(data->args[0]); stepWithOnOffCommand.stepSize = static_cast(data->args[1]); stepWithOnOffCommand.transitionTime = static_cast>(data->args[2]); - stepWithOnOffCommand.optionsMask = static_cast>(data->args[3]); - stepWithOnOffCommand.optionsOverride = static_cast>(data->args[4]); + stepWithOnOffCommand.optionsMask = static_cast>(data->args[3]); + stepWithOnOffCommand.optionsOverride = static_cast>(data->args[4]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, stepWithOnOffCommand, onSuccess, onFailure); break; case Clusters::LevelControl::Commands::StopWithOnOff::Id: - stopWithOnOffCommand.optionsMask = static_cast>(data->args[0]); - stopWithOnOffCommand.optionsOverride = static_cast>(data->args[1]); + stopWithOnOffCommand.optionsMask = static_cast>(data->args[0]); + stopWithOnOffCommand.optionsOverride = static_cast>(data->args[1]); Controller::InvokeCommandRequest(peer_device->GetExchangeManager(), peer_device->GetSecureSession().Value(), binding.remote, stopWithOnOffCommand, onSuccess, onFailure); break; @@ -246,62 +260,62 @@ void ProcessLevelControlGroupBindingCommand(BindingCommandData * data, const Emb case Clusters::LevelControl::Commands::MoveToLevel::Id: moveToLevelCommand.level = static_cast(data->args[0]); moveToLevelCommand.transitionTime = static_cast>(data->args[1]); - moveToLevelCommand.optionsMask = static_cast>(data->args[2]); - moveToLevelCommand.optionsOverride = static_cast>(data->args[3]); + moveToLevelCommand.optionsMask = static_cast>(data->args[2]); + moveToLevelCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToLevelCommand); break; case Clusters::LevelControl::Commands::Move::Id: - moveCommand.moveMode = static_cast(data->args[0]); + moveCommand.moveMode = from_underlying(data->args[0]); moveCommand.rate = static_cast>(data->args[1]); - moveCommand.optionsMask = static_cast>(data->args[2]); - moveCommand.optionsOverride = static_cast>(data->args[3]); + moveCommand.optionsMask = static_cast>(data->args[2]); + moveCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveCommand); break; case Clusters::LevelControl::Commands::Step::Id: - stepCommand.stepMode = static_cast(data->args[0]); + stepCommand.stepMode = from_underlying(data->args[0]); stepCommand.stepSize = static_cast(data->args[1]); stepCommand.transitionTime = static_cast>(data->args[2]); - stepCommand.optionsMask = static_cast>(data->args[3]); - stepCommand.optionsOverride = static_cast>(data->args[4]); + stepCommand.optionsMask = static_cast>(data->args[3]); + stepCommand.optionsOverride = static_cast>(data->args[4]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stepCommand); break; case Clusters::LevelControl::Commands::Stop::Id: - stopCommand.optionsMask = static_cast>(data->args[0]); - stopCommand.optionsOverride = static_cast>(data->args[1]); + stopCommand.optionsMask = static_cast>(data->args[0]); + stopCommand.optionsOverride = static_cast>(data->args[1]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stopCommand); break; case Clusters::LevelControl::Commands::MoveToLevelWithOnOff::Id: moveToLevelWithOnOffCommand.level = static_cast(data->args[0]); moveToLevelWithOnOffCommand.transitionTime = static_cast>(data->args[1]); - moveToLevelWithOnOffCommand.optionsMask = static_cast>(data->args[2]); - moveToLevelWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); + moveToLevelWithOnOffCommand.optionsMask = static_cast>(data->args[2]); + moveToLevelWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveToLevelWithOnOffCommand); break; case Clusters::LevelControl::Commands::MoveWithOnOff::Id: - moveWithOnOffCommand.moveMode = static_cast(data->args[0]); + moveWithOnOffCommand.moveMode = from_underlying(data->args[0]); moveWithOnOffCommand.rate = static_cast>(data->args[1]); - moveWithOnOffCommand.optionsMask = static_cast>(data->args[2]); - moveWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); + moveWithOnOffCommand.optionsMask = static_cast>(data->args[2]); + moveWithOnOffCommand.optionsOverride = static_cast>(data->args[3]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, moveWithOnOffCommand); break; case Clusters::LevelControl::Commands::StepWithOnOff::Id: - stepWithOnOffCommand.stepMode = static_cast(data->args[0]); + stepWithOnOffCommand.stepMode = from_underlying(data->args[0]); stepWithOnOffCommand.stepSize = static_cast(data->args[1]); stepWithOnOffCommand.transitionTime = static_cast>(data->args[2]); - stepWithOnOffCommand.optionsMask = static_cast>(data->args[3]); - stepWithOnOffCommand.optionsOverride = static_cast>(data->args[4]); + stepWithOnOffCommand.optionsMask = static_cast>(data->args[3]); + stepWithOnOffCommand.optionsOverride = static_cast>(data->args[4]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stepWithOnOffCommand); break; case Clusters::LevelControl::Commands::StopWithOnOff::Id: - stopWithOnOffCommand.optionsMask = static_cast>(data->args[0]); - stopWithOnOffCommand.optionsOverride = static_cast>(data->args[1]); + stopWithOnOffCommand.optionsMask = static_cast>(data->args[0]); + stopWithOnOffCommand.optionsOverride = static_cast>(data->args[1]); Controller::InvokeGroupCommandRequest(&exchangeMgr, binding.fabricIndex, binding.groupId, stopWithOnOffCommand); break; } 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 1d3e4a70ff87e8..0993d67d936b92 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 @@ -309,12 +309,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -325,14 +325,14 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } readonly attribute nullable int8u currentLevel = 0; readonly attribute int16u remainingTime = 1; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -345,55 +345,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 90bc68f64d89bf..2773862326105b 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 @@ -5206,7 +5206,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 dbaea821e711bf..f0d4b2a15f7203 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -95,12 +95,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -111,7 +111,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -123,7 +123,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -140,55 +140,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 5013e53e85fda4..bd02908278d406 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -5221,7 +5221,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 6bacc7d74d2958..85c82fb8079bb7 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -162,12 +162,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -178,7 +178,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -187,7 +187,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -200,55 +200,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index fe404e38cc0c9f..021e202ca27407 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -4414,7 +4414,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index bac397cf01a17f..773e2ad7abd973 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -182,12 +182,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,14 +198,14 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } readonly attribute nullable int8u currentLevel = 0; readonly attribute int16u remainingTime = 1; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -218,55 +218,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 4c96f6708498f9..d0eccdb6f3c0db 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -2897,7 +2897,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 f9b47858a183f5..48481ed4a348e8 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -162,12 +162,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -178,7 +178,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -187,7 +187,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -200,55 +200,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index ae7f9833be6028..9072e47eecd233 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -3151,7 +3151,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 770cee286e6c13..10ba3a2510670e 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -162,12 +162,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -178,7 +178,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -187,7 +187,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -200,55 +200,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index 62689b778ce654..2ead46c0cbbed1 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -3119,7 +3119,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 fa45ecfee359d9..52988cf072bfc4 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -158,12 +158,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -174,7 +174,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -182,7 +182,7 @@ server cluster LevelControl = 8 { readonly attribute nullable int8u currentLevel = 0; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -194,55 +194,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 40ea29e55ac961..9969ef4fa0c689 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -3039,7 +3039,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 21939ef34d78e0..988af0a35fc0ae 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -162,12 +162,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -178,7 +178,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -187,7 +187,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -200,55 +200,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index cce6ae448e774e..b7328566cefcb0 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -3119,7 +3119,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 cc73c38b5c29e1..d2b113cbc1d56c 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.matter +++ b/examples/chef/devices/rootnode_onofflight_samplemei.matter @@ -162,12 +162,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -178,7 +178,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -187,7 +187,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -200,55 +200,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_onofflight_samplemei.zap b/examples/chef/devices/rootnode_onofflight_samplemei.zap index 83f44eebd1907d..e044944cd0fad8 100644 --- a/examples/chef/devices/rootnode_onofflight_samplemei.zap +++ b/examples/chef/devices/rootnode_onofflight_samplemei.zap @@ -3119,7 +3119,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index e174a7093d794e..7ef91d6ec4fb30 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -89,12 +89,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -105,7 +105,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -113,7 +113,7 @@ server cluster LevelControl = 8 { readonly attribute nullable int8u currentLevel = 0; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -125,55 +125,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 28f47070e93356..15f1f5b3ae308f 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -2851,7 +2851,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/common/imgui_ui/windows/light.cpp b/examples/common/imgui_ui/windows/light.cpp index 3e7a44b6fea550..1fe6032281a2c6 100644 --- a/examples/common/imgui_ui/windows/light.cpp +++ b/examples/common/imgui_ui/windows/light.cpp @@ -89,8 +89,8 @@ void Light::UpdateState() LevelControl::Commands::MoveToLevel::DecodableType data; data.level = mTargetLevel.Value(); - data.optionsMask.Set(LevelControl::LevelControlOptions::kExecuteIfOff); - data.optionsOverride.Set(LevelControl::LevelControlOptions::kExecuteIfOff); + data.optionsMask.Set(LevelControl::OptionsBitmap::kExecuteIfOff); + data.optionsOverride.Set(LevelControl::OptionsBitmap::kExecuteIfOff); (void) LevelControlServer::MoveToLevel(mEndpointId, data); 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 1b9c61821dafd0..b3e60e5cc1a2fb 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.matter @@ -182,12 +182,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,7 +198,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -210,7 +210,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -227,55 +227,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 964c28d2394697..2a2f63daff482b 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-ethernet.zap @@ -3208,7 +3208,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, 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 c995fd1131e5a3..ca4fc928d64907 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -182,12 +182,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,7 +198,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -210,7 +210,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -227,55 +227,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 91b1cb089467ab..4a9640eb98edfb 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.zap @@ -4184,7 +4184,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "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 5560e896fb7e80..b0ce81ddbc8faf 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -182,12 +182,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,7 +198,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -210,7 +210,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -227,55 +227,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 b5a5f6165d0016..1584189f9e401c 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.zap @@ -3391,7 +3391,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 4c3a65953e0917..920454abc38d36 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -333,12 +333,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -349,7 +349,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -361,7 +361,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -378,55 +378,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index 99a9c4e2bfd0d5..930e46dfdcac15 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -5105,7 +5105,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "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 4cf0c1917c0c4f..d9e4ca9a38cc98 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -182,12 +182,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,7 +198,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -207,7 +207,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -220,55 +220,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.zap b/examples/lighting-app/nxp/zap/lighting-on-off.zap index ee9acb6f339fed..65feeee427a102 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.zap +++ b/examples/lighting-app/nxp/zap/lighting-on-off.zap @@ -3665,7 +3665,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 69f793b0a23e85..a85e2f6d197e78 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -182,12 +182,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,7 +198,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -207,7 +207,7 @@ server cluster LevelControl = 8 { readonly attribute int16u remainingTime = 1; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; attribute access(write: manage) nullable int8u startUpCurrentLevel = 16384; readonly attribute command_id generatedCommandList[] = 65528; @@ -220,55 +220,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/lighting-app/qpg/zap/light.zap b/examples/lighting-app/qpg/zap/light.zap index ac6d3361a666ac..2a18ea225cbd7f 100644 --- a/examples/lighting-app/qpg/zap/light.zap +++ b/examples/lighting-app/qpg/zap/light.zap @@ -4782,7 +4782,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "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 b532266a52998f..45d0e611dbaae6 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -354,12 +354,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -370,7 +370,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -382,7 +382,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -399,55 +399,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 7df31fb12e6a0d..c00e0730ae050e 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.zap @@ -4725,7 +4725,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "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 eadd7ec2a979a4..908e4338a8dd45 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -333,12 +333,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -349,7 +349,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -361,7 +361,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -378,55 +378,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 31af134875b662..9962edfa9ad934 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.zap @@ -3901,7 +3901,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/lighting-app/tizen/src/DBusInterface.cpp b/examples/lighting-app/tizen/src/DBusInterface.cpp index 86ae799dc1f5a2..e33f5f086f670c 100644 --- a/examples/lighting-app/tizen/src/DBusInterface.cpp +++ b/examples/lighting-app/tizen/src/DBusInterface.cpp @@ -173,8 +173,8 @@ gboolean DBusInterface::OnCurrentLevelChanged(LightAppLevelControl * levelContro Clusters::LevelControl::Commands::MoveToLevel::DecodableType data; data.level = light_app_level_control_get_current_level(levelControl); - data.optionsMask.Set(Clusters::LevelControl::LevelControlOptions::kExecuteIfOff); - data.optionsOverride.Set(Clusters::LevelControl::LevelControlOptions::kExecuteIfOff); + data.optionsMask.Set(Clusters::LevelControl::OptionsBitmap::kExecuteIfOff); + data.optionsOverride.Set(Clusters::LevelControl::OptionsBitmap::kExecuteIfOff); chip::DeviceLayer::StackLock lock; LevelControlServer::MoveToLevel(self->mEndpointId, data); diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index f9a9dda195ce4c..bc1050e8604835 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -426,12 +426,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ client cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -442,7 +442,7 @@ client cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -454,7 +454,7 @@ client cluster LevelControl = 8 { readonly attribute optional int16u currentFrequency = 4; readonly attribute optional int16u minFrequency = 5; readonly attribute optional int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute optional int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute optional nullable int16u onTransitionTime = 18; @@ -471,55 +471,55 @@ client cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToClosestFrequencyRequest { @@ -549,12 +549,12 @@ client cluster LevelControl = 8 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -565,7 +565,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -577,7 +577,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -594,55 +594,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 6bdeec2a4c68fc..e8aa35532dc7ac 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -12714,7 +12714,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 24db54b8e9fca7..c68d4830b0beb6 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -426,12 +426,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ client cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -442,7 +442,7 @@ client cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -454,7 +454,7 @@ client cluster LevelControl = 8 { readonly attribute optional int16u currentFrequency = 4; readonly attribute optional int16u minFrequency = 5; readonly attribute optional int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute optional int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute optional nullable int16u onTransitionTime = 18; @@ -471,55 +471,55 @@ client cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToClosestFrequencyRequest { @@ -549,12 +549,12 @@ client cluster LevelControl = 8 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -565,7 +565,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -576,7 +576,7 @@ server cluster LevelControl = 8 { readonly attribute int8u maxLevel = 3; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -592,55 +592,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index c61289814dd85e..cc205cd4014202 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -12780,7 +12780,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 fb5f5a9cbc5860..9fe08dabc85948 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -89,12 +89,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -105,7 +105,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -113,7 +113,7 @@ server cluster LevelControl = 8 { readonly attribute nullable int8u currentLevel = 0; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -125,55 +125,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 8123cfeed78cf1..375e3d3153b19f 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -3193,7 +3193,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "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 bcdc2c05b461a2..64387316daa2d6 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.matter +++ b/examples/pump-app/silabs/data_model/pump-thread-app.matter @@ -89,12 +89,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -105,7 +105,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -113,7 +113,7 @@ server cluster LevelControl = 8 { readonly attribute nullable int8u currentLevel = 0; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -125,55 +125,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 1e3b8c42177397..65f9b199e2dad7 100644 --- a/examples/pump-app/silabs/data_model/pump-thread-app.zap +++ b/examples/pump-app/silabs/data_model/pump-thread-app.zap @@ -3193,7 +3193,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "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 bcdc2c05b461a2..64387316daa2d6 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.matter +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.matter @@ -89,12 +89,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -105,7 +105,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -113,7 +113,7 @@ server cluster LevelControl = 8 { readonly attribute nullable int8u currentLevel = 0; readonly attribute int8u minLevel = 2; readonly attribute int8u maxLevel = 3; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute nullable int8u onLevel = 17; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -125,55 +125,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; 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 1e3b8c42177397..65f9b199e2dad7 100644 --- a/examples/pump-app/silabs/data_model/pump-wifi-app.zap +++ b/examples/pump-app/silabs/data_model/pump-wifi-app.zap @@ -3193,7 +3193,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "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 e6b4ddf8e7e452..686be9cfbedaeb 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -49,12 +49,12 @@ server cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ server cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -65,7 +65,7 @@ server cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -77,7 +77,7 @@ server cluster LevelControl = 8 { readonly attribute int16u currentFrequency = 4; readonly attribute int16u minFrequency = 5; readonly attribute int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute nullable int16u onTransitionTime = 18; @@ -94,55 +94,55 @@ server cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } command MoveToLevel(MoveToLevelRequest): DefaultSuccess = 0; diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 551d980c0d75e6..04bf74e8470481 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -6097,7 +6097,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp index 983b7848a04dbf..08b6fc194eee3d 100644 --- a/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp +++ b/examples/tv-casting-app/android/App/app/src/main/jni/cpp/TvCastingApp-JNI.cpp @@ -609,7 +609,7 @@ JNI_METHOD(jboolean, levelControl_1step) ChipLogError(AppServer, "MatterCallbackHandlerJNI.SetUp failed %" CHIP_ERROR_FORMAT, err.Format())); err = CastingServer::GetInstance()->LevelControl_Step( - &endpoint, static_cast(stepMode), static_cast(stepSize), + &endpoint, static_cast(stepMode), static_cast(stepSize), static_cast(transitionTime), static_cast(optionMask), static_cast(optionOverride), [](CHIP_ERROR err) { TvCastingAppJNIMgr().getMediaCommandResponseHandler(LevelControl_Step).Handle(err); }); VerifyOrExit(CHIP_NO_ERROR == err, diff --git a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm index d83aacf6566c70..e2227134d0ee8c 100644 --- a/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm +++ b/examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm @@ -1121,7 +1121,7 @@ - (void)levelControl_step:(ContentApp * _Nonnull)contentApp [ConversionUtils convertToCppTargetEndpointInfoFrom:contentApp outTargetEndpointInfo:endpoint]; return castingServer->LevelControl_Step(&endpoint, - static_cast(stepMode), stepSize, + static_cast(stepMode), stepSize, transitionTime, optionMask, optionOverride, responseFunction); }]; } diff --git a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h index 3f18d88fe9f954..90c986a0b330d4 100644 --- a/examples/tv-casting-app/tv-casting-common/include/CastingServer.h +++ b/examples/tv-casting-app/tv-casting-common/include/CastingServer.h @@ -148,7 +148,7 @@ class CastingServer : public AppDelegate /** * @brief Level Control cluster */ - CHIP_ERROR LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepMode stepMode, + CHIP_ERROR LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepModeEnum stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride, std::function responseCallback); CHIP_ERROR LevelControl_MoveToLevel(TargetEndpointInfo * endpoint, uint8_t level, uint16_t transitionTime, uint8_t optionMask, diff --git a/examples/tv-casting-app/tv-casting-common/include/LevelControl.h b/examples/tv-casting-app/tv-casting-common/include/LevelControl.h index 1f2271f5af1b22..5bb05b4ab4fadb 100644 --- a/examples/tv-casting-app/tv-casting-common/include/LevelControl.h +++ b/examples/tv-casting-app/tv-casting-common/include/LevelControl.h @@ -31,10 +31,10 @@ class StepCommand public: StepCommand() : MediaCommandBase(chip::app::Clusters::LevelControl::Id) {} - CHIP_ERROR Invoke(chip::app::Clusters::LevelControl::StepMode stepMode, uint8_t stepSize, + CHIP_ERROR Invoke(chip::app::Clusters::LevelControl::StepModeEnum stepMode, uint8_t stepSize, chip::app::DataModel::Nullable transitionTime, - chip::BitMask optionMask, - chip::BitMask optionOverride, + chip::BitMask optionMask, + chip::BitMask optionOverride, std::function responseCallback); }; @@ -45,8 +45,8 @@ class MoveToLevelCommand MoveToLevelCommand() : MediaCommandBase(chip::app::Clusters::LevelControl::Id) {} CHIP_ERROR Invoke(uint8_t level, chip::app::DataModel::Nullable transitionTime, - chip::BitMask optionMask, - chip::BitMask optionOverride, + chip::BitMask optionMask, + chip::BitMask optionOverride, std::function responseCallback); }; diff --git a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp index c328eb888b8f45..6b64a1d18c3786 100644 --- a/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp +++ b/examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp @@ -789,7 +789,7 @@ CastingServer::ContentLauncher_SubscribeToSupportedStreamingProtocols( /** * @brief Level Control cluster */ -CHIP_ERROR CastingServer::LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepMode stepMode, +CHIP_ERROR CastingServer::LevelControl_Step(TargetEndpointInfo * endpoint, chip::app::Clusters::LevelControl::StepModeEnum stepMode, uint8_t stepSize, uint16_t transitionTime, uint8_t optionMask, uint8_t optionOverride, std::function responseCallback) { diff --git a/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp b/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp index 2f0c1b4a7fc15e..d0053d83817414 100644 --- a/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp +++ b/examples/tv-casting-app/tv-casting-common/src/LevelControl.cpp @@ -21,9 +21,9 @@ using namespace chip; using namespace chip::app::Clusters; -CHIP_ERROR StepCommand::Invoke(LevelControl::StepMode stepMode, uint8_t stepSize, app::DataModel::Nullable transitionTime, - BitMask optionMask, - BitMask optionOverride, +CHIP_ERROR StepCommand::Invoke(LevelControl::StepModeEnum stepMode, uint8_t stepSize, + app::DataModel::Nullable transitionTime, BitMask optionMask, + BitMask optionOverride, std::function responseCallback) { LevelControl::Commands::Step::Type request; @@ -36,8 +36,8 @@ CHIP_ERROR StepCommand::Invoke(LevelControl::StepMode stepMode, uint8_t stepSize } CHIP_ERROR MoveToLevelCommand::Invoke(uint8_t level, app::DataModel::Nullable transitionTime, - BitMask optionMask, - BitMask optionOverride, + BitMask optionMask, + BitMask optionOverride, std::function responseCallback) { LevelControl::Commands::MoveToLevel::Type request; 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 eae72ba8cef4ad..f98df945fdeb26 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 @@ -182,12 +182,12 @@ client cluster OnOff = 6 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ client cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -198,7 +198,7 @@ client cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -210,7 +210,7 @@ client cluster LevelControl = 8 { readonly attribute optional int16u currentFrequency = 4; readonly attribute optional int16u minFrequency = 5; readonly attribute optional int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute optional int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute optional nullable int16u onTransitionTime = 18; @@ -227,55 +227,55 @@ client cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToClosestFrequencyRequest { diff --git a/scripts/tools/zap/tests/inputs/all-clusters-app.zap b/scripts/tools/zap/tests/inputs/all-clusters-app.zap index d27cf85bd498b7..dec068948ba752 100644 --- a/scripts/tools/zap/tests/inputs/all-clusters-app.zap +++ b/scripts/tools/zap/tests/inputs/all-clusters-app.zap @@ -6798,7 +6798,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/scripts/tools/zap/tests/inputs/lighting-app.zap b/scripts/tools/zap/tests/inputs/lighting-app.zap index b2552f4c791468..b75d476cbc1f17 100644 --- a/scripts/tools/zap/tests/inputs/lighting-app.zap +++ b/scripts/tools/zap/tests/inputs/lighting-app.zap @@ -4855,7 +4855,7 @@ "code": 15, "mfgCode": null, "side": "server", - "type": "LevelControlOptions", + "type": "OptionsBitmap", "included": 1, "storageOption": "RAM", "singleton": 0, diff --git a/src/app/CompatEnumNames.h b/src/app/CompatEnumNames.h index 141c37d989ff7e..5e4efd735be26c 100644 --- a/src/app/CompatEnumNames.h +++ b/src/app/CompatEnumNames.h @@ -72,6 +72,13 @@ namespace TargetNavigator { using TargetNavigatorStatusEnum = StatusEnum; } // namespace TargetNavigator +namespace LevelControl { +// https://github.com/project-chip/connectedhomeip/pull/30417 renamed/updated these +using MoveMode = MoveModeEnum; +using StepMode = StepModeEnum; +using LevelControlOptions = OptionsBitmap; +} // namespace LevelControl + } // namespace Clusters } // namespace app } // namespace chip diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index c7e376aa5a99f3..a89d9686824770 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -104,24 +104,21 @@ static EmberAfLevelControlState * getState(EndpointId endpoint); static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level, app::DataModel::Nullable transitionTimeDs, - chip::Optional> optionsMask, - chip::Optional> optionsOverride, uint16_t storedLevel); -static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t moveMode, - app::DataModel::Nullable rate, chip::Optional> optionsMask, - chip::Optional> optionsOverride); -static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t stepMode, + chip::Optional> optionsMask, + chip::Optional> optionsOverride, uint16_t storedLevel); +static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum moveMode, + app::DataModel::Nullable rate, chip::Optional> optionsMask, + chip::Optional> optionsOverride); +static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, StepModeEnum stepMode, uint8_t stepSize, app::DataModel::Nullable transitionTimeDs, - chip::Optional> optionsMask, - chip::Optional> optionsOverride); + chip::Optional> optionsMask, chip::Optional> optionsOverride); static void stopHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - chip::Optional> optionsMask, - chip::Optional> optionsOverride); + chip::Optional> optionsMask, chip::Optional> optionsOverride); static void setOnOffValue(EndpointId endpoint, bool onOff); static void writeRemainingTime(EndpointId endpoint, uint16_t remainingTimeMs); -static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, - chip::Optional> optionsMask, - chip::Optional> optionsOverride); +static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional> optionsMask, + chip::Optional> optionsOverride); #ifdef EMBER_AF_PLUGIN_SCENES class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl @@ -246,7 +243,7 @@ class DefaultLevelControlSceneHandler : public scenes::DefaultSceneHandlerImpl : Commands::MoveToLevel::Id; status = moveToLevelHandler(endpoint, command, level, app::DataModel::MakeNullable(static_cast(timeMs / 100)), - chip::Optional>(), chip::Optional>(), + chip::Optional>(), chip::Optional>(), INVALID_STORED_LEVEL); if (status != Status::Success) @@ -351,7 +348,7 @@ static void reallyUpdateCoupledColorTemp(EndpointId endpoint) if (emberAfContainsAttribute(endpoint, ColorControl::Id, ColorControl::Attributes::ColorTemperatureMireds::Id)) { - if (options.Has(LevelControlOptions::kCoupleColorTempToLevel)) + if (options.Has(OptionsBitmap::kCoupleColorTempToLevel)) { emberAfPluginLevelControlCoupledColorTempChangeCallback(endpoint); } @@ -494,9 +491,8 @@ static void setOnOffValue(EndpointId endpoint, bool onOff) #endif // EMBER_AF_PLUGIN_ON_OFF } -static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, - chip::Optional> optionsMask, - chip::Optional> optionsOverride) +static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, chip::Optional> optionsMask, + chip::Optional> optionsOverride) { #ifndef IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS if (emberAfContainsAttribute(endpoint, LevelControl::Id, Attributes::Options::Id)) @@ -561,18 +557,18 @@ static bool shouldExecuteIfOff(EndpointId endpoint, CommandId commandId, { // in case optionMask or optionOverride is not set, use of option // attribute to decide execution of the command - return options.Has(LevelControlOptions::kExecuteIfOff); + return options.Has(OptionsBitmap::kExecuteIfOff); } // ---------- The above is to distinguish if the payload is present or not - if (optionsMask.Value().Has(LevelControlOptions::kExecuteIfOff)) + if (optionsMask.Value().Has(OptionsBitmap::kExecuteIfOff)) { // Mask is present and set in the command payload, this indicates // use the over ride as temporary option - return optionsOverride.Value().Has(LevelControlOptions::kExecuteIfOff); + return optionsOverride.Value().Has(OptionsBitmap::kExecuteIfOff); } // if we are here - use the option bits - return options.Has(LevelControlOptions::kExecuteIfOff); + return options.Has(OptionsBitmap::kExecuteIfOff); } #endif // IGNORE_LEVEL_CONTROL_CLUSTER_OPTIONS @@ -608,8 +604,7 @@ Status MoveToLevel(EndpointId endpointId, const Commands::MoveToLevel::Decodable } return moveToLevelHandler(endpointId, Commands::MoveToLevel::Id, level, transitionTime, - Optional>(optionsMask), - Optional>(optionsOverride), + Optional>(optionsMask), Optional>(optionsOverride), INVALID_STORED_LEVEL); // Don't revert to the stored level } @@ -644,10 +639,10 @@ bool emberAfLevelControlClusterMoveToLevelWithOnOffCallback(app::CommandHandler optionsMask.Raw(), optionsOverride.Raw()); } - Status status = moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevelWithOnOff::Id, level, transitionTime, - Optional>(optionsMask), - Optional>(optionsOverride), - INVALID_STORED_LEVEL); // Don't revert to the stored level + Status status = + moveToLevelHandler(commandPath.mEndpointId, Commands::MoveToLevelWithOnOff::Id, level, transitionTime, + Optional>(optionsMask), Optional>(optionsOverride), + INVALID_STORED_LEVEL); // Don't revert to the stored level commandObj->AddStatus(commandPath, status); @@ -664,16 +659,17 @@ bool emberAfLevelControlClusterMoveCallback(app::CommandHandler * commandObj, co if (rate.IsNull()) { - ChipLogProgress(Zcl, "%s MOVE %x null %x %x", "RX level-control:", moveMode, optionsMask.Raw(), optionsOverride.Raw()); + ChipLogProgress(Zcl, "%s MOVE %x null %x %x", "RX level-control:", to_underlying(moveMode), optionsMask.Raw(), + optionsOverride.Raw()); } else { - ChipLogProgress(Zcl, "%s MOVE %x %u %x %x", "RX level-control:", moveMode, rate.Value(), optionsMask.Raw(), + ChipLogProgress(Zcl, "%s MOVE %x %u %x %x", "RX level-control:", to_underlying(moveMode), rate.Value(), optionsMask.Raw(), optionsOverride.Raw()); } - moveHandler(commandObj, commandPath, moveMode, rate, Optional>(optionsMask), - Optional>(optionsOverride)); + moveHandler(commandObj, commandPath, moveMode, rate, Optional>(optionsMask), + Optional>(optionsOverride)); return true; } @@ -687,17 +683,17 @@ bool emberAfLevelControlClusterMoveWithOnOffCallback(app::CommandHandler * comma if (rate.IsNull()) { - ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %x null %x %x", "RX level-control:", moveMode, optionsMask.Raw(), + ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %x null %x %x", "RX level-control:", to_underlying(moveMode), optionsMask.Raw(), optionsOverride.Raw()); } else { - ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %u %2x %x %x", "RX level-control:", moveMode, rate.Value(), optionsMask.Raw(), - optionsOverride.Raw()); + ChipLogProgress(Zcl, "%s MOVE_WITH_ON_OFF %u %2x %x %x", "RX level-control:", to_underlying(moveMode), rate.Value(), + optionsMask.Raw(), optionsOverride.Raw()); } - moveHandler(commandObj, commandPath, moveMode, rate, Optional>(optionsMask), - Optional>(optionsOverride)); + moveHandler(commandObj, commandPath, moveMode, rate, Optional>(optionsMask), + Optional>(optionsOverride)); return true; } @@ -712,17 +708,17 @@ bool emberAfLevelControlClusterStepCallback(app::CommandHandler * commandObj, co if (transitionTime.IsNull()) { - ChipLogProgress(Zcl, "%s STEP %x %x null %x %x", "RX level-control:", stepMode, stepSize, optionsMask.Raw(), + ChipLogProgress(Zcl, "%s STEP %x %x null %x %x", "RX level-control:", to_underlying(stepMode), stepSize, optionsMask.Raw(), optionsOverride.Raw()); } else { - ChipLogProgress(Zcl, "%s STEP %x %x %2x %x %x", "RX level-control:", stepMode, stepSize, transitionTime.Value(), - optionsMask.Raw(), optionsOverride.Raw()); + ChipLogProgress(Zcl, "%s STEP %x %x %2x %x %x", "RX level-control:", to_underlying(stepMode), stepSize, + transitionTime.Value(), optionsMask.Raw(), optionsOverride.Raw()); } - stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional>(optionsMask), - Optional>(optionsOverride)); + stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional>(optionsMask), + Optional>(optionsOverride)); return true; } @@ -737,17 +733,17 @@ bool emberAfLevelControlClusterStepWithOnOffCallback(app::CommandHandler * comma if (transitionTime.IsNull()) { - ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x null %x %x", "RX level-control:", stepMode, stepSize, optionsMask.Raw(), - optionsOverride.Raw()); + ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x null %x %x", "RX level-control:", to_underlying(stepMode), stepSize, + optionsMask.Raw(), optionsOverride.Raw()); } else { - ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x %2x %x %x", "RX level-control:", stepMode, stepSize, transitionTime.Value(), - optionsMask.Raw(), optionsOverride.Raw()); + ChipLogProgress(Zcl, "%s STEP_WITH_ON_OFF %x %x %2x %x %x", "RX level-control:", to_underlying(stepMode), stepSize, + transitionTime.Value(), optionsMask.Raw(), optionsOverride.Raw()); } - stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional>(optionsMask), - Optional>(optionsOverride)); + stepHandler(commandObj, commandPath, stepMode, stepSize, transitionTime, Optional>(optionsMask), + Optional>(optionsOverride)); return true; } @@ -758,8 +754,8 @@ bool emberAfLevelControlClusterStopCallback(app::CommandHandler * commandObj, co auto & optionsOverride = commandData.optionsOverride; ChipLogProgress(Zcl, "%s STOP", "RX level-control:"); - stopHandler(commandObj, commandPath, Optional>(optionsMask), - Optional>(optionsOverride)); + stopHandler(commandObj, commandPath, Optional>(optionsMask), + Optional>(optionsOverride)); return true; } @@ -769,15 +765,15 @@ bool emberAfLevelControlClusterStopWithOnOffCallback(app::CommandHandler * comma auto & optionsMask = commandData.optionsMask; auto & optionsOverride = commandData.optionsOverride; ChipLogProgress(Zcl, "%s STOP_WITH_ON_OFF", "RX level-control:"); - stopHandler(commandObj, commandPath, Optional>(optionsMask), - Optional>(optionsOverride)); + stopHandler(commandObj, commandPath, Optional>(optionsMask), + Optional>(optionsOverride)); return true; } static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8_t level, app::DataModel::Nullable transitionTimeDs, - chip::Optional> optionsMask, - chip::Optional> optionsOverride, uint16_t storedLevel) + chip::Optional> optionsMask, + chip::Optional> optionsOverride, uint16_t storedLevel) { EmberAfLevelControlState * state = getState(endpoint); app::DataModel::Nullable currentLevel; @@ -933,9 +929,9 @@ static Status moveToLevelHandler(EndpointId endpoint, CommandId commandId, uint8 return Status::Success; } -static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t moveMode, - app::DataModel::Nullable rate, chip::Optional> optionsMask, - chip::Optional> optionsOverride) +static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, MoveModeEnum moveMode, + app::DataModel::Nullable rate, chip::Optional> optionsMask, + chip::Optional> optionsOverride) { EndpointId endpoint = commandPath.mEndpointId; CommandId commandId = commandPath.mCommandId; @@ -981,12 +977,12 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom // the maximum or minimum level at the specified rate. switch (moveMode) { - case EMBER_ZCL_MOVE_MODE_UP: + case MoveModeEnum::kUp: state->increasing = true; state->moveToLevel = state->maxLevel; difference = static_cast(state->maxLevel - currentLevel.Value()); break; - case EMBER_ZCL_MOVE_MODE_DOWN: + case MoveModeEnum::kDown: state->increasing = false; state->moveToLevel = state->minLevel; difference = static_cast(currentLevel.Value() - state->minLevel); @@ -1063,10 +1059,9 @@ static void moveHandler(app::CommandHandler * commandObj, const app::ConcreteCom commandObj->AddStatus(commandPath, status); } -static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, uint8_t stepMode, +static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, StepModeEnum stepMode, uint8_t stepSize, app::DataModel::Nullable transitionTimeDs, - chip::Optional> optionsMask, - chip::Optional> optionsOverride) + chip::Optional> optionsMask, chip::Optional> optionsOverride) { EndpointId endpoint = commandPath.mEndpointId; CommandId commandId = commandPath.mCommandId; @@ -1112,7 +1107,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom // level over the specified transition time. switch (stepMode) { - case EMBER_ZCL_STEP_MODE_UP: + case StepModeEnum::kUp: state->increasing = true; if (state->maxLevel - currentLevel.Value() < stepSize) { @@ -1124,7 +1119,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom state->moveToLevel = static_cast(currentLevel.Value() + stepSize); } break; - case EMBER_ZCL_STEP_MODE_DOWN: + case StepModeEnum::kDown: state->increasing = false; if (currentLevel.Value() - state->minLevel < stepSize) { @@ -1204,8 +1199,7 @@ static void stepHandler(app::CommandHandler * commandObj, const app::ConcreteCom } static void stopHandler(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - chip::Optional> optionsMask, - chip::Optional> optionsOverride) + chip::Optional> optionsMask, chip::Optional> optionsOverride) { EndpointId endpoint = commandPath.mEndpointId; CommandId commandId = commandPath.mCommandId; diff --git a/src/app/common/templates/config-data.yaml b/src/app/common/templates/config-data.yaml index aebf378b4cef21..a7202afe6d7ba5 100644 --- a/src/app/common/templates/config-data.yaml +++ b/src/app/common/templates/config-data.yaml @@ -13,9 +13,7 @@ WeakEnums: - ColorControlOptions - ColorMode - EnhancedColorMode - - MoveMode - PHYRateEnum - - StepMode EnumsNotUsedAsTypeInXML: # List of enums that are not used as a type in XML. By adding an enum diff --git a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml index b0f562076979a8..dca3fb6f3532d1 100644 --- a/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml @@ -22,21 +22,21 @@ limitations under the License. - + - + - + - + @@ -67,7 +67,7 @@ limitations under the License. OnTransitionTime OffTransitionTime DefaultMoveRate - Options + Options StartUpCurrentLevel @@ -80,37 +80,37 @@ limitations under the License. - - + + Command description for Move - + - - + + Command description for Step - + - - + + Command description for Stop - - + + @@ -119,37 +119,37 @@ limitations under the License. - - + + Command description for MoveWithOnOff - + - - + + Command description for StepWithOnOff - + - - + + Command description for StopWithOnOff - - + + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 3b5029a8a67446..81a5349e29e1f3 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -390,12 +390,12 @@ client cluster OnOffSwitchConfiguration = 7 { /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */ client cluster LevelControl = 8 { - enum MoveMode : enum8 { + enum MoveModeEnum : enum8 { kUp = 0; kDown = 1; } - enum StepMode : enum8 { + enum StepModeEnum : enum8 { kUp = 0; kDown = 1; } @@ -406,7 +406,7 @@ client cluster LevelControl = 8 { kFrequency = 0x4; } - bitmap LevelControlOptions : bitmap8 { + bitmap OptionsBitmap : bitmap8 { kExecuteIfOff = 0x1; kCoupleColorTempToLevel = 0x2; } @@ -418,7 +418,7 @@ client cluster LevelControl = 8 { readonly attribute optional int16u currentFrequency = 4; readonly attribute optional int16u minFrequency = 5; readonly attribute optional int16u maxFrequency = 6; - attribute LevelControlOptions options = 15; + attribute OptionsBitmap options = 15; attribute optional int16u onOffTransitionTime = 16; attribute nullable int8u onLevel = 17; attribute optional nullable int16u onTransitionTime = 18; @@ -435,55 +435,55 @@ client cluster LevelControl = 8 { request struct MoveToLevelRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToLevelWithOnOffRequest { int8u level = 0; nullable int16u transitionTime = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct MoveWithOnOffRequest { - MoveMode moveMode = 0; + MoveModeEnum moveMode = 0; nullable int8u rate = 1; - LevelControlOptions optionsMask = 2; - LevelControlOptions optionsOverride = 3; + OptionsBitmap optionsMask = 2; + OptionsBitmap optionsOverride = 3; } request struct StepWithOnOffRequest { - StepMode stepMode = 0; + StepModeEnum stepMode = 0; int8u stepSize = 1; nullable int16u transitionTime = 2; - LevelControlOptions optionsMask = 3; - LevelControlOptions optionsOverride = 4; + OptionsBitmap optionsMask = 3; + OptionsBitmap optionsOverride = 4; } request struct StopWithOnOffRequest { - LevelControlOptions optionsMask = 0; - LevelControlOptions optionsOverride = 1; + OptionsBitmap optionsMask = 0; + OptionsBitmap optionsOverride = 1; } request struct MoveToClosestFrequencyRequest { diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index fe2586fdef9168..4f7071a260473a 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -1834,7 +1834,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: clusterRevision: 'uint' = None class Enums: - class MoveMode(MatterIntEnum): + class MoveModeEnum(MatterIntEnum): kUp = 0x00 kDown = 0x01 # All received enum values that are not listed above will be mapped @@ -1843,7 +1843,7 @@ class MoveMode(MatterIntEnum): # enum value. This specific should never be transmitted. kUnknownEnumValue = 2, - class StepMode(MatterIntEnum): + class StepModeEnum(MatterIntEnum): kUp = 0x00 kDown = 0x01 # All received enum values that are not listed above will be mapped @@ -1858,7 +1858,7 @@ class Feature(IntFlag): kLighting = 0x2 kFrequency = 0x4 - class LevelControlOptions(IntFlag): + class OptionsBitmap(IntFlag): kExecuteIfOff = 0x1 kCoupleColorTempToLevel = 0x2 @@ -1896,13 +1896,13 @@ class Move(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveMode), + ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveModeEnum), ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint), ]) - moveMode: 'LevelControl.Enums.MoveMode' = 0 + moveMode: 'LevelControl.Enums.MoveModeEnum' = 0 rate: 'typing.Union[Nullable, uint]' = NullValue optionsMask: 'uint' = 0 optionsOverride: 'uint' = 0 @@ -1918,14 +1918,14 @@ class Step(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepMode), + ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepModeEnum), ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="optionsMask", Tag=3, Type=uint), ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=4, Type=uint), ]) - stepMode: 'LevelControl.Enums.StepMode' = 0 + stepMode: 'LevelControl.Enums.StepModeEnum' = 0 stepSize: 'uint' = 0 transitionTime: 'typing.Union[Nullable, uint]' = NullValue optionsMask: 'uint' = 0 @@ -1982,13 +1982,13 @@ class MoveWithOnOff(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveMode), + ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=LevelControl.Enums.MoveModeEnum), ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="optionsMask", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=3, Type=uint), ]) - moveMode: 'LevelControl.Enums.MoveMode' = 0 + moveMode: 'LevelControl.Enums.MoveModeEnum' = 0 rate: 'typing.Union[Nullable, uint]' = NullValue optionsMask: 'uint' = 0 optionsOverride: 'uint' = 0 @@ -2004,14 +2004,14 @@ class StepWithOnOff(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepMode), + ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=LevelControl.Enums.StepModeEnum), ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=typing.Union[Nullable, uint]), ClusterObjectFieldDescriptor(Label="optionsMask", Tag=3, Type=uint), ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=4, Type=uint), ]) - stepMode: 'LevelControl.Enums.StepMode' = 0 + stepMode: 'LevelControl.Enums.StepModeEnum' = 0 stepSize: 'uint' = 0 transitionTime: 'typing.Union[Nullable, uint]' = NullValue optionsMask: 'uint' = 0 diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 3e8c376c9d4651..6ac6a560fc9b89 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -3074,8 +3074,12 @@ - EffectIdentifierEnum - StartUpOnOffEnum LevelControl: - - MoveMode - - StepMode + # MoveModeEnum and StepModeEnum were originally named MoveMode and + # StepMode, but we generate the same API for the names + # with/without "Enum" at the end, and with/without the cluster + # name at the beginning, so the name can just change here. + - MoveModeEnum + - StepModeEnum AccessControl: - AuthMode - ChangeTypeEnum @@ -3326,10 +3330,14 @@ - On - TogglePreviousOnOff LevelControl: - MoveMode: + # MoveModeEnum and StepModeEnum were originally named MoveMode and + # StepMode, but we generate the same API for the names + # with/without "Enum" at the end, and with/without the cluster + # name at the beginning, so the name can just change here. + MoveModeEnum: - Up - Down - StepMode: + StepModeEnum: - Up - Down AccessControl: @@ -7784,6 +7792,8 @@ - Feature ContentLauncher: - SupportedProtocolsBitmap + LevelControl: + - OptionsBitmap bitmap values: PumpConfigurationAndControl: PumpStatusBitmap: @@ -7803,6 +7813,10 @@ SupportedProtocolsBitmap: - DASH - HLS + LevelControl: + OptionsBitmap: + - ExecuteIfOff + - CoupleColorTempToLevel deprecated: event fields: WiFiNetworkDiagnostics: @@ -7821,6 +7835,8 @@ - ScenesCopyMode ContentLauncher: - SupportedStreamingProtocol + LevelControl: + - LevelControlOptions bitmap values: PumpConfigurationAndControl: PumpStatusBitmap: @@ -7920,6 +7936,8 @@ CopyModeBitmap: ScenesCopyMode ContentLauncher: SupportedProtocolsBitmap: SupportedStreamingProtocol + LevelControl: + OptionsBitmap: LevelControlOptions bitmap values: PumpConfigurationAndControl: PumpStatusBitmap: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index b1a1d7b9bfeae1..ed3c93bf2a22a9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14183,10 +14183,20 @@ typedef NS_OPTIONS(uint32_t, MTRLevelControlFeature) { MTRLevelControlFeatureFrequency MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x4, } MTR_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint8_t, MTRLevelControlOptionsBitmap) { + MTRLevelControlOptionsBitmapExecuteIfOff MTR_NEWLY_AVAILABLE = 0x1, + MTRLevelControlOptionsBitmapCoupleColorTempToLevel MTR_NEWLY_AVAILABLE = 0x2, +} MTR_NEWLY_AVAILABLE; + typedef NS_OPTIONS(uint8_t, MTRLevelControlOptions) { - MTRLevelControlOptionsExecuteIfOff MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x1, - MTRLevelControlOptionsCoupleColorTempToLevel MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x2, -} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + MTRLevelControlOptionsExecuteIfOff MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRLevelControlOptionsBitmapExecuteIfOff") + = 0x1, + MTRLevelControlOptionsCoupleColorTempToLevel MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRLevelControlOptionsBitmapCoupleColorTempToLevel") + = 0x2, +} MTR_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + MTR_NEWLY_DEPRECATED("Please use MTRLevelControlOptionsBitmap"); typedef NS_OPTIONS(uint32_t, MTRDescriptorFeature) { MTRDescriptorFeatureTagList MTR_PROVISIONALLY_AVAILABLE = 0x1, diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 98e554668e1ed6..8ff8fa39480723 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -1161,9 +1161,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) namespace Options { -EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask * value) { - using Traits = NumericAttributeTraits>; + using Traits = NumericAttributeTraits>; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LevelControl::Id, Id, readable, sizeof(temp)); @@ -1175,9 +1175,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::BitMask value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask value) { - using Traits = NumericAttributeTraits>; + using Traits = NumericAttributeTraits>; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index cb636d81838895..fb71f86275f5c5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -243,8 +243,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); namespace Options { EmberAfStatus Get(chip::EndpointId endpoint, - chip::BitMask * value); // LevelControlOptions -EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask value); + chip::BitMask * value); // OptionsBitmap +EmberAfStatus Set(chip::EndpointId endpoint, chip::BitMask value); } // namespace Options namespace OnOffTransitionTime { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index d4d6a3827b4afa..0635d492a19f2d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -118,39 +118,25 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(OnOff::StartUpOnOffEnum } } -static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::MoveMode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::MoveModeEnum val) { - using EnumType = LevelControl::MoveMode; + using EnumType = LevelControl::MoveModeEnum; switch (val) { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM case EnumType::kUp: case EnumType::kDown: -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_MOVE_MODE_UP: - case EMBER_ZCL_MOVE_MODE_DOWN: -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM return val; default: return static_cast(2); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::StepMode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(LevelControl::StepModeEnum val) { - using EnumType = LevelControl::StepMode; + using EnumType = LevelControl::StepModeEnum; switch (val) { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM case EnumType::kUp: case EnumType::kDown: -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM - case EMBER_ZCL_STEP_MODE_UP: - case EMBER_ZCL_STEP_MODE_DOWN: -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM return val; default: return static_cast(2); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 9e15920f1b27cf..1e4c6fc2526094 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -182,11 +182,8 @@ namespace OnOffSwitchConfiguration {} // namespace OnOffSwitchConfiguration namespace LevelControl { -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for MoveMode -enum class MoveMode : uint8_t +// Enum for MoveModeEnum +enum class MoveModeEnum : uint8_t { kUp = 0x00, kDown = 0x01, @@ -196,16 +193,9 @@ enum class MoveMode : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 2, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using MoveMode = EmberAfMoveMode; -static MoveMode __attribute__((unused)) kMoveModekUnknownEnumValue = static_cast(2); -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Need to convert consumers to using the new enum classes, so we -// don't just have casts all over. -#ifdef CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -// Enum for StepMode -enum class StepMode : uint8_t +// Enum for StepModeEnum +enum class StepModeEnum : uint8_t { kUp = 0x00, kDown = 0x01, @@ -215,10 +205,6 @@ enum class StepMode : uint8_t // enum value. This specific should never be transmitted. kUnknownEnumValue = 2, }; -#else // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM -using StepMode = EmberAfStepMode; -static StepMode __attribute__((unused)) kStepModekUnknownEnumValue = static_cast(2); -#endif // CHIP_USE_ENUM_CLASS_FOR_IM_ENUM // Bitmap for Feature enum class Feature : uint32_t @@ -228,8 +214,8 @@ enum class Feature : uint32_t kFrequency = 0x4, }; -// Bitmap for LevelControlOptions -enum class LevelControlOptions : uint8_t +// Bitmap for OptionsBitmap +enum class OptionsBitmap : uint8_t { kExecuteIfOff = 0x1, kCoupleColorTempToLevel = 0x2, diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 63dd7ce172de80..20f866eac71672 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -2471,8 +2471,8 @@ struct Type uint8_t level = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2489,8 +2489,8 @@ struct DecodableType uint8_t level = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace MoveToLevel @@ -2510,10 +2510,10 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::Move::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - MoveMode moveMode = static_cast(0); + MoveModeEnum moveMode = static_cast(0); DataModel::Nullable rate; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2528,10 +2528,10 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::Move::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - MoveMode moveMode = static_cast(0); + MoveModeEnum moveMode = static_cast(0); DataModel::Nullable rate; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace Move @@ -2552,11 +2552,11 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::Step::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - StepMode stepMode = static_cast(0); - uint8_t stepSize = static_cast(0); + StepModeEnum stepMode = static_cast(0); + uint8_t stepSize = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2571,11 +2571,11 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::Step::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - StepMode stepMode = static_cast(0); - uint8_t stepSize = static_cast(0); + StepModeEnum stepMode = static_cast(0); + uint8_t stepSize = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace Step @@ -2593,8 +2593,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::Stop::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2609,8 +2609,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::Stop::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace Stop @@ -2632,8 +2632,8 @@ struct Type uint8_t level = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2650,8 +2650,8 @@ struct DecodableType uint8_t level = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace MoveToLevelWithOnOff @@ -2671,10 +2671,10 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::MoveWithOnOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - MoveMode moveMode = static_cast(0); + MoveModeEnum moveMode = static_cast(0); DataModel::Nullable rate; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2689,10 +2689,10 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::MoveWithOnOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - MoveMode moveMode = static_cast(0); + MoveModeEnum moveMode = static_cast(0); DataModel::Nullable rate; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace MoveWithOnOff @@ -2713,11 +2713,11 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::StepWithOnOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - StepMode stepMode = static_cast(0); - uint8_t stepSize = static_cast(0); + StepModeEnum stepMode = static_cast(0); + uint8_t stepSize = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2732,11 +2732,11 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::StepWithOnOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - StepMode stepMode = static_cast(0); - uint8_t stepSize = static_cast(0); + StepModeEnum stepMode = static_cast(0); + uint8_t stepSize = static_cast(0); DataModel::Nullable transitionTime; - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace StepWithOnOff @@ -2754,8 +2754,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::StopWithOnOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; @@ -2770,8 +2770,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::StopWithOnOff::Id; } static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } - chip::BitMask optionsMask = static_cast>(0); - chip::BitMask optionsOverride = static_cast>(0); + chip::BitMask optionsMask = static_cast>(0); + chip::BitMask optionsOverride = static_cast>(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace StopWithOnOff @@ -2898,9 +2898,9 @@ struct TypeInfo namespace Options { struct TypeInfo { - using Type = chip::BitMask; - using DecodableType = chip::BitMask; - using DecodableArgType = chip::BitMask; + using Type = chip::BitMask; + using DecodableType = chip::BitMask; + using DecodableArgType = chip::BitMask; static constexpr ClusterId GetClusterId() { return Clusters::LevelControl::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Options::Id; } @@ -3032,7 +3032,7 @@ struct TypeInfo Attributes::MinFrequency::TypeInfo::DecodableType minFrequency = static_cast(0); Attributes::MaxFrequency::TypeInfo::DecodableType maxFrequency = static_cast(0); Attributes::Options::TypeInfo::DecodableType options = - static_cast>(0); + static_cast>(0); Attributes::OnOffTransitionTime::TypeInfo::DecodableType onOffTransitionTime = static_cast(0); Attributes::OnLevel::TypeInfo::DecodableType onLevel; Attributes::OnTransitionTime::TypeInfo::DecodableType onTransitionTime; diff --git a/zzz_generated/app-common/app-common/zap-generated/enums.h b/zzz_generated/app-common/app-common/zap-generated/enums.h index c5f97b46c44f83..03d4cfb434f07d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/enums.h @@ -63,13 +63,6 @@ enum EmberAfEnhancedColorMode : uint8_t EMBER_ZCL_ENHANCED_COLOR_MODE_ENHANCED_CURRENT_HUE_AND_CURRENT_SATURATION = 3, }; -// Enum for MoveMode -enum EmberAfMoveMode : uint8_t -{ - EMBER_ZCL_MOVE_MODE_UP = 0, - EMBER_ZCL_MOVE_MODE_DOWN = 1, -}; - // Enum for PHYRateEnum enum EmberAfPHYRateEnum : uint8_t { @@ -84,10 +77,3 @@ enum EmberAfPHYRateEnum : uint8_t EMBER_ZCL_PHY_RATE_ENUM_RATE200_G = 8, EMBER_ZCL_PHY_RATE_ENUM_RATE400_G = 9, }; - -// Enum for StepMode -enum EmberAfStepMode : uint8_t -{ - EMBER_ZCL_STEP_MODE_UP = 0, - EMBER_ZCL_STEP_MODE_DOWN = 1, -}; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index da69f3cb8a364f..df7731d7a43718 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -12504,7 +12504,7 @@ void registerClusterLevelControl(Commands & commands, CredentialIssuerCommands * WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "max-frequency", 0, UINT16_MAX, Attributes::MaxFrequency::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // - make_unique>>( + make_unique>>( Id, "options", 0, UINT8_MAX, Attributes::Options::Id, WriteCommandType::kWrite, credsIssuerConfig), // make_unique>(Id, "on-off-transition-time", 0, UINT16_MAX, Attributes::OnOffTransitionTime::Id, WriteCommandType::kWrite, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index ad5b6c9eefc4b9..7ab7474a42b0d6 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5823,7 +5823,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("MaxFrequency", 1, value); } case LevelControl::Attributes::Options::Id: { - chip::BitMask value; + chip::BitMask value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Options", 1, value); }