Restructure server implementation to match spec

project-chip · Jul 13, 2023 · 7af001e · 7af001e
1 parent 31032c8
commit 7af001e
Show file tree

Hide file tree

Showing 25 changed files with 604 additions and 290 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
@@ -2528,6 +2528,23 @@ server cluster RefrigeratorAlarm = 87 {
     AlarmMap mask = 3;
   }
 
+<<<<<<< HEAD
+=======
+  readonly attribute AlarmMap mask = 0;
+  readonly attribute AlarmMap state = 2;
+  readonly attribute AlarmMap supported = 3;
+/** Attributes and commands for configuring the temperature control, and reporting temperature. */
+server cluster TemperatureControl = 86 {
+  bitmap Feature : BITMAP32 {
+    kTemperatureNumber = 0x1;
+    kTemperatureLevel = 0x2;
+    kTemperatureStep = 0x4;
+  }
+
+  readonly attribute temperature temperatureSetpoint = 0;
+  readonly attribute temperature minTemperature = 1;
+  readonly attribute temperature maxTemperature = 2;
+>>>>>>> 07d46e3ba1 (Restructure server implementation to match spec)
   readonly attribute command_id generatedCommandList[] = 65528;
   readonly attribute command_id acceptedCommandList[] = 65529;
   readonly attribute event_id eventList[] = 65530;
@@ -2536,13 +2553,34 @@ server cluster RefrigeratorAlarm = 87 {
   readonly attribute int16u clusterRevision = 65533;
 
   request struct SetTemperatureRequest {
-    optional INT16S targetTemperature = 0;
+    optional temperature targetTemperature = 0;
     optional INT8U targetTemperatureLevel = 1;
   }
 
   command SetTemperature(SetTemperatureRequest): DefaultSuccess = 0;
 }
 
+/** Attributes and commands for configuring the Refrigerator alarm. */
+server cluster RefrigeratorAlarm = 87 {
+  bitmap AlarmMap : BITMAP32 {
+    kDoorOpen = 0x1;
+  }
+
+  info event Notify = 0 {
+    AlarmMap active = 0;
+    AlarmMap inactive = 1;
+    AlarmMap state = 2;
+    AlarmMap mask = 3;
+  }
+
+  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;
+}
+
 /** Attributes for reporting air quality classification */
 server cluster AirQuality = 91 {
   enum AirQualityEnum : ENUM8 {
@@ -6500,17 +6538,6 @@ endpoint 0 {
     ram      attribute clusterRevision default = 1;
   }
 
-  server cluster TemperatureControl {
-    ram      attribute currentTemperatureLevelIndex;
-    callback attribute supportedTemperatureLevels;
-    callback attribute generatedCommandList;
-    callback attribute acceptedCommandList;
-    callback attribute eventList;
-    callback attribute attributeList;
-    ram      attribute featureMap default = 2;
-    ram      attribute clusterRevision default = 1;
-  }
-
   server cluster RelativeHumidityMeasurement {
     ram      attribute measuredValue;
     ram      attribute minMeasuredValue default = 0;
@@ -6679,13 +6706,23 @@ endpoint 1 {
   }
 
   server cluster TemperatureControl {
+<<<<<<< HEAD
     ram      attribute selectedTemperatureLevel default = 0;
     callback attribute supportedTemperatureLevels;
+=======
+    ram      attribute temperatureSetpoint default = 1;
+    ram      attribute minTemperature default = 0;
+    ram      attribute maxTemperature default = 100;
+>>>>>>> 07d46e3ba1 (Restructure server implementation to match spec)
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
     callback attribute attributeList;
+<<<<<<< HEAD
     ram      attribute featureMap default = 2;
+=======
+    ram      attribute featureMap default = 1;
+>>>>>>> 07d46e3ba1 (Restructure server implementation to match spec)
     ram      attribute clusterRevision default = 1;
   }