More DRLC XML updates. (#30560)

The spec PR keeps changing.
project-chip · Jan 26, 2024 · b400f8c · b400f8c
1 parent 832fbf1
commit b400f8c
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 67 deletions.
diff --git a/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/drlc-cluster.xml
@@ -109,13 +109,6 @@ limitations under the License.
     <item name="NonElectric" value="0x2"/>
   </enum>
 
-  <enum name="PowerSavingsEnum" type="enum8">
-    <cluster code="0x0096"/>
-    <item name="Low" value="0x0"/>
-    <item name="Medium" value="0x1"/>
-    <item name="High" value="0x2"/>
-  </enum>
-
   <struct name="TemperatureControlStruct">
     <cluster code="0x0096"/>
     <!-- Note: No TemperatureDifference type available yet in ZAP XML -->
@@ -137,7 +130,7 @@ limitations under the License.
 
   <struct name="PowerSavingsControlStruct">
     <cluster code="0x0096"/>
-    <item fieldId="0" name="PowerSavings" type="PowerSavingsEnum"/>
+    <item fieldId="0" name="PowerSavings" type="percent" />
   </struct>
 
   <struct name="HeatingSourceControlStruct">

diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
@@ -3929,12 +3929,6 @@ provisional client cluster DemandResponseLoadControl = 150 {
     kFailed = 12;
   }
 
-  enum PowerSavingsEnum : enum8 {
-    kLow = 0;
-    kMedium = 1;
-    kHigh = 2;
-  }
-
   bitmap CancelControlBitmap : bitmap16 {
     kRandomEnd = 0x1;
   }
@@ -3983,7 +3977,7 @@ provisional client cluster DemandResponseLoadControl = 150 {
   }
 
   struct PowerSavingsControlStruct {
-    PowerSavingsEnum powerSavings = 0;
+    percent powerSavings = 0;
   }
 
   struct DutyCycleControlStruct {

diff --git a/...cecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt b/...cecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
@@ -22,7 +22,7 @@ import matter.tlv.Tag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
 
-class DemandResponseLoadControlClusterPowerSavingsControlStruct(val powerSavings: UInt) {
+class DemandResponseLoadControlClusterPowerSavingsControlStruct(val powerSavings: UByte) {
   override fun toString(): String = buildString {
     append("DemandResponseLoadControlClusterPowerSavingsControlStruct {\n")
     append("\tpowerSavings : $powerSavings\n")
@@ -45,7 +45,7 @@ class DemandResponseLoadControlClusterPowerSavingsControlStruct(val powerSavings
       tlvReader: TlvReader
     ): DemandResponseLoadControlClusterPowerSavingsControlStruct {
       tlvReader.enterStructure(tlvTag)
-      val powerSavings = tlvReader.getUInt(ContextSpecificTag(TAG_POWER_SAVINGS))
+      val powerSavings = tlvReader.getUByte(ContextSpecificTag(TAG_POWER_SAVINGS))
 
       tlvReader.exitContainer()
 

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/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm
diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h
diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h
diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h