doorlock xml file sync with specs and colorcontrol xml type changes

Thirsrin · May 27, 2024 · 9619c2f · 9619c2f
1 parent 3718e99
commit 9619c2f
Show file tree

Hide file tree

Showing 36 changed files with 664 additions and 142 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
@@ -5438,6 +5438,21 @@ cluster ColorControl = 768 {
     kColorTemperature = 2;
   }
 
+  enum DriftCompensation : enum8 {
+    kNone = 0;
+    kOtherUnknown = 1;
+    kTemperaturemonitoring = 2;
+    kOpticalLuminanceMonitoringAndFeedback = 3;
+    kOpticalColorMonitoringAndFeedback = 4;
+  }
+
+  enum EnhancedColorMode : enum8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+    kEnhancedCurrentHueAndCurrentSaturation = 3;
+  }
+
   enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
@@ -5475,6 +5490,10 @@ cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlOptions : bitmap8 {
+    kExecuteIfOff = 0x1;
+  }
+
   bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
@@ -5495,11 +5514,11 @@ cluster ColorControl = 768 {
   readonly attribute optional int16u remainingTime = 2;
   readonly attribute optional int16u currentX = 3;
   readonly attribute optional int16u currentY = 4;
-  readonly attribute optional enum8 driftCompensation = 5;
+  readonly attribute optional DriftCompensation driftCompensation = 5;
   readonly attribute optional char_string<254> compensationText = 6;
   readonly attribute optional int16u colorTemperatureMireds = 7;
   readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
+  attribute ColorControlOptions options = 15;
   readonly attribute nullable int8u numberOfPrimaries = 16;
   readonly attribute optional int16u primary1X = 17;
   readonly attribute optional int16u primary1Y = 18;
@@ -5531,7 +5550,7 @@ cluster ColorControl = 768 {
   attribute access(write: manage) optional int16u colorPointBY = 59;
   attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
   readonly attribute optional int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute EnhancedColorMode enhancedColorMode = 16385;
   readonly attribute optional int8u colorLoopActive = 16386;
   readonly attribute optional int8u colorLoopDirection = 16387;
   readonly attribute optional int16u colorLoopTime = 16388;

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2972,7 +2972,7 @@ cluster DoorLock = 257 {
   readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
   attribute access(write: manage) optional char_string<3> language = 33;
   attribute access(write: manage) optional int8u LEDSettings = 34;
-  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) optional int32u autoRelockTime = 35;
   attribute access(write: manage) optional int8u soundVolume = 36;
   attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;
@@ -3997,6 +3997,21 @@ cluster ColorControl = 768 {
     kColorTemperature = 2;
   }
 
+  enum DriftCompensation : enum8 {
+    kNone = 0;
+    kOtherUnknown = 1;
+    kTemperaturemonitoring = 2;
+    kOpticalLuminanceMonitoringAndFeedback = 3;
+    kOpticalColorMonitoringAndFeedback = 4;
+  }
+
+  enum EnhancedColorMode : enum8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+    kEnhancedCurrentHueAndCurrentSaturation = 3;
+  }
+
   enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
@@ -4034,6 +4049,10 @@ cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlOptions : bitmap8 {
+    kExecuteIfOff = 0x1;
+  }
+
   bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
@@ -4054,11 +4073,11 @@ cluster ColorControl = 768 {
   readonly attribute optional int16u remainingTime = 2;
   readonly attribute optional int16u currentX = 3;
   readonly attribute optional int16u currentY = 4;
-  readonly attribute optional enum8 driftCompensation = 5;
+  readonly attribute optional DriftCompensation driftCompensation = 5;
   readonly attribute optional char_string<254> compensationText = 6;
   readonly attribute optional int16u colorTemperatureMireds = 7;
   readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
+  attribute ColorControlOptions options = 15;
   readonly attribute nullable int8u numberOfPrimaries = 16;
   readonly attribute optional int16u primary1X = 17;
   readonly attribute optional int16u primary1Y = 18;
@@ -4090,7 +4109,7 @@ cluster ColorControl = 768 {
   attribute access(write: manage) optional int16u colorPointBY = 59;
   attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
   readonly attribute optional int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute EnhancedColorMode enhancedColorMode = 16385;
   readonly attribute optional int8u colorLoopActive = 16386;
   readonly attribute optional int8u colorLoopDirection = 16387;
   readonly attribute optional int16u colorLoopTime = 16388;

diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter
@@ -1423,6 +1423,21 @@ cluster ColorControl = 768 {
     kColorTemperature = 2;
   }
 
+  enum DriftCompensation : enum8 {
+    kNone = 0;
+    kOtherUnknown = 1;
+    kTemperaturemonitoring = 2;
+    kOpticalLuminanceMonitoringAndFeedback = 3;
+    kOpticalColorMonitoringAndFeedback = 4;
+  }
+
+  enum EnhancedColorMode : enum8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+    kEnhancedCurrentHueAndCurrentSaturation = 3;
+  }
+
   enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
@@ -1460,6 +1475,10 @@ cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlOptions : bitmap8 {
+    kExecuteIfOff = 0x1;
+  }
+
   bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
@@ -1480,11 +1499,11 @@ cluster ColorControl = 768 {
   readonly attribute optional int16u remainingTime = 2;
   readonly attribute optional int16u currentX = 3;
   readonly attribute optional int16u currentY = 4;
-  readonly attribute optional enum8 driftCompensation = 5;
+  readonly attribute optional DriftCompensation driftCompensation = 5;
   readonly attribute optional char_string<254> compensationText = 6;
   readonly attribute optional int16u colorTemperatureMireds = 7;
   readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
+  attribute ColorControlOptions options = 15;
   readonly attribute nullable int8u numberOfPrimaries = 16;
   readonly attribute optional int16u primary1X = 17;
   readonly attribute optional int16u primary1Y = 18;
@@ -1516,7 +1535,7 @@ cluster ColorControl = 768 {
   attribute access(write: manage) optional int16u colorPointBY = 59;
   attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
   readonly attribute optional int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute EnhancedColorMode enhancedColorMode = 16385;
   readonly attribute optional int8u colorLoopActive = 16386;
   readonly attribute optional int8u colorLoopDirection = 16387;
   readonly attribute optional int16u colorLoopTime = 16388;

diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter
@@ -1878,7 +1878,7 @@ cluster DoorLock = 257 {
   readonly attribute optional int8u numberOfCredentialsSupportedPerUser = 28;
   attribute access(write: manage) optional char_string<3> language = 33;
   attribute access(write: manage) optional int8u LEDSettings = 34;
-  attribute access(write: manage) int32u autoRelockTime = 35;
+  attribute access(write: manage) optional int32u autoRelockTime = 35;
   attribute access(write: manage) optional int8u soundVolume = 36;
   attribute access(write: manage) OperatingModeEnum operatingMode = 37;
   readonly attribute DlSupportedOperatingModes supportedOperatingModes = 38;

diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter
@@ -1524,6 +1524,21 @@ cluster ColorControl = 768 {
     kColorTemperature = 2;
   }
 
+  enum DriftCompensation : enum8 {
+    kNone = 0;
+    kOtherUnknown = 1;
+    kTemperaturemonitoring = 2;
+    kOpticalLuminanceMonitoringAndFeedback = 3;
+    kOpticalColorMonitoringAndFeedback = 4;
+  }
+
+  enum EnhancedColorMode : enum8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+    kEnhancedCurrentHueAndCurrentSaturation = 3;
+  }
+
   enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
@@ -1561,6 +1576,10 @@ cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlOptions : bitmap8 {
+    kExecuteIfOff = 0x1;
+  }
+
   bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
@@ -1581,11 +1600,11 @@ cluster ColorControl = 768 {
   readonly attribute optional int16u remainingTime = 2;
   readonly attribute optional int16u currentX = 3;
   readonly attribute optional int16u currentY = 4;
-  readonly attribute optional enum8 driftCompensation = 5;
+  readonly attribute optional DriftCompensation driftCompensation = 5;
   readonly attribute optional char_string<254> compensationText = 6;
   readonly attribute optional int16u colorTemperatureMireds = 7;
   readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
+  attribute ColorControlOptions options = 15;
   readonly attribute nullable int8u numberOfPrimaries = 16;
   readonly attribute optional int16u primary1X = 17;
   readonly attribute optional int16u primary1Y = 18;
@@ -1617,7 +1636,7 @@ cluster ColorControl = 768 {
   attribute access(write: manage) optional int16u colorPointBY = 59;
   attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
   readonly attribute optional int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute EnhancedColorMode enhancedColorMode = 16385;
   readonly attribute optional int8u colorLoopActive = 16386;
   readonly attribute optional int8u colorLoopDirection = 16387;
   readonly attribute optional int16u colorLoopTime = 16388;

diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -2193,6 +2193,21 @@ cluster ColorControl = 768 {
     kColorTemperature = 2;
   }
 
+  enum DriftCompensation : enum8 {
+    kNone = 0;
+    kOtherUnknown = 1;
+    kTemperaturemonitoring = 2;
+    kOpticalLuminanceMonitoringAndFeedback = 3;
+    kOpticalColorMonitoringAndFeedback = 4;
+  }
+
+  enum EnhancedColorMode : enum8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+    kEnhancedCurrentHueAndCurrentSaturation = 3;
+  }
+
   enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
@@ -2230,6 +2245,10 @@ cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlOptions : bitmap8 {
+    kExecuteIfOff = 0x1;
+  }
+
   bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
@@ -2250,11 +2269,11 @@ cluster ColorControl = 768 {
   readonly attribute optional int16u remainingTime = 2;
   readonly attribute optional int16u currentX = 3;
   readonly attribute optional int16u currentY = 4;
-  readonly attribute optional enum8 driftCompensation = 5;
+  readonly attribute optional DriftCompensation driftCompensation = 5;
   readonly attribute optional char_string<254> compensationText = 6;
   readonly attribute optional int16u colorTemperatureMireds = 7;
   readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
+  attribute ColorControlOptions options = 15;
   readonly attribute nullable int8u numberOfPrimaries = 16;
   readonly attribute optional int16u primary1X = 17;
   readonly attribute optional int16u primary1Y = 18;
@@ -2286,7 +2305,7 @@ cluster ColorControl = 768 {
   attribute access(write: manage) optional int16u colorPointBY = 59;
   attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
   readonly attribute optional int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute EnhancedColorMode enhancedColorMode = 16385;
   readonly attribute optional int8u colorLoopActive = 16386;
   readonly attribute optional int8u colorLoopDirection = 16387;
   readonly attribute optional int16u colorLoopTime = 16388;

diff --git a/examples/light-switch-app/qpg/zap/switch.matter b/examples/light-switch-app/qpg/zap/switch.matter
@@ -1990,6 +1990,21 @@ cluster ColorControl = 768 {
     kColorTemperature = 2;
   }
 
+  enum DriftCompensation : enum8 {
+    kNone = 0;
+    kOtherUnknown = 1;
+    kTemperaturemonitoring = 2;
+    kOpticalLuminanceMonitoringAndFeedback = 3;
+    kOpticalColorMonitoringAndFeedback = 4;
+  }
+
+  enum EnhancedColorMode : enum8 {
+    kCurrentHueAndCurrentSaturation = 0;
+    kCurrentXAndCurrentY = 1;
+    kColorTemperature = 2;
+    kEnhancedCurrentHueAndCurrentSaturation = 3;
+  }
+
   enum HueDirection : enum8 {
     kShortestDistance = 0;
     kLongestDistance = 1;
@@ -2027,6 +2042,10 @@ cluster ColorControl = 768 {
     kColorTemperatureSupported = 0x10;
   }
 
+  bitmap ColorControlOptions : bitmap8 {
+    kExecuteIfOff = 0x1;
+  }
+
   bitmap ColorLoopUpdateFlags : bitmap8 {
     kUpdateAction = 0x1;
     kUpdateDirection = 0x2;
@@ -2047,11 +2066,11 @@ cluster ColorControl = 768 {
   readonly attribute optional int16u remainingTime = 2;
   readonly attribute optional int16u currentX = 3;
   readonly attribute optional int16u currentY = 4;
-  readonly attribute optional enum8 driftCompensation = 5;
+  readonly attribute optional DriftCompensation driftCompensation = 5;
   readonly attribute optional char_string<254> compensationText = 6;
   readonly attribute optional int16u colorTemperatureMireds = 7;
   readonly attribute enum8 colorMode = 8;
-  attribute bitmap8 options = 15;
+  attribute ColorControlOptions options = 15;
   readonly attribute nullable int8u numberOfPrimaries = 16;
   readonly attribute optional int16u primary1X = 17;
   readonly attribute optional int16u primary1Y = 18;
@@ -2083,7 +2102,7 @@ cluster ColorControl = 768 {
   attribute access(write: manage) optional int16u colorPointBY = 59;
   attribute access(write: manage) optional nullable int8u colorPointBIntensity = 60;
   readonly attribute optional int16u enhancedCurrentHue = 16384;
-  readonly attribute enum8 enhancedColorMode = 16385;
+  readonly attribute EnhancedColorMode enhancedColorMode = 16385;
   readonly attribute optional int8u colorLoopActive = 16386;
   readonly attribute optional int8u colorLoopDirection = 16387;
   readonly attribute optional int16u colorLoopTime = 16388;