Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align Ballast Configuration XML to spec. #29678

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Regenerate generated code.
  • Loading branch information
bzbarsky-apple committed Oct 10, 2023
commit b8d6e3810a4b896d4395e0db1ed37a6f1bc61b4c
Original file line number Diff line number Diff line change
Expand Up @@ -4533,9 +4533,18 @@ server cluster ColorControl = 768 {

/** Attributes and commands for configuring a lighting ballast. */
server cluster BallastConfiguration = 769 {
bitmap BallastStatusBitmap : BITMAP8 {
kBallastNonOperational = 0x1;
kLampFailure = 0x2;
}

bitmap LampAlarmModeBitmap : BITMAP8 {
kLampBurnHours = 0x1;
}

readonly attribute int8u physicalMinLevel = 0;
readonly attribute int8u physicalMaxLevel = 1;
readonly attribute bitmap8 ballastStatus = 2;
readonly attribute BallastStatusBitmap ballastStatus = 2;
attribute int8u minLevel = 16;
attribute int8u maxLevel = 17;
attribute nullable int8u intrinsicBallastFactor = 20;
Expand All @@ -4545,7 +4554,7 @@ server cluster BallastConfiguration = 769 {
attribute char_string<16> lampManufacturer = 49;
attribute nullable int24u lampRatedHours = 50;
attribute nullable int24u lampBurnHours = 51;
attribute bitmap8 lampAlarmMode = 52;
attribute LampAlarmModeBitmap lampAlarmMode = 52;
attribute nullable int24u lampBurnHoursTripPoint = 53;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2979,6 +2979,15 @@ server cluster ColorControl = 768 {

/** Attributes and commands for configuring a lighting ballast. */
server cluster BallastConfiguration = 769 {
bitmap BallastStatusBitmap : BITMAP8 {
kBallastNonOperational = 0x1;
kLampFailure = 0x2;
}

bitmap LampAlarmModeBitmap : BITMAP8 {
kLampBurnHours = 0x1;
}

readonly attribute int8u physicalMinLevel = 0;
readonly attribute int8u physicalMaxLevel = 1;
attribute int8u minLevel = 16;
Expand Down
13 changes: 11 additions & 2 deletions src/controller/data_model/controller-clusters.matter
Original file line number Diff line number Diff line change
Expand Up @@ -5042,9 +5042,18 @@ client cluster ColorControl = 768 {

/** Attributes and commands for configuring a lighting ballast. */
client cluster BallastConfiguration = 769 {
bitmap BallastStatusBitmap : BITMAP8 {
kBallastNonOperational = 0x1;
kLampFailure = 0x2;
}

bitmap LampAlarmModeBitmap : BITMAP8 {
kLampBurnHours = 0x1;
}

readonly attribute int8u physicalMinLevel = 0;
readonly attribute int8u physicalMaxLevel = 1;
readonly attribute optional bitmap8 ballastStatus = 2;
readonly attribute optional BallastStatusBitmap ballastStatus = 2;
attribute int8u minLevel = 16;
attribute int8u maxLevel = 17;
attribute optional nullable int8u intrinsicBallastFactor = 20;
Expand All @@ -5054,7 +5063,7 @@ client cluster BallastConfiguration = 769 {
attribute optional char_string<16> lampManufacturer = 49;
attribute optional nullable int24u lampRatedHours = 50;
attribute optional nullable int24u lampBurnHours = 51;
attribute optional bitmap8 lampAlarmMode = 52;
attribute optional LampAlarmModeBitmap lampAlarmMode = 52;
attribute optional nullable int24u lampBurnHoursTripPoint = 53;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions src/controller/python/chip/clusters/Objects.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 70 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 44 additions & 0 deletions src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading