Merge branch 'upstream-master' into EVSE_Add_PersistedAttributes_and_…

…Events
project-chip · Jan 15, 2024 · 8f51c0b · 8f51c0b
2 parents 495d347 + 2869798
commit 8f51c0b
Show file tree

Hide file tree

Showing 21 changed files with 1,079 additions and 224 deletions.
diff --git a/data_model/clusters/BooleanSensorConfiguration.xml b/data_model/clusters/BooleanSensorConfiguration.xml
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
@@ -3716,6 +3716,64 @@ cluster ActivatedCarbonFilterMonitoring = 114 {
   command ResetCondition(): DefaultSuccess = 0;
 }
 
+/** This cluster is used to configure a boolean sensor. */
+provisional cluster BooleanStateConfiguration = 128 {
+  revision 1;
+
+  bitmap AlarmModeBitmap : bitmap8 {
+    kVisual = 0x1;
+    kAudible = 0x2;
+  }
+
+  bitmap Feature : bitmap32 {
+    kVisual = 0x1;
+    kAudible = 0x2;
+    kAlarmSuppress = 0x4;
+    kSensitivityLevel = 0x8;
+  }
+
+  bitmap SensorFaultBitmap : bitmap16 {
+    kGeneralFault = 0x1;
+  }
+
+  info event AlarmsStateChanged = 0 {
+    AlarmModeBitmap alarmsActive = 0;
+    optional AlarmModeBitmap alarmsSuppressed = 1;
+  }
+
+  info event SensorFault = 1 {
+    SensorFaultBitmap sensorFault = 0;
+  }
+
+  attribute optional int8u currentSensitivityLevel = 0;
+  readonly attribute optional int8u supportedSensitivityLevels = 1;
+  readonly attribute optional int8u defaultSensitivityLevel = 2;
+  readonly attribute optional AlarmModeBitmap alarmsActive = 3;
+  readonly attribute optional AlarmModeBitmap alarmsSuppressed = 4;
+  readonly attribute optional AlarmModeBitmap alarmsEnabled = 5;
+  readonly attribute optional AlarmModeBitmap alarmsSupported = 6;
+  readonly attribute optional SensorFaultBitmap sensorFault = 7;
+  readonly attribute command_id generatedCommandList[] = 65528;
+  readonly attribute command_id acceptedCommandList[] = 65529;
+  readonly attribute event_id eventList[] = 65530;
+  readonly attribute attrib_id attributeList[] = 65531;
+  readonly attribute bitmap32 featureMap = 65532;
+  readonly attribute int16u clusterRevision = 65533;
+
+  request struct SuppressAlarmRequest {
+    AlarmModeBitmap alarmsToSuppress = 0;
+  }
+
+  request struct EnableDisableAlarmRequest {
+    AlarmModeBitmap alarmsToEnableDisable = 0;
+  }
+
+  /** This command is used to suppress the specified alarm mode. */
+  command SuppressAlarm(SuppressAlarmRequest): DefaultSuccess = 0;
+  /** This command is used to enable or disable the specified alarm mode. */
+  command EnableDisableAlarm(EnableDisableAlarmRequest): DefaultSuccess = 1;
+}
+
 /** This cluster is used to configure a valve. */
 provisional cluster ValveConfigurationAndControl = 129 {
   revision 1;
@@ -7492,6 +7550,28 @@ endpoint 1 {
     handle command ResetCondition;
   }
 
+  server cluster BooleanStateConfiguration {
+    emits event AlarmsStateChanged;
+    emits event SensorFault;
+    callback attribute currentSensitivityLevel;
+    ram      attribute supportedSensitivityLevels default = 3;
+    ram      attribute defaultSensitivityLevel default = 2;
+    ram      attribute alarmsActive;
+    ram      attribute alarmsSuppressed;
+    persist  attribute alarmsEnabled;
+    ram      attribute alarmsSupported default = 0x03;
+    ram      attribute sensorFault default = 0;
+    callback attribute generatedCommandList;
+    callback attribute acceptedCommandList;
+    callback attribute eventList;
+    callback attribute attributeList;
+    ram      attribute featureMap default = 0x0F;
+    ram      attribute clusterRevision default = 1;
+
+    handle command SuppressAlarm;
+    handle command EnableDisableAlarm;
+  }
+
   server cluster ValveConfigurationAndControl {
     emits event ValveStateChanged;
     emits event ValveFault;