Skip to content

Commit 1127884

Browse files
ericzijian1994hare-siterwell
authored andcommitted
Add the ExpiryDate type to Smoke CO cluster (#27339)
* Smoke/CO: Add the type of ExpiryDate * Smoke/CO: Regen zap --------- Co-authored-by: Hare <renilr0@outlook.com>
1 parent d1b4aa1 commit 1127884

File tree

24 files changed

+294
-2
lines changed

24 files changed

+294
-2
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ limitations under the License.
4949
<attribute side="server" code="0x0009" define="INTERCONNECT_CO_ALARM" type="AlarmStateEnum" writable="false" optional="true">InterconnectCOAlarm</attribute>
5050
<attribute side="server" code="0x000A" define="CONTAMINATION_STATE" type="ContaminationStateEnum" writable="false" optional="true">ContaminationState</attribute>
5151
<attribute side="server" code="0x000B" define="SENSITIVITY_LEVEL" type="SensitivityEnum" min="0" max="2" writable="true" optional="true">SensitivityLevel</attribute>
52-
<!-- TODO: Date type encoding not defined -->
53-
<!-- <attribute side="server" code="0x000C" define="EXPIRY_DATE" type="Date" writable="false" optional="true">ExpiryDate</attribute> -->
52+
<attribute side="server" code="0x000C" define="EXPIRY_DATE" type="epoch_s" writable="false" optional="true">ExpiryDate</attribute>
5453

5554
<!-- Commands -->
5655
<command source="client" code="0x00" name="SelfTestRequest" optional="true">

src/controller/data_model/controller-clusters.matter

+1
Original file line numberDiff line numberDiff line change
@@ -3245,6 +3245,7 @@ client cluster SmokeCoAlarm = 92 {
32453245
readonly attribute optional AlarmStateEnum interconnectCOAlarm = 9;
32463246
readonly attribute optional ContaminationStateEnum contaminationState = 10;
32473247
attribute optional SensitivityEnum sensitivityLevel = 11;
3248+
readonly attribute optional epoch_s expiryDate = 12;
32483249
readonly attribute command_id generatedCommandList[] = 65528;
32493250
readonly attribute command_id acceptedCommandList[] = 65529;
32503251
readonly attribute event_id eventList[] = 65530;

src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java

+1
Original file line numberDiff line numberDiff line change
@@ -7379,6 +7379,7 @@ public enum Attribute {
73797379
InterconnectCOAlarm(9L),
73807380
ContaminationState(10L),
73817381
SensitivityLevel(11L),
7382+
ExpiryDate(12L),
73827383
GeneratedCommandList(65528L),
73837384
AcceptedCommandList(65529L),
73847385
EventList(65530L),

src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java

+11
Original file line numberDiff line numberDiff line change
@@ -7182,6 +7182,17 @@ private static Map<String, InteractionInfo> readSmokeCoAlarmInteractionInfo() {
71827182
readSmokeCoAlarmSensitivityLevelCommandParams
71837183
);
71847184
result.put("readSensitivityLevelAttribute", readSmokeCoAlarmSensitivityLevelAttributeInteractionInfo);
7185+
Map<String, CommandParameterInfo> readSmokeCoAlarmExpiryDateCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
7186+
InteractionInfo readSmokeCoAlarmExpiryDateAttributeInteractionInfo = new InteractionInfo(
7187+
(cluster, callback, commandArguments) -> {
7188+
((ChipClusters.SmokeCoAlarmCluster) cluster).readExpiryDateAttribute(
7189+
(ChipClusters.LongAttributeCallback) callback
7190+
);
7191+
},
7192+
() -> new ClusterInfoMapping.DelegatedLongAttributeCallback(),
7193+
readSmokeCoAlarmExpiryDateCommandParams
7194+
);
7195+
result.put("readExpiryDateAttribute", readSmokeCoAlarmExpiryDateAttributeInteractionInfo);
71857196
Map<String, CommandParameterInfo> readSmokeCoAlarmGeneratedCommandListCommandParams = new LinkedHashMap<String, CommandParameterInfo>();
71867197
InteractionInfo readSmokeCoAlarmGeneratedCommandListAttributeInteractionInfo = new InteractionInfo(
71877198
(cluster, callback, commandArguments) -> {

src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp

+15
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/ChipClusters.java

+19
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/ChipIdLookup.java

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

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

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

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

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

src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm

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

src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm

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

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

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

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

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

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

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

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

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

src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm

+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/attributes/Accessors.cpp

+31
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/attributes/Accessors.h

+5
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-objects.cpp

+3
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-objects.h

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

0 commit comments

Comments
 (0)