Align Ballast Configuration XML to spec. (#29678)

* Align Ballast Configuration XML to spec. Fixes #29669 * Auto-update ZAP files that involve Ballast Configuration. * Regenerate generated code.
project-chip · Oct 10, 2023 · 6deee69 · 6deee69
1 parent b9b33a7
commit 6deee69
Show file tree

Hide file tree

Showing 20 changed files with 243 additions and 52 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -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;
@@ -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;

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
@@ -15098,7 +15098,7 @@
  "code": 2,
  "mfgCode": null,
  "side": "server",
- "type": "bitmap8",
+ "type": "BallastStatusBitmap",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,
@@ -15258,7 +15258,7 @@
  "code": 52,
  "mfgCode": null,
  "side": "server",
- "type": "bitmap8",
+ "type": "LampAlarmModeBitmap",
  "included": 1,
  "storageOption": "RAM",
  "singleton": 0,

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
@@ -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;

diff --git a/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/ballast-configuration-cluster.xml
@@ -17,6 +17,17 @@ limitations under the License.
 <configurator>
  <domain name="Lighting"/>
 
+ <bitmap name="BallastStatusBitmap" type="bitmap8">
+ <cluster code="0x0301"/>
+ <field name="BallastNonOperational" mask="0x01"/>
+ <field name="LampFailure" mask="0x02"/>
+ </bitmap>
+
+ <bitmap name="LampAlarmModeBitmap" type="bitmap8">
+ <cluster code="0x0301"/>
+ <field name="LampBurnHours" mask="0x01"/>
+ </bitmap>
+
  <cluster>
  <name>Ballast Configuration</name>
  <domain>Lighting</domain>
@@ -32,7 +43,7 @@ limitations under the License.
  <!-- Ballast Configuration Attribute Set -->
  <attribute side="server" code="0x0000" define="PHYSICAL_MIN_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="false" default="0x01" optional="false">PhysicalMinLevel</attribute>
  <attribute side="server" code="0x0001" define="PHYSICAL_MAX_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="false" default="0xFE" optional="false">PhysicalMaxLevel</attribute>
- <attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BITMAP8" min="0x00" max="0x03" writable="false" default="0x00" optional="true">BallastStatus</attribute>
+ <attribute side="server" code="0x0002" define="BALLAST_STATUS" type="BallastStatusBitmap" min="0x00" max="0x03" writable="false" default="0x00" optional="true">BallastStatus</attribute>
  <!-- Ballast Settings Attribute Set -->
  <attribute side="server" code="0x0010" define="MIN_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="true" default="0x01" optional="false">MinLevel</attribute>
  <attribute side="server" code="0x0011" define="MAX_LEVEL" type="INT8U" min="0x01" max="0xFE" writable="true" default="0xFE" optional="false">MaxLevel</attribute>
@@ -46,7 +57,7 @@ limitations under the License.
  <attribute side="server" code="0x0031" define="LAMP_MANUFACTURER" type="CHAR_STRING" length="16" writable="true" optional="true">LampManufacturer</attribute>
  <attribute side="server" code="0x0032" define="LAMP_RATED_HOURS" type="INT24U" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampRatedHours</attribute>
  <attribute side="server" code="0x0033" define="LAMP_BURN_HOURS" type="INT24U" writable="true" default="0x000000" isNullable="true" optional="true">LampBurnHours</attribute>
- <attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="BITMAP8" min="0x00" max="0x01" writable="true" default="0x00" optional="true">LampAlarmMode</attribute>
+ <attribute side="server" code="0x0034" define="LAMP_ALARM_MODE" type="LampAlarmModeBitmap" min="0x00" max="0x01" writable="true" default="0x00" optional="true">LampAlarmMode</attribute>
  <attribute side="server" code="0x0035" define="LAMP_BURN_HOURS_TRIP_POINT" type="INT24U" writable="true" default="0xFFFFFF" isNullable="true" optional="true">LampBurnHoursTripPoint</attribute>
  </cluster>
 </configurator>
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -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;
@@ -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;

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -7633,6 +7633,10 @@
  BarrierControl:
  - BarrierControlCapabilities
  - BarrierControlSafetyStatus
+ BallastConfiguration:
+ # The BallastConfiguration cluster is provisional for now, but not marked that way.
+ - BallastStatusBitmap
+ - LampAlarmModeBitmap
  attributes:
  GeneralDiagnostics:
  # Not in the spec yet.

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm