Skip to content

Commit 1070320

Browse files
ericzijian1994hare-siterwellbzbarsky-apple
authored andcommitted
Smoke/CO: Update XML to spec changes (#26735)
* Smoke/CO: Update XML to spec changes * Remove Unknown Enum states * Update description * Regen zap Close #26705 * Update Darwin availability annotations. --------- Co-authored-by: Hare <renilr0@outlook.com> Co-authored-by: Boris Zbarsky <bzbarsky@apple.com>
1 parent 249fba1 commit 1070320

File tree

7 files changed

+70
-98
lines changed

7 files changed

+70
-98
lines changed

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

+14-18
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ limitations under the License.
8080
<description>This event SHALL be generated when the DeviceMuted attribute changes to True.</description>
8181
</event>
8282
<event side="server" code="0x07" name="MuteEnded" priority="info" optional="true">
83-
<description>This event SHALL be generated when DeviceMuted attribute changes to False.</description>
83+
<description>This event SHALL be generated when DeviceMuted attribute changes to NotMuted.</description>
8484
</event>
8585
<event side="server" code="0x08" name="InterconnectSmokeAlarm" priority="info" optional="true">
86-
<description>This event SHALL be generated when the device hosting the cluster receives a remote smoke alarm.</description>
86+
<description>This event SHALL be generated when the device hosting the cluster receives a smoke alarm from an interconnected sensor.</description>
8787
</event>
8888
<event side="server" code="0x09" name="InterconnectCOAlarm" priority="info" optional="true">
89-
<description>This event SHALL be generated when the device hosting the cluster receives a remote CO alarm.</description>
89+
<description>This event SHALL be generated when the device hosting the cluster receives a CO alarm from an interconnected sensor.</description>
9090
</event>
9191
<event side="server" code="0x0A" name="AllClear" priority="info" optional="false">
9292
<description>This event SHALL be generated when ExpressedState attribute returns to Normal state.</description>
@@ -96,10 +96,9 @@ limitations under the License.
9696
<!-- Cluster data types -->
9797
<enum name="AlarmStateEnum" type="ENUM8">
9898
<cluster code="0x005C" />
99-
<item value="0" name="Unknown" />
100-
<item value="1" name="Normal" />
101-
<item value="2" name="Warning" />
102-
<item value="3" name="Critical" />
99+
<item value="0" name="Normal" />
100+
<item value="1" name="Warning" />
101+
<item value="2" name="Critical" />
103102
</enum>
104103

105104
<enum name="SensitivityEnum" type="ENUM8">
@@ -124,25 +123,22 @@ limitations under the License.
124123

125124
<enum name="MuteStateEnum" type="ENUM8">
126125
<cluster code="0x005C" />
127-
<item value="0" name="Unknown" />
128-
<item value="1" name="NotMuted" />
129-
<item value="2" name="Muted" />
126+
<item value="0" name="NotMuted" />
127+
<item value="1" name="Muted" />
130128
</enum>
131129

132130
<enum name="EndOfServiceEnum" type="ENUM8">
133131
<cluster code="0x005C" />
134-
<item value="0" name="Unknown" />
135-
<item value="1" name="Expired" />
136-
<item value="2" name="Normal" />
132+
<item value="0" name="Expired" />
133+
<item value="1" name="Normal" />
137134
</enum>
138135

139136
<enum name="ContaminationStateEnum" type="ENUM8">
140137
<cluster code="0x005C" />
141-
<item value="0" name="Unknown" />
142-
<item value="1" name="Normal" />
143-
<item value="2" name="Low" />
144-
<item value="3" name="Warning" />
145-
<item value="4" name="Critical" />
138+
<item value="0" name="Normal" />
139+
<item value="1" name="Low" />
140+
<item value="2" name="Warning" />
141+
<item value="3" name="Critical" />
146142
</enum>
147143

148144
<bitmap name="Feature" type="BITMAP32">

src/controller/data_model/controller-clusters.matter

+11-15
Original file line numberDiff line numberDiff line change
@@ -2869,24 +2869,21 @@ client cluster AirQuality = 91 {
28692869
/** This cluster provides an interface for observing and managing the state of smoke and CO alarms. */
28702870
client cluster SmokeCoAlarm = 92 {
28712871
enum AlarmStateEnum : ENUM8 {
2872-
kUnknown = 0;
2873-
kNormal = 1;
2874-
kWarning = 2;
2875-
kCritical = 3;
2872+
kNormal = 0;
2873+
kWarning = 1;
2874+
kCritical = 2;
28762875
}
28772876

28782877
enum ContaminationStateEnum : ENUM8 {
2879-
kUnknown = 0;
2880-
kNormal = 1;
2881-
kLow = 2;
2882-
kWarning = 3;
2883-
kCritical = 4;
2878+
kNormal = 0;
2879+
kLow = 1;
2880+
kWarning = 2;
2881+
kCritical = 3;
28842882
}
28852883

28862884
enum EndOfServiceEnum : ENUM8 {
2887-
kUnknown = 0;
2888-
kExpired = 1;
2889-
kNormal = 2;
2885+
kExpired = 0;
2886+
kNormal = 1;
28902887
}
28912888

28922889
enum ExpressedStateEnum : ENUM8 {
@@ -2902,9 +2899,8 @@ client cluster SmokeCoAlarm = 92 {
29022899
}
29032900

29042901
enum MuteStateEnum : ENUM8 {
2905-
kUnknown = 0;
2906-
kNotMuted = 1;
2907-
kMuted = 2;
2902+
kNotMuted = 0;
2903+
kMuted = 1;
29082904
}
29092905

29102906
enum SensitivityEnum : ENUM8 {

src/controller/python/chip/clusters/Objects.py

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

src/darwin/Framework/CHIP/templates/availability.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -7678,18 +7678,15 @@
76787678
- Unlatch
76797679
SmokeCOAlarm:
76807680
AlarmStateEnum:
7681-
- Unknown
76827681
- Normal
76837682
- Warning
76847683
- Critical
76857684
ContaminationStateEnum:
7686-
- Unknown
76877685
- Normal
76887686
- Low
76897687
- Warning
76907688
- Critical
76917689
EndOfServiceEnum:
7692-
- Unknown
76937690
- Expired
76947691
- Normal
76957692
ExpressedStateEnum:
@@ -7703,7 +7700,6 @@
77037700
- InterconnectSmoke
77047701
- InterconnectCO
77057702
MuteStateEnum:
7706-
- Unknown
77077703
- NotMuted
77087704
- Muted
77097705
SensitivityEnum:

src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h

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

zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h

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

zzz_generated/app-common/app-common/zap-generated/cluster-enums.h

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

0 commit comments

Comments
 (0)