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.

Sign up for GitHub

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

[SMCO] Update XML to spec changes #27606

Merged
merged 3 commits into from
Jul 13, 2023
Merged

[SMCO] Update XML to spec changes #27606

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fa9cdc
[SMCO] Update XML to spec changes
hare-siterwell Jul 4, 2023
3f57a15
[SMCO] Regen zap
hare-siterwell Jul 4, 2023
fa4723a
Merge remote-tracking branch 'upstream/master' into smco-cluster
hare-siterwell Jul 7, 2023
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
13 changes: 9 additions & 4 deletions examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
23 changes: 14 additions & 9 deletions src/app/zap-templates/zcl/data-model/chip/smoke-co-alarm-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 9 additions & 4 deletions src/controller/data_model/controller-clusters.matter
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
58 changes: 48 additions & 10 deletions src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp
View file
Open in desktop

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

40 changes: 35 additions & 5 deletions src/controller/java/zap-generated/chip/devicecontroller/ChipEventStructs.java
View file
Open in desktop

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

Loading