Smoke/CO: Update zap

Update endOfServiceAlert Add Smoke CO Alarm events
ericzijian1994 · Jul 8, 2023 · bd14633 · bd14633
1 parent dae51b4
commit bd14633
Show file tree

Hide file tree

Showing 2 changed files with 95 additions and 5 deletions.
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -2558,8 +2558,8 @@ server cluster SmokeCoAlarm = 92 {
  }
 
  enum EndOfServiceEnum : ENUM8 {
- kExpired = 0;
- kNormal = 1;
+ kNormal = 0;
+ kExpired = 1;
  }
 
  enum ExpressedStateEnum : ENUM8 {
@@ -2587,7 +2587,7 @@ server cluster SmokeCoAlarm = 92 {
 
  bitmap Feature : BITMAP32 {
  kSmokeAlarm = 0x1;
- kCoAlarm = 0x2;
+ kCOAlarm = 0x2;
  }
 
  info event SmokeAlarm = 0 {
@@ -6446,14 +6446,25 @@ endpoint 1 {
  }
 
  server cluster SmokeCoAlarm {
+ emits event SmokeAlarm;
+ emits event COAlarm;
+ emits event LowBattery;
+ emits event HardwareFault;
+ emits event EndOfService;
+ emits event SelfTestComplete;
+ emits event AlarmMuted;
+ emits event MuteEnded;
+ emits event InterconnectSmokeAlarm;
+ emits event InterconnectCOAlarm;
+ emits event AllClear;
  persist attribute expressedState default = 0;
  persist attribute smokeState default = 0;
  persist attribute COState default = 0;
  persist attribute batteryAlert default = 0;
  persist attribute deviceMuted default = 0;
  ram attribute testInProgress default = 0;
  persist attribute hardwareFaultAlert default = 0;
- persist attribute endOfServiceAlert default = 1;
+ persist attribute endOfServiceAlert default = 0;
  ram attribute interconnectSmokeAlarm default = 0;
  ram attribute interconnectCOAlarm default = 0;
  ram attribute contaminationState default = 0;

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -14072,7 +14072,7 @@
  "storageOption": "NVM",
  "singleton": 0,
  "bounded": 0,
- "defaultValue": "1",
+ "defaultValue": "0",
  "reportable": 1,
  "minInterval": 1,
  "maxInterval": 65534,
@@ -14254,6 +14254,85 @@
  "maxInterval": 65534,
  "reportableChange": 0
  }
+ ],
+ "events": [
+ {
+ "name": "SmokeAlarm",
+ "code": 0,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "COAlarm",
+ "code": 1,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "LowBattery",
+ "code": 2,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "HardwareFault",
+ "code": 3,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "EndOfService",
+ "code": 4,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "SelfTestComplete",
+ "code": 5,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "AlarmMuted",
+ "code": 6,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "MuteEnded",
+ "code": 7,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "InterconnectSmokeAlarm",
+ "code": 8,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "InterconnectCOAlarm",
+ "code": 9,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ },
+ {
+ "name": "AllClear",
+ "code": 10,
+ "mfgCode": null,
+ "side": "server",
+ "included": 1
+ }
  ]
  },
  {