Skip to content

Commit 3cfb087

Browse files
ericzijian1994hare-siterwell
authored and
pull[bot]
committed
[SMCO] Update XML to spec changes (#27606)
* [SMCO] Update XML to spec changes * [SMCO] Regen zap --------- Co-authored-by: Hare <[email protected]>
1 parent 7063845 commit 3cfb087

File tree

9 files changed

+219
-36
lines changed

9 files changed

+219
-36
lines changed

‎examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter

+9-4
Original file line numberDiff line numberDiff line change
@@ -1666,13 +1666,16 @@ server cluster SmokeCoAlarm = 92 {
16661666
kCOAlarm = 0x2;
16671667
}
16681668

1669-
info event SmokeAlarm = 0 {
1669+
critical event SmokeAlarm = 0 {
1670+
AlarmStateEnum alarmSeverityLevel = 0;
16701671
}
16711672

1672-
info event COAlarm = 1 {
1673+
critical event COAlarm = 1 {
1674+
AlarmStateEnum alarmSeverityLevel = 0;
16731675
}
16741676

16751677
info event LowBattery = 2 {
1678+
AlarmStateEnum alarmSeverityLevel = 0;
16761679
}
16771680

16781681
info event HardwareFault = 3 {
@@ -1690,10 +1693,12 @@ server cluster SmokeCoAlarm = 92 {
16901693
info event MuteEnded = 7 {
16911694
}
16921695

1693-
info event InterconnectSmokeAlarm = 8 {
1696+
critical event InterconnectSmokeAlarm = 8 {
1697+
AlarmStateEnum alarmSeverityLevel = 0;
16941698
}
16951699

1696-
info event InterconnectCOAlarm = 9 {
1700+
critical event InterconnectCOAlarm = 9 {
1701+
AlarmStateEnum alarmSeverityLevel = 0;
16971702
}
16981703

16991704
info event AllClear = 10 {

‎src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml

+14-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ limitations under the License.
1818
<domain name="CHIP" />
1919

2020
<cluster>
21-
<domain>Closures</domain>
21+
<domain>Measurement &amp; Sensing</domain>
2222
<name>Smoke CO Alarm</name>
2323
<code>0x005C</code>
2424
<define>SMOKE_CO_ALARM_CLUSTER</define>
@@ -57,35 +57,40 @@ limitations under the License.
5757
</command>
5858

5959
<!-- Events -->
60-
<event side="server" code="0x00" name="SmokeAlarm" priority="info" optional="true">
60+
<event side="server" code="0x00" name="SmokeAlarm" priority="critical" optional="true">
6161
<description>This event SHALL be generated when SmokeState attribute changes to either Warning or Critical state.</description>
62+
<field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
6263
</event>
63-
<event side="server" code="0x01" name="COAlarm" priority="info" optional="true">
64+
<event side="server" code="0x01" name="COAlarm" priority="critical" optional="true">
6465
<description>This event SHALL be generated when COState attribute changes to either Warning or Critical state.</description>
66+
<field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
6567
</event>
6668
<event side="server" code="0x02" name="LowBattery" priority="info" optional="false">
6769
<description>This event SHALL be generated when BatteryAlert attribute changes to either Warning or Critical state.</description>
70+
<field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
6871
</event>
6972
<event side="server" code="0x03" name="HardwareFault" priority="info" optional="false">
7073
<description>This event SHALL be generated when the device detects a hardware fault that leads to setting HardwareFaultAlert to True.</description>
7174
</event>
7275
<event side="server" code="0x04" name="EndOfService" priority="info" optional="false">
73-
<description>This event SHALL be generated when the EndOfServiceAlert is set to True.</description>
76+
<description>This event SHALL be generated when the EndOfServiceAlert is set to Expired.</description>
7477
</event>
7578
<event side="server" code="0x05" name="SelfTestComplete" priority="info" optional="false">
7679
<description>This event SHALL be generated when the SelfTest completes, and the attribute TestInProgress changes to False.</description>
7780
</event>
7881
<event side="server" code="0x06" name="AlarmMuted" priority="info" optional="true">
79-
<description>This event SHALL be generated when the DeviceMuted attribute changes to True.</description>
82+
<description>This event SHALL be generated when the DeviceMuted attribute changes to Muted.</description>
8083
</event>
8184
<event side="server" code="0x07" name="MuteEnded" priority="info" optional="true">
8285
<description>This event SHALL be generated when DeviceMuted attribute changes to NotMuted.</description>
8386
</event>
84-
<event side="server" code="0x08" name="InterconnectSmokeAlarm" priority="info" optional="true">
85-
<description>This event SHALL be generated when the device hosting the cluster receives a smoke alarm from an interconnected sensor.</description>
87+
<event side="server" code="0x08" name="InterconnectSmokeAlarm" priority="critical" optional="true">
88+
<description>This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor.</description>
89+
<field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
8690
</event>
87-
<event side="server" code="0x09" name="InterconnectCOAlarm" priority="info" optional="true">
88-
<description>This event SHALL be generated when the device hosting the cluster receives a CO alarm from an interconnected sensor.</description>
91+
<event side="server" code="0x09" name="InterconnectCOAlarm" priority="critical" optional="true">
92+
<description>This event SHALL be generated when the device hosting the server receives a smoke alarm from an interconnected sensor.</description>
93+
<field id="0" name="AlarmSeverityLevel" type="AlarmStateEnum" />
8994
</event>
9095
<event side="server" code="0x0A" name="AllClear" priority="info" optional="false">
9196
<description>This event SHALL be generated when ExpressedState attribute returns to Normal state.</description>

‎src/controller/data_model/controller-clusters.matter

+9-4
Original file line numberDiff line numberDiff line change
@@ -3208,13 +3208,16 @@ client cluster SmokeCoAlarm = 92 {
32083208
kCOAlarm = 0x2;
32093209
}
32103210

3211-
info event SmokeAlarm = 0 {
3211+
critical event SmokeAlarm = 0 {
3212+
AlarmStateEnum alarmSeverityLevel = 0;
32123213
}
32133214

3214-
info event COAlarm = 1 {
3215+
critical event COAlarm = 1 {
3216+
AlarmStateEnum alarmSeverityLevel = 0;
32153217
}
32163218

32173219
info event LowBattery = 2 {
3220+
AlarmStateEnum alarmSeverityLevel = 0;
32183221
}
32193222

32203223
info event HardwareFault = 3 {
@@ -3232,10 +3235,12 @@ client cluster SmokeCoAlarm = 92 {
32323235
info event MuteEnded = 7 {
32333236
}
32343237

3235-
info event InterconnectSmokeAlarm = 8 {
3238+
critical event InterconnectSmokeAlarm = 8 {
3239+
AlarmStateEnum alarmSeverityLevel = 0;
32363240
}
32373241

3238-
info event InterconnectCOAlarm = 9 {
3242+
critical event InterconnectCOAlarm = 9 {
3243+
AlarmStateEnum alarmSeverityLevel = 0;
32393244
}
32403245

32413246
info event AllClear = 10 {

‎src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp

+48-10
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java

+35-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)