Fix TemperatureLevelStruct to actually match the spec. (#26691)

Also adds Darwin availability annotations for Temperature Control cluster.
project-chip · Jun 23, 2023 · 6004156 · 6004156
1 parent da702cd
commit 6004156
Show file tree

Hide file tree

Showing 16 changed files with 166 additions and 44 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/temperature-control-cluster.xml
@@ -20,7 +20,7 @@ limitations under the License.
   <struct name="TemperatureLevelStruct">
     <cluster code="0x0056"/>
     <item fieldId="0" name="Label" type="char_string" length="64" isNullable="false" writable="false"/>
-    <item fieldId="1" name="TempLevel" type="int8u" isNullable="false" writable="false"/>
+    <item fieldId="1" name="TemperatureLevel" type="int8u" isNullable="false" writable="false"/>
   </struct>
 
   <cluster>

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -2781,7 +2781,7 @@ client cluster TemperatureControl = 86 {
 
   struct TemperatureLevelStruct {
     char_string<64> label = 0;
-    int8u tempLevel = 1;
+    int8u temperatureLevel = 1;
   }
 
   readonly attribute optional int16s temperatureSetpoint = 0;

diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml
@@ -7006,6 +7006,7 @@
           - FuelTankMonitoring
           - InkCartridgeMonitoring
           - TonerCartridgeMonitoring
+          - TemperatureControl
           - SmokeCOAlarm
       attributes:
           Scenes:
@@ -7292,6 +7293,19 @@
               - EventList
               - FeatureMap
               - ClusterRevision
+          TemperatureControl:
+              - TemperatureSetpoint
+              - MinTemperature
+              - MaxTemperature
+              - Step
+              - CurrentTemperatureLevelIndex
+              - SupportedTemperatureLevels
+              - GeneratedCommandList
+              - AcceptedCommandList
+              - AttributeList
+              - EventList
+              - FeatureMap
+              - ClusterRevision
           SmokeCOAlarm:
               - ExpressedState
               - SmokeState
@@ -7336,6 +7350,8 @@
               - ResetCondition
           TonerCartridgeMonitoring:
               - ResetCondition
+          TemperatureControl:
+              - SetTemperature
           DoorLock:
               - UnboltDoor
           SmokeCOAlarm:
@@ -7344,11 +7360,17 @@
           DoorLock:
               UnboltDoor:
                   - pinCode
+          TemperatureControl:
+              SetTemperature:
+                  - targetTemperature
+                  - targetTemperatureLevel
       structs:
           BasicInformation:
               - ProductAppearanceStruct
           BridgedDeviceBasicInformation:
               - ProductAppearanceStruct
+          TemperatureControl:
+              - TemperatureLevelStruct
       struct fields:
           BasicInformation:
               ProductAppearanceStruct:
@@ -7358,6 +7380,10 @@
               ProductAppearanceStruct:
                   - finish
                   - primaryColor
+          TemperatureControl:
+              TemperatureLevelStruct:
+                  - label
+                  - temperatureLevel
       events:
           SmokeCOAlarm:
               - SmokeAlarm
@@ -7665,6 +7691,8 @@
               - Feature
           TonerCartridgeMonitoring:
               - Feature
+          TemperatureControl:
+              - Feature
           SmokeCOAlarm:
               - Feature
       bitmap values:
@@ -7746,6 +7774,10 @@
               # here.
               Feature:
                   - Unbolt
+          TemperatureControl:
+              Feature:
+                  - TemperatureNumber
+                  - TemperatureLevel
           SmokeCOAlarm:
               Feature:
                   - SmokeAlarm

diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp