[SMCO] Update XML to spec changes (#27606)

* [SMCO] Update XML to spec changes * [SMCO] Regen zap --------- Co-authored-by: Hare <[email protected]>
project-chip · Nov 9, 2023 · 1053794 · 1053794
1 parent 0e41fa8
commit 1053794
Show file tree

Hide file tree

Showing 9 changed files with 219 additions and 36 deletions.
diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
@@ -1666,13 +1666,16 @@ server cluster SmokeCoAlarm = 92 {
     kCOAlarm = 0x2;
   }
 
-  info event SmokeAlarm = 0 {
+  critical event SmokeAlarm = 0 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
-  info event COAlarm = 1 {
+  critical event COAlarm = 1 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
   info event LowBattery = 2 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
   info event HardwareFault = 3 {
@@ -1690,10 +1693,12 @@ server cluster SmokeCoAlarm = 92 {
   info event MuteEnded = 7 {
   }
 
-  info event InterconnectSmokeAlarm = 8 {
+  critical event InterconnectSmokeAlarm = 8 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
-  info event InterconnectCOAlarm = 9 {
+  critical event InterconnectCOAlarm = 9 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
   info event AllClear = 10 {

diff --git a/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
@@ -18,7 +18,7 @@ limitations under the License.
   <domain name="CHIP" />
 
   <cluster>
-    <domain>Closures</domain>
+    <domain>Measurement &amp; Sensing</domain>
     <name>Smoke CO Alarm</name>
     <code>0x005C</code>
     <define>SMOKE_CO_ALARM_CLUSTER</define>
@@ -57,35 +57,40 @@ limitations under the License.
     </command>
 
     <!-- Events -->
-    <event side="server" code="0x00" name="SmokeAlarm" priority="info" optional="true">
+    <event side="server" code="0x00" name="SmokeAlarm" priority="critical" optional="true">
       <description>This event SHALL be generated when SmokeState attribute changes to either Warning or Critical state.</description>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
     </event>
-    <event side="server" code="0x01" name="COAlarm" priority="info" optional="true">
+    <event side="server" code="0x01" name="COAlarm" priority="critical" optional="true">
       <description>This event SHALL be generated when COState attribute changes to either Warning or Critical state.</description>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
     </event>
     <event side="server" code="0x02" name="LowBattery" priority="info" optional="false">
       <description>This event SHALL be generated when BatteryAlert attribute changes to either Warning or Critical state.</description>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
     </event>
     <event side="server" code="0x03" name="HardwareFault" priority="info" optional="false">
       <description>This event SHALL be generated when the device detects a hardware fault that leads to setting HardwareFaultAlert to True.</description>
     </event>
     <event side="server" code="0x04" name="EndOfService" priority="info" optional="false">
-      <description>This event SHALL be generated when the EndOfServiceAlert is set to True.</description>
+      <description>This event SHALL be generated when the EndOfServiceAlert is set to Expired.</description>
     </event>
     <event side="server" code="0x05" name="SelfTestComplete" priority="info" optional="false">
       <description>This event SHALL be generated when the SelfTest completes, and the attribute TestInProgress changes to False.</description>
     </event>
     <event side="server" code="0x06" name="AlarmMuted" priority="info" optional="true">
-      <description>This event SHALL be generated when the DeviceMuted attribute changes to True.</description>
+      <description>This event SHALL be generated when the DeviceMuted attribute changes to Muted.</description>
     </event>
     <event side="server" code="0x07" name="MuteEnded" priority="info" optional="true">
       <description>This event SHALL be generated when DeviceMuted attribute changes to NotMuted.</description>
     </event>
-    <event side="server" code="0x08" name="InterconnectSmokeAlarm" priority="info" optional="true">
-      <description>This event SHALL be generated when the device hosting the cluster receives a smoke alarm from an interconnected sensor.</description>
+    <event side="server" code="0x08" name="InterconnectSmokeAlarm" priority="critical" optional="true">
+      <description>This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor.</description>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
     </event>
-    <event side="server" code="0x09" name="InterconnectCOAlarm" priority="info" optional="true">
-      <description>This event SHALL be generated when the device hosting the cluster receives a CO alarm from an interconnected sensor.</description>
+    <event side="server" code="0x09" name="InterconnectCOAlarm" priority="critical" optional="true">
+      <description>This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor.</description>
+      <field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
     </event>
     <event side="server" code="0x0A" name="AllClear" priority="info" optional="false">
       <description>This event SHALL be generated when ExpressedState attribute returns to Normal state.</description>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3208,13 +3208,16 @@ client cluster SmokeCoAlarm = 92 {
     kCOAlarm = 0x2;
   }
 
-  info event SmokeAlarm = 0 {
+  critical event SmokeAlarm = 0 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
-  info event COAlarm = 1 {
+  critical event COAlarm = 1 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
   info event LowBattery = 2 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
   info event HardwareFault = 3 {
@@ -3232,10 +3235,12 @@ client cluster SmokeCoAlarm = 92 {
   info event MuteEnded = 7 {
   }
 
-  info event InterconnectSmokeAlarm = 8 {
+  critical event InterconnectSmokeAlarm = 8 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
-  info event InterconnectCOAlarm = 9 {
+  critical event InterconnectCOAlarm = 9 {
+    AlarmStateEnum alarmSeverityLevel = 0;
   }
 
   info event AllClear = 10 {

diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java