From 1936082b0a75217c10b4a067a7e0fd3f351a8682 Mon Sep 17 00:00:00 2001
From: jmartinez-silabs <67972863+jmartinez-silabs@users.noreply.github.com>
Date: Mon, 23 May 2022 23:15:08 -0400
Subject: [PATCH] Re-align colorcontrol cluster definition with the spec
(#18700)
* align color control spec. apply renaming to yaml files and the color control server implementation
* regen all
* rebase n regen
---
.../all-clusters-app.matter | 40 +-
.../all-clusters-common/all-clusters-app.zap | 321 ++++-----
.../bridge-app/bridge-common/bridge-app.zap | 5 +-
examples/chef/devices/lighting-app.zap | 14 +-
.../light-switch-app.matter | 8 +-
.../light-switch-common/light-switch-app.zap | 51 +-
.../lighting-common/lighting-app.matter | 22 +-
.../lighting-common/lighting-app.zap | 109 +--
.../log-source-common/log-source-app.zap | 105 +--
.../ota-provider-common/ota-provider-app.zap | 105 +--
.../ota-requestor-app.zap | 105 +--
.../placeholder/linux/apps/app1/config.matter | 4 +-
.../placeholder/linux/apps/app1/config.zap | 21 +-
.../placeholder/linux/apps/app2/config.matter | 4 +-
.../placeholder/linux/apps/app2/config.zap | 21 +-
examples/pump-app/pump-common/pump-app.zap | 2 +-
.../thermostat-common/thermostat.zap | 205 +++---
examples/tv-app/tv-common/tv-app.zap | 100 +--
.../tv-casting-common/tv-casting-app.zap | 38 +-
.../color-control-server.cpp | 31 +-
.../suites/certification/Test_TC_CC_2_1.yaml | 118 +--
.../suites/certification/Test_TC_CC_3_1.yaml | 58 +-
.../suites/certification/Test_TC_CC_3_2.yaml | 58 +-
.../suites/certification/Test_TC_CC_3_3.yaml | 26 +-
.../suites/certification/Test_TC_CC_4_1.yaml | 16 +-
.../suites/certification/Test_TC_CC_4_2.yaml | 86 +--
.../suites/certification/Test_TC_CC_4_3.yaml | 26 +-
.../suites/certification/Test_TC_CC_4_4.yaml | 16 +-
.../suites/certification/Test_TC_CC_5_1.yaml | 14 +-
.../suites/certification/Test_TC_CC_5_2.yaml | 20 +-
.../suites/certification/Test_TC_CC_5_3.yaml | 14 +-
.../suites/certification/Test_TC_CC_6_1.yaml | 10 +-
.../suites/certification/Test_TC_CC_6_2.yaml | 98 +--
.../suites/certification/Test_TC_CC_6_3.yaml | 42 +-
.../suites/certification/Test_TC_CC_7_1.yaml | 76 +-
.../suites/certification/Test_TC_CC_7_2.yaml | 50 +-
.../suites/certification/Test_TC_CC_7_3.yaml | 26 +-
.../suites/certification/Test_TC_CC_7_4.yaml | 14 +-
.../suites/certification/Test_TC_CC_8_1.yaml | 96 +--
.../suites/certification/Test_TC_CC_9_1.yaml | 270 +++----
.../suites/certification/Test_TC_CC_9_2.yaml | 78 +-
.../suites/certification/Test_TC_CC_9_3.yaml | 78 +-
.../zcl/data-model/silabs/ha.xml | 192 ++---
.../zcl/data-model/silabs/zll.xml | 118 +--
.../data_model/controller-clusters.matter | 34 +-
.../data_model/controller-clusters.zap | 109 +--
.../CHIPAttributeTLVValueDecoder.cpp | 162 +++--
.../java/zap-generated/CHIPCallbackTypes.h | 12 +-
.../zap-generated/CHIPClustersWrite-JNI.cpp | 40 +-
.../java/zap-generated/CHIPReadCallbacks.cpp | 670 ++++++++++++++++++
.../java/zap-generated/CHIPReadCallbacks.h | 300 ++++++++
.../chip/devicecontroller/ChipClusters.java | 278 +++++---
.../chip/devicecontroller/ChipIdLookup.java | 6 +-
.../devicecontroller/ClusterInfoMapping.java | 40 +-
.../devicecontroller/ClusterReadMapping.java | 73 +-
.../devicecontroller/ClusterWriteMapping.java | 16 +-
.../python/chip/clusters/CHIPClusters.py | 14 +-
.../python/chip/clusters/Objects.py | 154 ++--
.../CHIPAttributeTLVValueDecoder.mm | 92 ++-
.../CHIP/zap-generated/CHIPClustersObjc.h | 101 ++-
.../CHIP/zap-generated/CHIPClustersObjc.mm | 390 +++++-----
.../zap-generated/CHIPCommandPayloadsObjc.h | 8 +-
.../zap-generated/CHIPCommandPayloadsObjc.mm | 8 +-
.../zap-generated/MatterClusterConstants.h | 6 +-
.../all-clusters-app/zap-generated/access.h | 144 ++--
.../zap-generated/endpoint_config.h | 126 ++--
.../zap-generated/attributes/Accessors.cpp | 332 +++++++--
.../zap-generated/attributes/Accessors.h | 52 +-
.../zap-generated/cluster-objects.cpp | 44 +-
.../zap-generated/cluster-objects.h | 226 +++---
.../app-common/zap-generated/ids/Attributes.h | 12 +-
.../cluster/CHIPTestClustersObjc.h | 22 +-
.../cluster/CHIPTestClustersObjc.mm | 73 +-
.../zap-generated/cluster/Commands.h | 225 +++---
.../zap-generated/test/Commands.h | 212 +++---
.../zap-generated/cluster/Commands.h | 55 +-
.../cluster/logging/DataModelLogger.cpp | 130 ++--
.../chip-tool/zap-generated/test/Commands.h | 150 ++--
.../lighting-app/zap-generated/access.h | 12 +-
.../zap-generated/endpoint_config.h | 45 +-
.../placeholder/app1/zap-generated/access.h | 12 +-
.../app1/zap-generated/endpoint_config.h | 13 +-
.../placeholder/app2/zap-generated/access.h | 12 +-
.../app2/zap-generated/endpoint_config.h | 13 +-
84 files changed, 4440 insertions(+), 2894 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
index c432dfd85799b8..c063ae3315e437 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -458,37 +458,37 @@ server cluster ColorControl = 768 {
readonly attribute char_string<254> compensationText = 6;
readonly attribute int16u colorTemperature = 7;
readonly attribute enum8 colorMode = 8;
- attribute bitmap8 colorControlOptions = 15;
- readonly attribute int8u numberOfPrimaries = 16;
+ attribute bitmap8 options = 15;
+ readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u primary1X = 17;
readonly attribute int16u primary1Y = 18;
- readonly attribute int8u primary1Intensity = 19;
+ readonly attribute nullable int8u primary1Intensity = 19;
readonly attribute int16u primary2X = 21;
readonly attribute int16u primary2Y = 22;
- readonly attribute int8u primary2Intensity = 23;
+ readonly attribute nullable int8u primary2Intensity = 23;
readonly attribute int16u primary3X = 25;
readonly attribute int16u primary3Y = 26;
- readonly attribute int8u primary3Intensity = 27;
+ readonly attribute nullable int8u primary3Intensity = 27;
readonly attribute int16u primary4X = 32;
readonly attribute int16u primary4Y = 33;
- readonly attribute int8u primary4Intensity = 34;
+ readonly attribute nullable int8u primary4Intensity = 34;
readonly attribute int16u primary5X = 36;
readonly attribute int16u primary5Y = 37;
- readonly attribute int8u primary5Intensity = 38;
+ readonly attribute nullable int8u primary5Intensity = 38;
readonly attribute int16u primary6X = 40;
readonly attribute int16u primary6Y = 41;
- readonly attribute int8u primary6Intensity = 42;
+ readonly attribute nullable int8u primary6Intensity = 42;
attribute access(write: manage) int16u whitePointX = 48;
attribute access(write: manage) int16u whitePointY = 49;
attribute access(write: manage) int16u colorPointRX = 50;
attribute access(write: manage) int16u colorPointRY = 51;
- attribute access(write: manage) int8u colorPointRIntensity = 52;
+ attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
attribute access(write: manage) int16u colorPointGX = 54;
attribute access(write: manage) int16u colorPointGY = 55;
- attribute access(write: manage) int8u colorPointGIntensity = 56;
+ attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
attribute access(write: manage) int16u colorPointBX = 58;
attribute access(write: manage) int16u colorPointBY = 59;
- attribute access(write: manage) int8u colorPointBIntensity = 60;
+ attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
@@ -497,8 +497,8 @@ server cluster ColorControl = 768 {
readonly attribute int16u colorLoopStartEnhancedHue = 16389;
readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
readonly attribute bitmap16 colorCapabilities = 16394;
- readonly attribute int16u colorTempPhysicalMin = 16395;
- readonly attribute int16u colorTempPhysicalMax = 16396;
+ readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+ readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute bitmap32 featureMap = 65532;
@@ -636,8 +636,8 @@ server cluster ColorControl = 768 {
request struct MoveColorTemperatureRequest {
HueMoveMode moveMode = 0;
INT16U rate = 1;
- INT16U colorTemperatureMinimum = 2;
- INT16U colorTemperatureMaximum = 3;
+ INT16U colorTemperatureMinimumMireds = 2;
+ INT16U colorTemperatureMaximumMireds = 3;
BITMAP8 optionsMask = 4;
BITMAP8 optionsOverride = 5;
}
@@ -646,8 +646,8 @@ server cluster ColorControl = 768 {
HueStepMode stepMode = 0;
INT16U stepSize = 1;
INT16U transitionTime = 2;
- INT16U colorTemperatureMinimum = 3;
- INT16U colorTemperatureMaximum = 4;
+ INT16U colorTemperatureMinimumMireds = 3;
+ INT16U colorTemperatureMaximumMireds = 4;
BITMAP8 optionsMask = 5;
BITMAP8 optionsOverride = 6;
}
@@ -4439,7 +4439,7 @@ endpoint 1 {
ram attribute compensationText;
ram attribute colorTemperature default = 0x00FA;
ram attribute colorMode default = 0x01;
- ram attribute colorControlOptions;
+ ram attribute options;
ram attribute numberOfPrimaries;
ram attribute primary1X;
ram attribute primary1Y;
@@ -4478,8 +4478,8 @@ endpoint 1 {
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue;
ram attribute colorCapabilities;
- ram attribute colorTempPhysicalMin;
- ram attribute colorTempPhysicalMax default = 0xFEFF;
+ ram attribute colorTempPhysicalMinMireds;
+ ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
index a20ed3fd677989..35d696265aebbe 100644
--- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
+++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -1999,7 +1999,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2015,7 +2015,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -2031,7 +2031,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3520,7 +3520,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3536,7 +3536,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -3552,7 +3552,7 @@
"side": "server",
"type": "array",
"included": 1,
- "storageOption": "RAM",
+ "storageOption": "External",
"singleton": 0,
"bounded": 0,
"defaultValue": "",
@@ -6945,7 +6945,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6961,7 +6961,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6977,7 +6977,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6993,7 +6993,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7009,7 +7009,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7025,7 +7025,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7041,7 +7041,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7057,7 +7057,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -7073,7 +7073,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -7089,7 +7089,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -7105,7 +7105,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -7121,7 +7121,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -7137,7 +7137,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -7153,7 +7153,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -7169,7 +7169,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -7185,7 +7185,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -7201,7 +7201,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -7217,7 +7217,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -7233,7 +7233,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -7249,7 +7249,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -7265,7 +7265,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -7281,7 +7281,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -7297,7 +7297,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -7313,7 +7313,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -7329,7 +7329,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -7345,7 +7345,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -7361,7 +7361,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -7377,7 +7377,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -7393,7 +7393,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -7409,7 +7409,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -7425,7 +7425,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -7441,7 +7441,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -7457,7 +7457,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -7473,7 +7473,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -7489,7 +7489,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -7505,7 +7505,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -7521,7 +7521,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -7537,7 +7537,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -7553,7 +7553,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -7569,7 +7569,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -7585,7 +7585,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -7601,7 +7601,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -7617,7 +7617,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -7633,7 +7633,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -7649,7 +7649,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -7665,7 +7665,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -7681,7 +7681,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -7697,7 +7697,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -7713,7 +7713,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -7729,7 +7729,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -15873,7 +15873,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -15889,7 +15889,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -15905,7 +15905,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -15921,7 +15921,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -15937,7 +15937,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -15953,7 +15953,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -15969,7 +15969,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -15985,7 +15985,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -16001,7 +16001,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -16017,7 +16017,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -16033,7 +16033,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -16049,7 +16049,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -16065,7 +16065,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -16081,7 +16081,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -16097,7 +16097,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -16113,7 +16113,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -16129,7 +16129,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -16145,7 +16145,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -16161,7 +16161,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -16177,7 +16177,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -16193,7 +16193,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -16209,7 +16209,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -16225,7 +16225,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -16241,7 +16241,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -16257,7 +16257,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -16273,7 +16273,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -16289,7 +16289,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -16305,7 +16305,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -16321,7 +16321,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -16337,7 +16337,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -16353,7 +16353,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -16369,7 +16369,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -16385,7 +16385,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -16401,7 +16401,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -16417,7 +16417,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -16433,7 +16433,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -16449,7 +16449,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -16465,7 +16465,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -16481,7 +16481,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -16497,7 +16497,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -16513,7 +16513,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -16529,7 +16529,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -16545,7 +16545,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -16561,7 +16561,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -16577,7 +16577,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -16593,7 +16593,7 @@
"reportableChange": 0
},
{
- "name": "color loop start enhanced hue",
+ "name": "ColorLoopStartEnhancedHue",
"code": 16389,
"mfgCode": null,
"side": "server",
@@ -16609,7 +16609,7 @@
"reportableChange": 0
},
{
- "name": "color loop stored enhanced hue",
+ "name": "ColorLoopStoredEnhancedHue",
"code": 16390,
"mfgCode": null,
"side": "server",
@@ -16625,7 +16625,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -16641,7 +16641,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -16657,7 +16657,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -16673,7 +16673,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -16689,7 +16689,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -23913,7 +23913,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -23929,7 +23929,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -23945,7 +23945,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -23961,7 +23961,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -23977,7 +23977,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -23993,7 +23993,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -24009,7 +24009,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -24025,7 +24025,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -24041,7 +24041,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -24057,7 +24057,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -24073,7 +24073,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -24089,7 +24089,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -24105,7 +24105,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -24121,7 +24121,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -24137,7 +24137,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -24153,7 +24153,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -24169,7 +24169,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -24185,7 +24185,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -24201,7 +24201,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -24217,7 +24217,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -24233,7 +24233,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -24249,7 +24249,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -24265,7 +24265,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -24281,7 +24281,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -24297,7 +24297,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -24313,7 +24313,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -24329,7 +24329,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -24345,7 +24345,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -24361,7 +24361,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -24377,7 +24377,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -24393,7 +24393,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -24409,7 +24409,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -24425,7 +24425,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -24441,7 +24441,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -24457,7 +24457,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -24473,7 +24473,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -24489,7 +24489,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -24505,7 +24505,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -24521,7 +24521,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -24537,7 +24537,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -24553,7 +24553,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -24569,7 +24569,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -24585,7 +24585,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -24601,7 +24601,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -24617,7 +24617,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -24633,7 +24633,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -24649,7 +24649,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -24665,7 +24665,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -24681,7 +24681,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -24697,7 +24697,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -25510,5 +25510,6 @@
"endpointVersion": 1,
"deviceIdentifier": 61442
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap
index b6d886b8dd4d8b..03b8f76b8cc0cb 100644
--- a/examples/bridge-app/bridge-common/bridge-app.zap
+++ b/examples/bridge-app/bridge-common/bridge-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -5667,5 +5667,6 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/chef/devices/lighting-app.zap b/examples/chef/devices/lighting-app.zap
index 372e1f7c90cda1..13de36bedceccc 100644
--- a/examples/chef/devices/lighting-app.zap
+++ b/examples/chef/devices/lighting-app.zap
@@ -6200,7 +6200,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7187,7 +7187,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7203,7 +7203,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7219,7 +7219,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7235,7 +7235,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "currentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7251,7 +7251,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "currentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7267,7 +7267,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
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
index 1f76e17fd10e55..1c2a563b0acbc1 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.matter
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter
@@ -243,8 +243,8 @@ client cluster ColorControl = 768 {
readonly attribute int16u currentY = 4;
readonly attribute int16u colorTemperature = 7;
readonly attribute enum8 colorMode = 8;
- attribute bitmap8 colorControlOptions = 15;
- readonly attribute int8u numberOfPrimaries = 16;
+ attribute bitmap8 options = 15;
+ readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
@@ -253,8 +253,8 @@ client cluster ColorControl = 768 {
readonly attribute int16u colorLoopStartEnhancedHue = 16389;
readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
readonly attribute bitmap16 colorCapabilities = 16394;
- readonly attribute int16u colorTempPhysicalMin = 16395;
- readonly attribute int16u colorTempPhysicalMax = 16396;
+ readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+ readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute int16u clusterRevision = 65533;
diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap
index e183135da3a2a9..6c027a689f095d 100644
--- a/examples/light-switch-app/light-switch-common/light-switch-app.zap
+++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -7496,7 +7496,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7512,7 +7512,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7528,7 +7528,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7544,7 +7544,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7560,7 +7560,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7576,7 +7576,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7592,7 +7592,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7608,7 +7608,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -7624,7 +7624,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -7640,7 +7640,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -7656,7 +7656,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -7672,7 +7672,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -7688,7 +7688,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -7704,7 +7704,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -7720,7 +7720,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -7736,7 +7736,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -7752,7 +7752,7 @@
"reportableChange": 0
},
{
- "name": "color loop start enhanced hue",
+ "name": "ColorLoopStartEnhancedHue",
"code": 16389,
"mfgCode": null,
"side": "server",
@@ -7768,7 +7768,7 @@
"reportableChange": 0
},
{
- "name": "color loop stored enhanced hue",
+ "name": "ColorLoopStoredEnhancedHue",
"code": 16390,
"mfgCode": null,
"side": "server",
@@ -7784,7 +7784,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -7800,7 +7800,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -7816,7 +7816,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -7832,7 +7832,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -7848,7 +7848,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -8005,5 +8005,6 @@
"endpointVersion": 1,
"deviceIdentifier": 259
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter
index d22b1447a3deca..34bd21a04cc396 100644
--- a/examples/lighting-app/lighting-common/lighting-app.matter
+++ b/examples/lighting-app/lighting-common/lighting-app.matter
@@ -229,8 +229,8 @@ server cluster ColorControl = 768 {
readonly attribute int16u currentY = 4;
readonly attribute int16u colorTemperature = 7;
readonly attribute enum8 colorMode = 8;
- attribute bitmap8 colorControlOptions = 15;
- readonly attribute int8u numberOfPrimaries = 16;
+ attribute bitmap8 options = 15;
+ readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
@@ -239,8 +239,8 @@ server cluster ColorControl = 768 {
readonly attribute int16u colorLoopStartEnhancedHue = 16389;
readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
readonly attribute bitmap16 colorCapabilities = 16394;
- readonly attribute int16u colorTempPhysicalMin = 16395;
- readonly attribute int16u colorTempPhysicalMax = 16396;
+ readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+ readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute bitmap32 featureMap = 65532;
@@ -378,8 +378,8 @@ server cluster ColorControl = 768 {
request struct MoveColorTemperatureRequest {
HueMoveMode moveMode = 0;
INT16U rate = 1;
- INT16U colorTemperatureMinimum = 2;
- INT16U colorTemperatureMaximum = 3;
+ INT16U colorTemperatureMinimumMireds = 2;
+ INT16U colorTemperatureMaximumMireds = 3;
BITMAP8 optionsMask = 4;
BITMAP8 optionsOverride = 5;
}
@@ -388,8 +388,8 @@ server cluster ColorControl = 768 {
HueStepMode stepMode = 0;
INT16U stepSize = 1;
INT16U transitionTime = 2;
- INT16U colorTemperatureMinimum = 3;
- INT16U colorTemperatureMaximum = 4;
+ INT16U colorTemperatureMinimumMireds = 3;
+ INT16U colorTemperatureMaximumMireds = 4;
BITMAP8 optionsMask = 5;
BITMAP8 optionsOverride = 6;
}
@@ -2001,7 +2001,7 @@ endpoint 1 {
ram attribute currentY default = 0x607D;
ram attribute colorTemperature default = 0x00FA;
ram attribute colorMode default = 0x01;
- ram attribute colorControlOptions;
+ ram attribute options;
ram attribute numberOfPrimaries;
ram attribute enhancedCurrentHue;
ram attribute enhancedColorMode default = 0x01;
@@ -2011,8 +2011,8 @@ endpoint 1 {
ram attribute colorLoopStartEnhancedHue default = 0x2300;
ram attribute colorLoopStoredEnhancedHue;
ram attribute colorCapabilities;
- ram attribute colorTempPhysicalMin;
- ram attribute colorTempPhysicalMax default = 0xFEFF;
+ ram attribute colorTempPhysicalMinMireds;
+ ram attribute colorTempPhysicalMaxMireds default = 0xFEFF;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap default = 0x1F;
diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap
index 3be60826f15786..f1bd32ef520e1b 100644
--- a/examples/lighting-app/lighting-common/lighting-app.zap
+++ b/examples/lighting-app/lighting-common/lighting-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -7203,7 +7203,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -7219,7 +7219,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -7235,7 +7235,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -7251,7 +7251,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -7267,7 +7267,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -7283,7 +7283,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -7299,7 +7299,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -7315,7 +7315,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -7331,7 +7331,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -7347,7 +7347,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -7363,7 +7363,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -7379,7 +7379,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -7395,7 +7395,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -7411,7 +7411,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -7427,7 +7427,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -7443,7 +7443,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -7459,7 +7459,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -7475,7 +7475,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -7491,7 +7491,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -7507,7 +7507,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -7523,7 +7523,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -7539,7 +7539,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -7555,7 +7555,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -7571,7 +7571,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -7587,7 +7587,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -7603,7 +7603,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -7619,7 +7619,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -7635,7 +7635,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -7651,7 +7651,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -7667,7 +7667,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -7683,7 +7683,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -7699,7 +7699,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -7715,7 +7715,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -7731,7 +7731,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -7747,7 +7747,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -7763,7 +7763,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -7779,7 +7779,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -7795,7 +7795,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -7811,7 +7811,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -7827,7 +7827,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -7843,7 +7843,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -7859,7 +7859,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -7875,7 +7875,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -7891,7 +7891,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -7907,7 +7907,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -7923,7 +7923,7 @@
"reportableChange": 0
},
{
- "name": "color loop start enhanced hue",
+ "name": "ColorLoopStartEnhancedHue",
"code": 16389,
"mfgCode": null,
"side": "server",
@@ -7939,7 +7939,7 @@
"reportableChange": 0
},
{
- "name": "color loop stored enhanced hue",
+ "name": "ColorLoopStoredEnhancedHue",
"code": 16390,
"mfgCode": null,
"side": "server",
@@ -7955,7 +7955,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -7971,7 +7971,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -7987,7 +7987,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -8003,7 +8003,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -8019,7 +8019,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -8256,5 +8256,6 @@
"endpointVersion": 1,
"deviceIdentifier": 257
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap
index 09b7f3576f6765..4b73cfbc2705c8 100644
--- a/examples/log-source-app/log-source-common/log-source-app.zap
+++ b/examples/log-source-app/log-source-common/log-source-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -2840,7 +2840,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -2856,7 +2856,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -2872,7 +2872,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -2888,7 +2888,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -2904,7 +2904,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -2920,7 +2920,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -2936,7 +2936,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -2952,7 +2952,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -2968,7 +2968,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -2984,7 +2984,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -3000,7 +3000,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -3016,7 +3016,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -3032,7 +3032,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -3048,7 +3048,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -3064,7 +3064,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -3080,7 +3080,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -3096,7 +3096,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -3112,7 +3112,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -3128,7 +3128,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -3144,7 +3144,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -3160,7 +3160,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -3176,7 +3176,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -3192,7 +3192,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -3208,7 +3208,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -3224,7 +3224,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -3240,7 +3240,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -3256,7 +3256,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -3272,7 +3272,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -3288,7 +3288,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -3304,7 +3304,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -3320,7 +3320,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -3336,7 +3336,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -3352,7 +3352,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -3368,7 +3368,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -3384,7 +3384,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -3400,7 +3400,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -3416,7 +3416,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -3432,7 +3432,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -3448,7 +3448,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -3464,7 +3464,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -3480,7 +3480,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -3496,7 +3496,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -3512,7 +3512,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -3528,7 +3528,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -3544,7 +3544,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -3560,7 +3560,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -3576,7 +3576,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -3592,7 +3592,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -3608,7 +3608,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -3624,7 +3624,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -3932,5 +3932,6 @@
"endpointVersion": 1,
"deviceIdentifier": null
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
index 6db92f01d85f5b..792311f5f6ce2f 100644
--- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
+++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -3553,7 +3553,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -3569,7 +3569,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -3585,7 +3585,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -3601,7 +3601,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -3617,7 +3617,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -3633,7 +3633,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -3649,7 +3649,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -3665,7 +3665,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -3681,7 +3681,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -3697,7 +3697,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -3713,7 +3713,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -3729,7 +3729,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -3745,7 +3745,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -3761,7 +3761,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -3777,7 +3777,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -3793,7 +3793,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -3809,7 +3809,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -3825,7 +3825,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -3841,7 +3841,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -3857,7 +3857,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -3873,7 +3873,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -3889,7 +3889,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -3905,7 +3905,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -3921,7 +3921,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -3937,7 +3937,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -3953,7 +3953,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -3969,7 +3969,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -3985,7 +3985,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -4001,7 +4001,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -4017,7 +4017,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -4033,7 +4033,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -4049,7 +4049,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -4065,7 +4065,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -4081,7 +4081,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -4097,7 +4097,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -4113,7 +4113,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -4129,7 +4129,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -4145,7 +4145,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -4161,7 +4161,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -4177,7 +4177,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -4193,7 +4193,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -4209,7 +4209,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -4225,7 +4225,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -4241,7 +4241,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -4257,7 +4257,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -4273,7 +4273,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -4289,7 +4289,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -4305,7 +4305,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -4321,7 +4321,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -4337,7 +4337,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -4645,5 +4645,6 @@
"endpointVersion": 1,
"deviceIdentifier": 22
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
index 1fec824e105712..81be7f672473d1 100644
--- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
+++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -3750,7 +3750,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -3766,7 +3766,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -3782,7 +3782,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -3798,7 +3798,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -3814,7 +3814,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -3830,7 +3830,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -3846,7 +3846,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -3862,7 +3862,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -3878,7 +3878,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -3894,7 +3894,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -3910,7 +3910,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -3926,7 +3926,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -3942,7 +3942,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -3958,7 +3958,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -3974,7 +3974,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -3990,7 +3990,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -4006,7 +4006,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -4022,7 +4022,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -4038,7 +4038,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -4054,7 +4054,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -4070,7 +4070,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -4086,7 +4086,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -4102,7 +4102,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -4118,7 +4118,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -4134,7 +4134,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -4150,7 +4150,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -4166,7 +4166,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -4182,7 +4182,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -4198,7 +4198,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -4214,7 +4214,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -4230,7 +4230,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -4246,7 +4246,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -4262,7 +4262,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -4278,7 +4278,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -4294,7 +4294,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -4310,7 +4310,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -4326,7 +4326,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -4342,7 +4342,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -4358,7 +4358,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -4374,7 +4374,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -4390,7 +4390,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -4406,7 +4406,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -4422,7 +4422,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -4438,7 +4438,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -4454,7 +4454,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -4470,7 +4470,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -4486,7 +4486,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -4502,7 +4502,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -4518,7 +4518,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -4534,7 +4534,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -4842,5 +4842,6 @@
"endpointVersion": 1,
"deviceIdentifier": 22
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter
index eef5ea30713e55..e1bb35aedb8f5e 100644
--- a/examples/placeholder/linux/apps/app1/config.matter
+++ b/examples/placeholder/linux/apps/app1/config.matter
@@ -299,7 +299,7 @@ server cluster ColorControl = 768 {
readonly attribute int16u currentX = 3;
readonly attribute int16u currentY = 4;
- attribute bitmap8 colorControlOptions = 15;
+ attribute bitmap8 options = 15;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute bitmap32 featureMap = 65532;
@@ -3061,7 +3061,7 @@ endpoint 1 {
server cluster ColorControl {
ram attribute currentX default = 0x616B;
ram attribute currentY default = 0x607D;
- ram attribute colorControlOptions;
+ ram attribute options;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap;
diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap
index 89bf2e1143b2ab..6272e491daae79 100644
--- a/examples/placeholder/linux/apps/app1/config.zap
+++ b/examples/placeholder/linux/apps/app1/config.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -8150,7 +8150,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8166,7 +8166,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -8182,7 +8182,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -8198,7 +8198,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -8214,7 +8214,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -8230,7 +8230,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -8246,7 +8246,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -8262,7 +8262,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -8333,5 +8333,6 @@
"endpointVersion": 1,
"deviceIdentifier": 258
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter
index eef5ea30713e55..e1bb35aedb8f5e 100644
--- a/examples/placeholder/linux/apps/app2/config.matter
+++ b/examples/placeholder/linux/apps/app2/config.matter
@@ -299,7 +299,7 @@ server cluster ColorControl = 768 {
readonly attribute int16u currentX = 3;
readonly attribute int16u currentY = 4;
- attribute bitmap8 colorControlOptions = 15;
+ attribute bitmap8 options = 15;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute bitmap32 featureMap = 65532;
@@ -3061,7 +3061,7 @@ endpoint 1 {
server cluster ColorControl {
ram attribute currentX default = 0x616B;
ram attribute currentY default = 0x607D;
- ram attribute colorControlOptions;
+ ram attribute options;
ram attribute coupleColorTempToLevelMinMireds;
ram attribute startUpColorTemperatureMireds;
ram attribute featureMap;
diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap
index 89bf2e1143b2ab..6272e491daae79 100644
--- a/examples/placeholder/linux/apps/app2/config.zap
+++ b/examples/placeholder/linux/apps/app2/config.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -8150,7 +8150,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -8166,7 +8166,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -8182,7 +8182,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -8198,7 +8198,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -8214,7 +8214,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -8230,7 +8230,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -8246,7 +8246,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -8262,7 +8262,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -8333,5 +8333,6 @@
"endpointVersion": 1,
"deviceIdentifier": 258
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap
index 5b7c8850db2636..9c2787454caf82 100644
--- a/examples/pump-app/pump-common/pump-app.zap
+++ b/examples/pump-app/pump-common/pump-app.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap
index 6c91a38009bfd0..215b0bed432f2a 100644
--- a/examples/thermostat/thermostat-common/thermostat.zap
+++ b/examples/thermostat/thermostat-common/thermostat.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -6026,7 +6026,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6042,7 +6042,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6058,7 +6058,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6074,7 +6074,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6090,7 +6090,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6106,7 +6106,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6122,7 +6122,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6138,7 +6138,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -6154,7 +6154,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -6170,7 +6170,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6186,7 +6186,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6202,7 +6202,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6218,7 +6218,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6234,7 +6234,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6250,7 +6250,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -6266,7 +6266,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -6282,7 +6282,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -6298,7 +6298,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -6314,7 +6314,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -6330,7 +6330,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -6346,7 +6346,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -6362,7 +6362,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -6378,7 +6378,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -6394,7 +6394,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -6410,7 +6410,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -6426,7 +6426,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -6442,7 +6442,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -6458,7 +6458,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -6474,7 +6474,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -6490,7 +6490,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -6506,7 +6506,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -6522,7 +6522,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -6538,7 +6538,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -6554,7 +6554,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -6570,7 +6570,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -6586,7 +6586,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -6602,7 +6602,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -6618,7 +6618,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -6634,7 +6634,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -6650,7 +6650,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -6666,7 +6666,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6682,7 +6682,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -6698,7 +6698,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -6714,7 +6714,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -6730,7 +6730,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -6746,7 +6746,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -6762,7 +6762,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -6778,7 +6778,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -6794,7 +6794,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -6810,7 +6810,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -12006,7 +12006,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -12022,7 +12022,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -12038,7 +12038,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -12054,7 +12054,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -12070,7 +12070,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -12086,7 +12086,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -12102,7 +12102,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -12118,7 +12118,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -12134,7 +12134,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -12150,7 +12150,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -12166,7 +12166,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -12182,7 +12182,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -12198,7 +12198,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -12214,7 +12214,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -12230,7 +12230,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -12246,7 +12246,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -12262,7 +12262,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -12278,7 +12278,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -12294,7 +12294,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -12310,7 +12310,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -12326,7 +12326,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -12342,7 +12342,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -12358,7 +12358,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -12374,7 +12374,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -12390,7 +12390,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -12406,7 +12406,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -12422,7 +12422,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -12438,7 +12438,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -12454,7 +12454,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -12470,7 +12470,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -12486,7 +12486,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -12502,7 +12502,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -12518,7 +12518,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -12534,7 +12534,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -12550,7 +12550,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -12566,7 +12566,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -12582,7 +12582,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -12598,7 +12598,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -12614,7 +12614,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -12630,7 +12630,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -12646,7 +12646,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -12662,7 +12662,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -12678,7 +12678,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -12694,7 +12694,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -12710,7 +12710,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -12726,7 +12726,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -12742,7 +12742,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -12758,7 +12758,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -12774,7 +12774,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -12790,7 +12790,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -15007,5 +15007,6 @@
"endpointVersion": 1,
"deviceIdentifier": 769
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap
index 3ce278fe26e5c1..16ff3e33c9544c 100644
--- a/examples/tv-app/tv-common/tv-app.zap
+++ b/examples/tv-app/tv-common/tv-app.zap
@@ -6042,7 +6042,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -6058,7 +6058,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -6074,7 +6074,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -6090,7 +6090,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -6106,7 +6106,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -6122,7 +6122,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -6138,7 +6138,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -6154,7 +6154,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -6170,7 +6170,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -6186,7 +6186,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -6202,7 +6202,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -6218,7 +6218,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -6234,7 +6234,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -6250,7 +6250,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -6266,7 +6266,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -6282,7 +6282,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -6298,7 +6298,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -6314,7 +6314,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -6330,7 +6330,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -6346,7 +6346,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -6362,7 +6362,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -6378,7 +6378,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -6394,7 +6394,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -6410,7 +6410,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -6426,7 +6426,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -6442,7 +6442,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -6458,7 +6458,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -6474,7 +6474,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -6490,7 +6490,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -6506,7 +6506,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -6522,7 +6522,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -6538,7 +6538,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -6554,7 +6554,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -6570,7 +6570,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -6586,7 +6586,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -6602,7 +6602,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -6618,7 +6618,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -6634,7 +6634,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -6650,7 +6650,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -6666,7 +6666,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -6682,7 +6682,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -6698,7 +6698,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -6714,7 +6714,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -6730,7 +6730,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -6746,7 +6746,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -6762,7 +6762,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -6778,7 +6778,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -6794,7 +6794,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -6810,7 +6810,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -6826,7 +6826,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
index 6bf99c59cc8994..b472f35116db62 100644
--- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
+++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap
@@ -5825,7 +5825,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -5841,7 +5841,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -5857,7 +5857,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -5873,7 +5873,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "currentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -5889,7 +5889,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "currentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -5905,7 +5905,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -8267,7 +8267,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -11646,7 +11646,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -11662,7 +11662,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -11678,7 +11678,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -11694,7 +11694,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "currentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -11710,7 +11710,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "currentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -11726,7 +11726,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -16856,7 +16856,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -16872,7 +16872,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -16888,7 +16888,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -16904,7 +16904,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "currentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -16920,7 +16920,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "currentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -16936,7 +16936,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
diff --git a/src/app/clusters/color-control-server/color-control-server.cpp b/src/app/clusters/color-control-server/color-control-server.cpp
index 9cad7eb03884fb..f042a011de0102 100644
--- a/src/app/clusters/color-control-server/color-control-server.cpp
+++ b/src/app/clusters/color-control-server/color-control-server.cpp
@@ -107,7 +107,7 @@ bool ColorControlServer::shouldExecuteIfOff(EndpointId endpoint, uint8_t optionM
}
uint8_t options = 0x00;
- Attributes::ColorControlOptions::Get(endpoint, &options);
+ Attributes::Options::Get(endpoint, &options);
bool on = true;
OnOff::Attributes::OnOff::Get(endpoint, &on);
@@ -1981,10 +1981,10 @@ EmberAfStatus ColorControlServer::moveToColorTemp(EndpointId aEndpoint, uint16_t
VerifyOrReturnError(colorTempTransitionState != nullptr, EMBER_ZCL_STATUS_UNSUPPORTED_ENDPOINT);
uint16_t temperatureMin = MIN_TEMPERATURE_VALUE;
- Attributes::ColorTempPhysicalMin::Get(endpoint, &temperatureMin);
+ Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &temperatureMin);
uint16_t temperatureMax = MAX_TEMPERATURE_VALUE;
- Attributes::ColorTempPhysicalMax::Get(endpoint, &temperatureMax);
+ Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &temperatureMax);
if (transitionTime == 0)
{
@@ -2039,7 +2039,7 @@ uint16_t ColorControlServer::getTemperatureCoupleToLevelMin(EndpointId endpoint)
if (status != EMBER_ZCL_STATUS_SUCCESS)
{
// Not less than the physical min.
- Attributes::ColorTempPhysicalMin::Get(endpoint, &colorTemperatureCoupleToLevelMin);
+ Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &colorTemperatureCoupleToLevelMin);
}
return colorTemperatureCoupleToLevelMin;
@@ -2085,10 +2085,10 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint)
if (status == EMBER_ZCL_STATUS_SUCCESS)
{
uint16_t tempPhysicalMin = MIN_TEMPERATURE_VALUE;
- Attributes::ColorTempPhysicalMin::Get(endpoint, &tempPhysicalMin);
+ Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &tempPhysicalMin);
uint16_t tempPhysicalMax = MAX_TEMPERATURE_VALUE;
- Attributes::ColorTempPhysicalMax::Get(endpoint, &tempPhysicalMax);
+ Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &tempPhysicalMax);
if (tempPhysicalMin <= startUpColorTemp && startUpColorTemp <= tempPhysicalMax)
{
@@ -2158,8 +2158,8 @@ bool ColorControlServer::moveColorTempCommand(const app::ConcreteCommandPath & c
{
uint8_t moveMode = commandData.moveMode;
uint16_t rate = commandData.rate;
- uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimum;
- uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximum;
+ uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
+ uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
uint8_t optionsMask = commandData.optionsMask;
uint8_t optionsOverride = commandData.optionsOverride;
EndpointId endpoint = commandPath.mEndpointId;
@@ -2177,8 +2177,8 @@ bool ColorControlServer::moveColorTempCommand(const app::ConcreteCommandPath & c
return true;
}
- Attributes::ColorTempPhysicalMin::Get(endpoint, &tempPhysicalMin);
- Attributes::ColorTempPhysicalMax::Get(endpoint, &tempPhysicalMax);
+ Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &tempPhysicalMin);
+ Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &tempPhysicalMax);
// New command. Need to stop any active transitions.
stopAllColorTransitions(endpoint);
@@ -2278,8 +2278,8 @@ bool ColorControlServer::stepColorTempCommand(const app::ConcreteCommandPath & c
uint8_t stepMode = commandData.stepMode;
uint16_t stepSize = commandData.stepSize;
uint16_t transitionTime = commandData.transitionTime;
- uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimum;
- uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximum;
+ uint16_t colorTemperatureMinimum = commandData.colorTemperatureMinimumMireds;
+ uint16_t colorTemperatureMaximum = commandData.colorTemperatureMaximumMireds;
uint8_t optionsMask = commandData.optionsMask;
uint8_t optionsOverride = commandData.optionsOverride;
EndpointId endpoint = commandPath.mEndpointId;
@@ -2296,9 +2296,8 @@ bool ColorControlServer::stepColorTempCommand(const app::ConcreteCommandPath & c
return true;
}
- Attributes::ColorTempPhysicalMin::Get(endpoint, &tempPhysicalMin);
-
- Attributes::ColorTempPhysicalMax::Get(endpoint, &tempPhysicalMax);
+ Attributes::ColorTempPhysicalMinMireds::Get(endpoint, &tempPhysicalMin);
+ Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &tempPhysicalMax);
if (transitionTime == 0)
{
@@ -2420,7 +2419,7 @@ void ColorControlServer::levelControlColorTempChangeCommand(EndpointId endpoint)
LevelControl::Attributes::CurrentLevel::Get(endpoint, ¤tLevel);
uint16_t tempPhysMax = MAX_TEMPERATURE_VALUE;
- Attributes::ColorTempPhysicalMax::Get(endpoint, &tempPhysMax);
+ Attributes::ColorTempPhysicalMaxMireds::Get(endpoint, &tempPhysMax);
// Scale color temp setting between the coupling min and the physical max.
// Note that mireds varies inversely with level: low level -> high mireds.
diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
index de63eacc5ad535..768900c20aebb6 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml
@@ -30,7 +30,7 @@ tests:
- label: "Validate constraints of attribute: CurrentHue"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
value: 0
constraints:
@@ -38,7 +38,7 @@ tests:
- label: "Validate constraints of attribute: CurrentSaturation"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
value: 0
constraints:
@@ -46,13 +46,13 @@ tests:
- label: "Reads CurrentX attribute from DUT"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
value: 24939
- label: "Validate constraints of attribute: CurrentX"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -61,13 +61,13 @@ tests:
- label: "Reads CurrentY attribute from DUT"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
value: 24701
- label: "Validate constraints of attribute: CurrentY"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -78,13 +78,13 @@ tests:
- label: "Reads ColorTemperatureMireds attribute from DUT"
PICS: PICS_SKIP_SAMPLE_APP
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
value: 250
- label: "Validate constraints of attribute: ColorTemperatureMireds"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -95,13 +95,13 @@ tests:
- label: "Reads ColorMode attribute from DUT"
PICS: PICS_SKIP_SAMPLE_APP
command: "readAttribute"
- attribute: "color mode"
+ attribute: "ColorMode"
response:
value: 1
- label: "Validate constraints of attribute: ColorMode"
command: "readAttribute"
- attribute: "color mode"
+ attribute: "ColorMode"
response:
constraints:
type: enum8
@@ -110,7 +110,7 @@ tests:
- label: "Validate constraints of attribute: Options"
command: "readAttribute"
- attribute: "color control options"
+ attribute: "Options"
response:
value: 0
constraints:
@@ -118,7 +118,7 @@ tests:
- label: "Validate constraints of attribute: EnhancedCurrentHue"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
value: 0
constraints:
@@ -128,7 +128,7 @@ tests:
- label: "Validate constraints of attribute: EnhancedColorMode"
PICS: PICS_SKIP_SAMPLE_APP
command: "readAttribute"
- attribute: "enhanced color mode"
+ attribute: "EnhancedColorMode"
response:
value: 1
constraints:
@@ -136,7 +136,7 @@ tests:
- label: "Validate constraints of attribute: ColorLoopActive"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
response:
value: 0
constraints:
@@ -144,7 +144,7 @@ tests:
- label: "Validate constraints of attribute: ColorLoopDirection"
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
response:
value: 0
constraints:
@@ -152,7 +152,7 @@ tests:
- label: "Validate constraints of attribute: ColorLoopTime"
command: "readAttribute"
- attribute: "color loop time"
+ attribute: "ColorLoopTime"
response:
value: 25
constraints:
@@ -160,7 +160,7 @@ tests:
- label: "Validate constraints of attribute: ColorLoopStartEnhancedHue"
command: "readAttribute"
- attribute: "color loop start enhanced hue"
+ attribute: "ColorLoopStartEnhancedHue"
response:
value: 8960
constraints:
@@ -168,7 +168,7 @@ tests:
- label: "Validate constraints of attribute: ColorLoopStoredEnhancedHue"
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
response:
value: 0
constraints:
@@ -176,13 +176,13 @@ tests:
- label: "Reads ColorCapabilities attribute from DUT"
command: "readAttribute"
- attribute: "color capabilities"
+ attribute: "ColorCapabilities"
response:
value: 0
- label: "Validate constraints of attribute: ColorCapabilities"
command: "readAttribute"
- attribute: "color capabilities"
+ attribute: "ColorCapabilities"
response:
constraints:
type: map16
@@ -191,13 +191,13 @@ tests:
- label: "Reads ColorTempPhysicalMinMireds attribute from DUT"
command: "readAttribute"
- attribute: "color temp physical min"
+ attribute: "ColorTempPhysicalMinMireds"
response:
value: 0
- label: "Validate constraints of attribute: ColorTempPhysicalMinMireds"
command: "readAttribute"
- attribute: "color temp physical min"
+ attribute: "ColorTempPhysicalMinMireds"
response:
constraints:
type: uint16
@@ -206,13 +206,13 @@ tests:
- label: "Read ColorTempPhysicalMaxMireds attribute from DUT"
command: "readAttribute"
- attribute: "color temp physical max"
+ attribute: "ColorTempPhysicalMaxMireds"
response:
value: 65279
- label: "Validate constraints of attribute: ColorTempPhysicalMaxMireds"
command: "readAttribute"
- attribute: "color temp physical max"
+ attribute: "ColorTempPhysicalMaxMireds"
response:
constraints:
type: uint16
@@ -222,7 +222,7 @@ tests:
- label: "Read the optional attribute: CoupleColorTempToLevelMinMireds"
optional: true
command: "readAttribute"
- attribute: "couple color temp to level min-mireds"
+ attribute: "CoupleColorTempToLevelMinMireds"
response:
constraints:
type: uint16
@@ -232,7 +232,7 @@ tests:
- label: "Read the optional attribute: StartUpColorTemperatureMireds"
optional: true
command: "readAttribute"
- attribute: "start up color temperature mireds"
+ attribute: "StartUpColorTemperatureMireds"
response:
constraints:
type: uint16
@@ -242,7 +242,7 @@ tests:
- label: "Validate constraints of attribute: RemainingTime"
optional: true
command: "readAttribute"
- attribute: "remaining time"
+ attribute: "RemainingTime"
response:
value: 0
constraints:
@@ -251,7 +251,7 @@ tests:
- label: "Read the optional attribute: DriftCompensation"
optional: true
command: "readAttribute"
- attribute: "drift compensation"
+ attribute: "DriftCompensation"
response:
constraints:
type: enum8
@@ -261,7 +261,7 @@ tests:
- label: "Read the optional attribute: CompensationText"
optional: true
command: "readAttribute"
- attribute: "compensation text"
+ attribute: "CompensationText"
response:
constraints:
type: string
@@ -270,7 +270,7 @@ tests:
#Defined Primaries Information Attribute Set
- label: "Read the mandatory attribute: NumberOfPrimaries"
command: "readAttribute"
- attribute: "number of primaries"
+ attribute: "NumberOfPrimaries"
response:
constraints:
type: uint8
@@ -279,7 +279,7 @@ tests:
- label: "Read the mandatory attribute: Primary1X"
command: "readAttribute"
- attribute: "primary 1 x"
+ attribute: "Primary1X"
response:
constraints:
type: uint16
@@ -288,7 +288,7 @@ tests:
- label: "Read the mandatory attribute: Primary1Y"
command: "readAttribute"
- attribute: "primary 1 y"
+ attribute: "Primary1Y"
response:
constraints:
type: uint16
@@ -297,14 +297,14 @@ tests:
- label: "Read the mandatory attribute: Primary1Intensity"
command: "readAttribute"
- attribute: "primary 1 intensity"
+ attribute: "Primary1Intensity"
response:
constraints:
type: uint8
- label: "Read the mandatory attribute: Primary2X"
command: "readAttribute"
- attribute: "primary 2 x"
+ attribute: "Primary2X"
response:
constraints:
type: uint16
@@ -313,7 +313,7 @@ tests:
- label: "Read the mandatory attribute: Primary2Y"
command: "readAttribute"
- attribute: "primary 2 y"
+ attribute: "Primary2Y"
response:
constraints:
type: uint16
@@ -322,14 +322,14 @@ tests:
- label: "Validate constraints of attribute: Primary2Intensity"
command: "readAttribute"
- attribute: "primary 2 intensity"
+ attribute: "Primary2Intensity"
response:
constraints:
type: uint8
- label: "Read the mandatory attribute: Primary3X"
command: "readAttribute"
- attribute: "primary 3 x"
+ attribute: "Primary3X"
response:
constraints:
type: uint16
@@ -338,7 +338,7 @@ tests:
- label: "Read the mandatory attribute: Primary3Y"
command: "readAttribute"
- attribute: "primary 3 y"
+ attribute: "Primary3Y"
response:
constraints:
type: uint16
@@ -347,7 +347,7 @@ tests:
- label: "Read the mandatory attribute: Primary3Intensity"
command: "readAttribute"
- attribute: "primary 3 intensity"
+ attribute: "Primary3Intensity"
response:
constraints:
type: uint8
@@ -355,7 +355,7 @@ tests:
#Additional Defined Primaries Information Attribute Set
- label: "Read the mandatory attribute: Primary4X"
command: "readAttribute"
- attribute: "primary 4 x"
+ attribute: "Primary4X"
response:
constraints:
type: uint16
@@ -364,7 +364,7 @@ tests:
- label: "Read the mandatory attribute: Primary4Y"
command: "readAttribute"
- attribute: "primary 4 y"
+ attribute: "Primary4Y"
response:
constraints:
type: uint16
@@ -373,14 +373,14 @@ tests:
- label: "Read the mandatory attribute: Primary4Intensity"
command: "readAttribute"
- attribute: "primary 4 intensity"
+ attribute: "Primary4Intensity"
response:
constraints:
type: uint8
- label: "Read the mandatory attribute: Primary5X"
command: "readAttribute"
- attribute: "primary 5 x"
+ attribute: "Primary5X"
response:
constraints:
type: uint16
@@ -389,7 +389,7 @@ tests:
- label: "Read the mandatory attribute: Primary5Y"
command: "readAttribute"
- attribute: "primary 5 y"
+ attribute: "Primary5Y"
response:
constraints:
type: uint16
@@ -398,14 +398,14 @@ tests:
- label: "Read the mandatory attribute: Primary5Intensity"
command: "readAttribute"
- attribute: "primary 5 intensity"
+ attribute: "Primary5Intensity"
response:
constraints:
type: uint8
- label: "Read the mandatory attribute: Primary6X"
command: "readAttribute"
- attribute: "primary 6 x"
+ attribute: "Primary6X"
response:
constraints:
type: uint16
@@ -414,7 +414,7 @@ tests:
- label: "Read the mandatory attribute: Primary6Y"
command: "readAttribute"
- attribute: "primary 6 y"
+ attribute: "Primary6Y"
response:
constraints:
type: uint16
@@ -423,7 +423,7 @@ tests:
- label: "Read the mandatory attribute: Primary6Intensity"
command: "readAttribute"
- attribute: "primary 6 intensity"
+ attribute: "Primary6Intensity"
response:
constraints:
type: uint8
@@ -432,7 +432,7 @@ tests:
- label: "Read the optional attribute: WhitePointX"
optional: true
command: "readAttribute"
- attribute: "white point x"
+ attribute: "WhitePointX"
response:
constraints:
type: uint16
@@ -442,7 +442,7 @@ tests:
- label: "Read the optional attribute: WhitePointY"
optional: true
command: "readAttribute"
- attribute: "white point y"
+ attribute: "WhitePointY"
response:
constraints:
type: uint16
@@ -452,7 +452,7 @@ tests:
- label: "Read the optional attribute: ColorPointRX"
optional: true
command: "readAttribute"
- attribute: "color point r x"
+ attribute: "ColorPointRX"
response:
constraints:
type: uint16
@@ -462,7 +462,7 @@ tests:
- label: "Read the optional attribute: ColorPointRY"
optional: true
command: "readAttribute"
- attribute: "color point r y"
+ attribute: "ColorPointRY"
response:
constraints:
type: uint16
@@ -472,7 +472,7 @@ tests:
- label: "Read the optional attribute: ColorPointRIntensity"
optional: true
command: "readAttribute"
- attribute: "color point r intensity"
+ attribute: "ColorPointRIntensity"
response:
constraints:
type: uint8
@@ -480,7 +480,7 @@ tests:
- label: "Read the optional attribute: ColorPointGX"
optional: true
command: "readAttribute"
- attribute: "color point g x"
+ attribute: "ColorPointGX"
response:
constraints:
type: uint16
@@ -490,7 +490,7 @@ tests:
- label: "Read the optional attribute: ColorPointGY"
optional: true
command: "readAttribute"
- attribute: "color point g y"
+ attribute: "ColorPointGY"
response:
constraints:
type: uint16
@@ -500,7 +500,7 @@ tests:
- label: "Read the optional attribute: ColorPointGIntensity"
optional: true
command: "readAttribute"
- attribute: "color point g intensity"
+ attribute: "ColorPointGIntensity"
response:
constraints:
type: uint8
@@ -508,7 +508,7 @@ tests:
- label: "Read the optional attribute: ColorPointBX"
optional: true
command: "readAttribute"
- attribute: "color point b x"
+ attribute: "ColorPointBX"
response:
constraints:
type: uint16
@@ -518,7 +518,7 @@ tests:
- label: "Read the optional attribute: ColorPointBY"
optional: true
command: "readAttribute"
- attribute: "color point b y"
+ attribute: "ColorPointBY"
response:
constraints:
type: uint16
@@ -528,7 +528,7 @@ tests:
- label: "Read the optional attribute: ColorPointBIntensity"
optional: true
command: "readAttribute"
- attribute: "color point b intensity"
+ attribute: "ColorPointBIntensity"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
index 27a4063cccd3ec..befef3de4dfe2e 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Reads CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -54,13 +54,13 @@ tests:
values:
- name: "hue"
value: 150
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -75,7 +75,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -94,7 +94,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -113,7 +113,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -126,13 +126,13 @@ tests:
values:
- name: "hue"
value: 200
- - name: "direction"
+ - name: "Direction"
value: 1
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -147,7 +147,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -166,7 +166,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -185,7 +185,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -198,13 +198,13 @@ tests:
values:
- name: "hue"
value: 250
- - name: "direction"
+ - name: "Direction"
value: 2
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -219,7 +219,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -238,7 +238,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -257,7 +257,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -270,13 +270,13 @@ tests:
values:
- name: "hue"
value: 225
- - name: "direction"
+ - name: "Direction"
value: 3
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -291,7 +291,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -310,7 +310,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -329,7 +329,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
index 01da79665aa17e..7cbb04a3303942 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Reads CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -52,13 +52,13 @@ tests:
command: "MoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 140ms"
@@ -73,7 +73,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -92,7 +92,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -111,7 +111,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -122,13 +122,13 @@ tests:
command: "MoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 140ms"
@@ -143,7 +143,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -162,7 +162,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -181,7 +181,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -192,13 +192,13 @@ tests:
command: "MoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 3
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 140ms"
@@ -213,7 +213,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -232,7 +232,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -251,7 +251,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -262,13 +262,13 @@ tests:
command: "MoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 140ms"
@@ -283,7 +283,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -302,7 +302,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -321,7 +321,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
index 54cb5f84db893a..d7cf7b087d4ab7 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Reads CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -52,15 +52,15 @@ tests:
command: "StepHue"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 1
- - name: "stepSize"
+ - name: "StepSize"
value: 5
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 25
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
#delay step is necessary to let the attribute value change over time
@@ -74,7 +74,7 @@ tests:
- label: "Over TransitionTime,Read CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -85,15 +85,15 @@ tests:
command: "StepHue"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 3
- - name: "stepSize"
+ - name: "StepSize"
value: 5
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 25
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 25ms"
@@ -106,7 +106,7 @@ tests:
- label: "Over TransitionTime,Read CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml
index 0ea437d8cef2a2..50e3eb655ed592 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Check Saturation attribute value matched before any change"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -52,13 +52,13 @@ tests:
command: "MoveToSaturation"
arguments:
values:
- - name: "saturation"
+ - name: "Saturation"
value: 90
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 10
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 6ms"
@@ -73,7 +73,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -92,7 +92,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -111,7 +111,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml
index c1beab49ce0384..a13ba0abd305e3 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml
@@ -43,7 +43,7 @@ tests:
"Check Saturation attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -54,13 +54,13 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -75,7 +75,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -94,7 +94,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -113,7 +113,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -124,13 +124,13 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 3
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -145,7 +145,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -164,7 +164,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -183,7 +183,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -194,13 +194,13 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -215,7 +215,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -234,7 +234,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -253,7 +253,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -264,13 +264,13 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -285,7 +285,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -304,7 +304,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -323,7 +323,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -334,13 +334,13 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 3
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -355,7 +355,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -374,7 +374,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -393,7 +393,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -404,13 +404,13 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -425,7 +425,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -444,7 +444,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -463,7 +463,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml
index 7b992ee9cd30af..0d74d55078a098 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Reads CurrentSaturation attribute from DUT"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -52,15 +52,15 @@ tests:
command: "StepSaturation"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 1
- - name: "stepSize"
+ - name: "StepSize"
value: 15
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 10
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
#delay step is necessary to let the attribute value change over time
@@ -74,7 +74,7 @@ tests:
- label: "Over TransitionTime,Read CurrentSaturation attribute from DUT"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -85,15 +85,15 @@ tests:
command: "StepSaturation"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 3
- - name: "stepSize"
+ - name: "StepSize"
value: 20
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 10
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 10ms"
@@ -106,7 +106,7 @@ tests:
- label: "Over TransitionTime,Reads CurrentSaturation attribute from DUT"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
index 9cc487a6816803..3669570febd982 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml
@@ -42,7 +42,7 @@ tests:
- label: "Check current hue attribute value matched before any change"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -51,7 +51,7 @@ tests:
- label: "Check Saturation attribute value matched before any change"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -64,13 +64,13 @@ tests:
values:
- name: "hue"
value: 40
- - name: "saturation"
+ - name: "Saturation"
value: 160
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 10
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 10ms"
@@ -85,7 +85,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -96,7 +96,7 @@ tests:
"Check current saturation attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
index 689e09ec0c04d5..7b7a35747b84b0 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Check current x attribute value matched before any change"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -50,7 +50,7 @@ tests:
- label: "Check current y attribute value matched before any change"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -65,11 +65,11 @@ tests:
value: 200
- name: "colorY"
value: 300
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 20
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 20ms"
@@ -84,7 +84,7 @@ tests:
"Check current x attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -95,7 +95,7 @@ tests:
"Check current y attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
index 0c1e9971fce64b..fa6ab4845e1e9c 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Check current x attribute value matched before any change"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -50,7 +50,7 @@ tests:
- label: "Check current y attribute value matched before any change"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -65,9 +65,9 @@ tests:
value: 15
- name: "rateY"
value: 20
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 150ms"
@@ -82,7 +82,7 @@ tests:
"Check current x attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -93,7 +93,7 @@ tests:
"Check current y attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -104,16 +104,16 @@ tests:
command: "StopMoveStep"
arguments:
values:
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label:
"Check current x attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -124,7 +124,7 @@ tests:
"Check current y attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
index d3189979128f78..43555aaf4be014 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Check current x attribute value matched before any change"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -50,7 +50,7 @@ tests:
- label: "Check current y attribute value matched before any change"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -65,11 +65,11 @@ tests:
value: 15
- name: "stepY"
value: 20
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 50ms"
@@ -84,7 +84,7 @@ tests:
"Check current x attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -95,7 +95,7 @@ tests:
"Check current y attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
index 0ad883996e060a..3b60b8d9774e01 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml
@@ -43,7 +43,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -56,11 +56,11 @@ tests:
values:
- name: "colorTemperature"
value: 100
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 10
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 10ms"
@@ -73,7 +73,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
index a097d08653e565..8dd7012f2994a1 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml
@@ -42,7 +42,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -53,17 +53,17 @@ tests:
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 10
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 90ms"
@@ -76,7 +76,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -93,7 +93,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -110,7 +110,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -121,17 +121,17 @@ tests:
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 3
- - name: "rate"
+ - name: "Rate"
value: 20
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 190ms"
@@ -144,7 +144,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -161,7 +161,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -178,7 +178,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -189,34 +189,34 @@ tests:
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 10
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Stop Color Temperature command"
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 10
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 90ms"
@@ -229,7 +229,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -246,7 +246,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -263,7 +263,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -274,34 +274,34 @@ tests:
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 3
- - name: "rate"
+ - name: "Rate"
value: 20
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Stop Color Temperature command"
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 10
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 140ms"
@@ -314,7 +314,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -331,7 +331,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -348,7 +348,7 @@ tests:
- label: "Read current color temprature attribute from DUT several times"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
index 4656ea9b8b4fee..37029590e7f3ed 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml
@@ -42,7 +42,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -53,19 +53,19 @@ tests:
command: "StepColorTemperature"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 1
- - name: "stepSize"
+ - name: "StepSize"
value: 5
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 50
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 5
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 100
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -78,7 +78,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -95,7 +95,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -112,7 +112,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -123,19 +123,19 @@ tests:
command: "StepColorTemperature"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 3
- - name: "stepSize"
+ - name: "StepSize"
value: 5
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 50
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 5
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 100
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -148,7 +148,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -165,7 +165,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -182,7 +182,7 @@ tests:
- label: "Read current color temprature"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml
index f78a3ffc194712..09c9314fc6cc72 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml
@@ -43,22 +43,22 @@ tests:
command: "EnhancedMoveToHue"
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 1025
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 1
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -69,15 +69,15 @@ tests:
command: "EnhancedMoveToHue"
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 1100
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -92,7 +92,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -111,7 +111,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -130,7 +130,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -141,15 +141,15 @@ tests:
command: "EnhancedMoveToHue"
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 1150
- - name: "direction"
+ - name: "Direction"
value: 1
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -164,7 +164,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -183,7 +183,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -202,7 +202,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -213,15 +213,15 @@ tests:
command: "EnhancedMoveToHue"
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 1200
- - name: "direction"
+ - name: "Direction"
value: 2
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -236,7 +236,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -255,7 +255,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -274,7 +274,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -285,15 +285,15 @@ tests:
command: "EnhancedMoveToHue"
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 1300
- - name: "direction"
+ - name: "Direction"
value: 3
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 300
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -308,7 +308,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -327,7 +327,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -346,7 +346,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml
index abd5ccbf55620f..7f4a7dd05cc3dd 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Check EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -52,13 +52,13 @@ tests:
command: "EnhancedMoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 290ms"
@@ -73,7 +73,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -92,7 +92,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -111,7 +111,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -122,20 +122,20 @@ tests:
command: "EnhancedMoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -146,13 +146,13 @@ tests:
command: "EnhancedMoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 3
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 40ms"
@@ -167,7 +167,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -186,7 +186,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -205,7 +205,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -216,20 +216,20 @@ tests:
command: "EnhancedMoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 0
- - name: "rate"
+ - name: "Rate"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml
index 778d6dcc26436c..20427560b4c166 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml
@@ -41,7 +41,7 @@ tests:
- label: "Reads EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -52,15 +52,15 @@ tests:
command: "EnhancedStepHue"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 0
- - name: "stepSize"
+ - name: "StepSize"
value: 50
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 1
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 10ms"
@@ -73,7 +73,7 @@ tests:
- label: "Over TransitionTime,Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -84,15 +84,15 @@ tests:
command: "EnhancedStepHue"
arguments:
values:
- - name: "stepMode"
+ - name: "StepMode"
value: 1
- - name: "stepSize"
+ - name: "StepSize"
value: 75
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 1
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 10ms"
@@ -105,7 +105,7 @@ tests:
- label: "Over TransitionTime,Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml
index d2d91a6c8423c4..d82596c8871f23 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml
@@ -43,7 +43,7 @@ tests:
- label: "Reads EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -54,15 +54,15 @@ tests:
command: "EnhancedMoveToHueAndSaturation"
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 1200
- - name: "saturation"
+ - name: "Saturation"
value: 90
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 10
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 10ms"
@@ -77,7 +77,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last command"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
index ca2197bb1dc218..5ea73a72912395 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml
@@ -43,18 +43,18 @@ tests:
command: "MoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -65,14 +65,14 @@ tests:
command: "StopMoveStep"
arguments:
values:
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads CurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -91,7 +91,7 @@ tests:
"Check current hue attribute value matched the value sent by the last
attribute"
command: "readAttribute"
- attribute: "current hue"
+ attribute: "CurrentHue"
response:
constraints:
type: uint8
@@ -102,20 +102,20 @@ tests:
command: "MoveSaturation"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 5
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label:
"Check Saturation attribute value matched the value sent by the last
command"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -126,14 +126,14 @@ tests:
command: "StopMoveStep"
arguments:
values:
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads CurrentSaturation attribute from DUT."
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -152,7 +152,7 @@ tests:
"Check Saturation attribute value matched the value sent by the last
attribute"
command: "readAttribute"
- attribute: "current saturation"
+ attribute: "CurrentSaturation"
response:
constraints:
type: uint8
@@ -167,14 +167,14 @@ tests:
value: 15
- name: "rateY"
value: 20
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads CurrentX attribute from DUT"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -183,7 +183,7 @@ tests:
- label: "Reads CurrentY attribute from DUT"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -194,14 +194,14 @@ tests:
command: "StopMoveStep"
arguments:
values:
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads CurrentX attribute from DUT"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -210,7 +210,7 @@ tests:
- label: "Reads CurrentY attribute from DUT"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -229,7 +229,7 @@ tests:
"Check current x attribute value matched the value sent by the last
attribute"
command: "readAttribute"
- attribute: "current x"
+ attribute: "CurrentX"
response:
constraints:
type: uint16
@@ -240,7 +240,7 @@ tests:
"Check current y attribute value matched the value sent by the last
attribute"
command: "readAttribute"
- attribute: "current y"
+ attribute: "CurrentY"
response:
constraints:
type: uint16
@@ -251,22 +251,22 @@ tests:
command: "MoveColorTemperature"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 10
- - name: "colorTemperatureMinimum"
+ - name: "ColorTemperatureMinimumMireds"
value: 1
- - name: "colorTemperatureMaximum"
+ - name: "ColorTemperatureMaximumMireds"
value: 255
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads current color temprature from DUT"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -277,14 +277,14 @@ tests:
command: "StopMoveStep"
arguments:
values:
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads current color temprature from DUT"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -303,7 +303,7 @@ tests:
"Reads current color attribute value matched the value sent by the
last attribute"
command: "readAttribute"
- attribute: "color temperature"
+ attribute: "ColorTemperature"
response:
constraints:
type: uint16
@@ -314,18 +314,18 @@ tests:
command: "EnhancedMoveHue"
arguments:
values:
- - name: "moveMode"
+ - name: "MoveMode"
value: 1
- - name: "rate"
+ - name: "Rate"
value: 50
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads EnhancedCurrentHue attribute value from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -336,14 +336,14 @@ tests:
command: "StopMoveStep"
arguments:
values:
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Reads EnhancedCurrentHue attribute value from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
@@ -362,7 +362,7 @@ tests:
"Check EnhancedCurrentHue attribute value matched the value sent by
the last attribute"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
response:
constraints:
type: uint16
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
index 5d9b069f083b5f..1e8e80df067467 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml
@@ -44,24 +44,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
@@ -71,24 +71,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 2
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopDirection attribute from DUT"
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 0
@@ -98,24 +98,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 4
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 30
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopTime attribute from DUT"
command: "readAttribute"
- attribute: "color loop time"
+ attribute: "ColorLoopTime"
PICS: A_COLORLOOPTIME
response:
value: 30
@@ -125,24 +125,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 8
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 160
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopStartEnhancedHue attribute from DUT"
command: "readAttribute"
- attribute: "color loop start enhanced hue"
+ attribute: "ColorLoopStartEnhancedHue"
PICS: A_COLORLOOPSTARTENHANCEDHUE
response:
value: 160
@@ -152,31 +152,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 1
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 1
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
saveAs: EnhancedCurrentHueValue1
@@ -185,7 +185,7 @@ tests:
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
value: EnhancedCurrentHueValue1
@@ -195,7 +195,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -205,7 +205,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -215,31 +215,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
saveAs: ColorLoopStoredEnhancedHueValue1
@@ -248,7 +248,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: ColorLoopStoredEnhancedHueValue1
@@ -258,24 +258,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 2
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 1
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopDirection attribute from DUT"
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 1
@@ -285,31 +285,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 1
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 1
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
saveAs: EnhancedCurrentHueValue2
@@ -318,7 +318,7 @@ tests:
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT"
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
value: EnhancedCurrentHueValue2
@@ -328,7 +328,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -338,7 +338,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -348,31 +348,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
saveAs: ColorLoopStoredEnhancedHueValue2
@@ -381,7 +381,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: ColorLoopStoredEnhancedHueValue2
@@ -391,15 +391,15 @@ tests:
PICS: CR_ENHANCEDMOVETOHUE
arguments:
values:
- - name: "enhancedHue"
+ - name: "EnhancedHue"
value: 40960
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "transitionTime"
+ - name: "TransitionTime"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Wait 2000ms"
@@ -412,7 +412,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 40960
@@ -422,24 +422,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 2
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopDirection attribute from DUT"
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 0
@@ -449,31 +449,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 2
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 1
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
saveAs: EnhancedCurrentHueValue3
@@ -482,7 +482,7 @@ tests:
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT"
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
value: EnhancedCurrentHueValue3
@@ -492,7 +492,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -502,7 +502,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -512,31 +512,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
saveAs: ColorLoopStoredEnhancedHueValue3
@@ -545,7 +545,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: ColorLoopStoredEnhancedHueValue3
@@ -555,25 +555,25 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 2
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 1
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
#Issue #336 expected value is 1 but returned is 2
- label: "Read ColorLoopDirection attribute from DUT"
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 1
@@ -583,31 +583,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 2
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 1
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
saveAs: EnhancedCurrentHueValue4
@@ -616,7 +616,7 @@ tests:
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT"
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
value: EnhancedCurrentHueValue4
@@ -626,7 +626,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -636,7 +636,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -646,31 +646,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
saveAs: ColorLoopStoredEnhancedHue4
@@ -679,7 +679,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: ColorLoopStoredEnhancedHue4
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
index 6f7a92c62f4030..4e1efb96aecf56 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml
@@ -46,52 +46,52 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 15
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 30
- name: "startHue"
value: 160
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopDirection attribute from DUT."
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 0
- label: "Read ColorLoopTime attribute from DUT."
command: "readAttribute"
- attribute: "color loop time"
+ attribute: "ColorLoopTime"
PICS: A_COLORLOOPTIME
response:
value: 30
- label: "Read ColorLoopStartEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop start enhanced hue"
+ attribute: "ColorLoopStartEnhancedHue"
PICS: A_COLORLOOPSTARTENHANCEDHUE
response:
value: 160
- label: "Read EnhancedCurrentHue attribute from DUT."
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
saveAs: EnhancedCurrentHueValue
@@ -103,31 +103,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 1
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT."
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 1
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
value: EnhancedCurrentHueValue
@@ -137,7 +137,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -147,7 +147,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -157,24 +157,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 2
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 1
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopDirection attribute from DUT."
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 1
@@ -184,7 +184,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -194,7 +194,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -204,24 +204,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
@@ -229,7 +229,7 @@ tests:
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
response:
saveAs: ColorLoopStoredEnhancedHueValue
constraints:
@@ -237,7 +237,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT."
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: ColorLoopStoredEnhancedHueValue
diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
index b1cf7fb0d24d0d..906b69c02eb810 100644
--- a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
+++ b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml
@@ -45,45 +45,45 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 15
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 30
- name: "startHue"
value: 160
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopDirection attribute from DUT."
command: "readAttribute"
- attribute: "color loop direction"
+ attribute: "ColorLoopDirection"
PICS: A_COLORLOOPDIRECTION
response:
value: 0
- label: "Read ColorLoopTime attribute from DUT."
command: "readAttribute"
- attribute: "color loop time"
+ attribute: "ColorLoopTime"
PICS: A_COLORLOOPTIME
response:
value: 30
- label: "Read ColorLoopStartEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop start enhanced hue"
+ attribute: "ColorLoopStartEnhancedHue"
PICS: A_COLORLOOPSTARTENHANCEDHUE
response:
value: 160
@@ -93,31 +93,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 1
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT."
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 1
- label: "Read EnhancedCurrentHue attribute from DUT."
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
saveAs: EnhancedCurrentHueValue
@@ -126,7 +126,7 @@ tests:
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
value: EnhancedCurrentHueValue
@@ -136,7 +136,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -146,7 +146,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -156,24 +156,24 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 4
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 60
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopTime attribute from DUT."
command: "readAttribute"
- attribute: "color loop time"
+ attribute: "ColorLoopTime"
PICS: A_COLORLOOPTIME
response:
value: 60
@@ -183,7 +183,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -193,7 +193,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT"
disabled: true
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: 500
@@ -203,31 +203,31 @@ tests:
PICS: CR_COLORLOOPSET
arguments:
values:
- - name: "updateFlags"
+ - name: "UpdateFlags"
value: 1
- - name: "action"
+ - name: "Action"
value: 0
- - name: "direction"
+ - name: "Direction"
value: 0
- - name: "time"
+ - name: "Time"
value: 0
- name: "startHue"
value: 0
- - name: "optionsMask"
+ - name: "OptionsMask"
value: 0
- - name: "optionsOverride"
+ - name: "OptionsOverride"
value: 0
- label: "Read ColorLoopActive attribute from DUT"
command: "readAttribute"
- attribute: "color loop active"
+ attribute: "ColorLoopActive"
PICS: A_COLORLOOPACTIVE
response:
value: 0
- label: "Read ColorLoopStoredEnhancedHue attribute from DUT."
command: "readAttribute"
- attribute: "color loop stored enhanced hue"
+ attribute: "ColorLoopStoredEnhancedHue"
PICS: A_COLORLOOPSTOREDENHANCEDHUE
response:
saveAs: ColorLoopStoredEnhancedHueValue
@@ -236,7 +236,7 @@ tests:
- label: "Read EnhancedCurrentHue attribute from DUT."
command: "readAttribute"
- attribute: "enhanced current hue"
+ attribute: "EnhancedCurrentHue"
PICS: A_ENHANCEDCURRENTHUE
response:
value: ColorLoopStoredEnhancedHueValue
diff --git a/src/app/zap-templates/zcl/data-model/silabs/ha.xml b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
index c8be92cd5d9f13..f076d984601003 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml
@@ -154,133 +154,133 @@ limitations under the License.
true
true
- current hue
+ CurrentHue
- current saturation
+ CurrentSaturation
- remaining time
+ RemainingTime
- current x
+ CurrentX
- current y
+ CurrentY
- drift compensation
+ DriftCompensation
- compensation text
+ CompensationText
- color temperature
+ ColorTemperature
- color mode
+ ColorMode
- color control options
+ Options
- number of primaries
+ NumberOfPrimaries
- primary 1 x
+ Primary1X
- primary 1 y
+ Primary1Y
- primary 1 intensity
+ Primary1Intensity
- primary 2 x
+ Primary2X
- primary 2 y
+ Primary2Y
- primary 2 intensity
+ Primary2Intensity
- primary 3 x
+ Primary3X
- primary 3 y
+ Primary3Y
- primary 3 intensity
+ Primary3Intensity
- primary 4 x
+ Primary4X
- primary 4 y
+ Primary4Y
- primary 4 intensity
+ Primary4Intensity
- primary 5 x
+ Primary5X
- primary 5 y
+ Primary5Y
- primary 5 intensity
+ Primary5Intensity
- primary 6 x
+ Primary6X
- primary 6 y
+ Primary6Y
- primary 6 intensity
+ Primary6Intensity
- white point x
+ WhitePointX
- white point y
+ WhitePointY
- color point r x
+ ColorPointRX
- color point r y
+ ColorPointRY
-
- color point r intensity
+
+ ColorPointRIntensity
- color point g x
+ ColorPointGX
- color point g y
+ ColorPointGY
-
- color point g intensity
+
+ ColorPointGIntensity
- color point b x
+ ColorPointBX
- color point b y
+ ColorPointBY
-
- color point b intensity
+
+ ColorPointBIntensity
- couple color temp to level min-mireds
-
- start up color temperature mireds
+ CoupleColorTempToLevelMinMireds
+
+ StartUpColorTemperatureMireds
@@ -288,106 +288,106 @@ limitations under the License.
Move to specified hue.
-
-
-
-
-
+
+
+
+
+
Move hue up or down at specified rate.
-
-
-
-
+
+
+
+
Step hue up or down by specified size at specified rate.
-
-
-
-
-
+
+
+
+
+
Move to specified saturation.
-
-
-
-
+
+
+
+
Move saturation up or down at specified rate.
-
-
-
-
+
+
+
+
Step saturation up or down by specified size at specified rate.
-
-
-
-
-
+
+
+
+
+
Move to hue and saturation.
-
-
-
-
-
+
+
+
+
+
Move to specified color.
-
-
-
-
-
+
+
+
+
+
Moves the color.
-
-
-
-
+
+
+
+
Steps the lighting to a specific color.
-
-
-
-
-
+
+
+
+
+
Move to a specific color temperature.
-
-
-
-
+
+
+
+
diff --git a/src/app/zap-templates/zcl/data-model/silabs/zll.xml b/src/app/zap-templates/zcl/data-model/silabs/zll.xml
index 796442becb94b2..91e17d8859b317 100644
--- a/src/app/zap-templates/zcl/data-model/silabs/zll.xml
+++ b/src/app/zap-templates/zcl/data-model/silabs/zll.xml
@@ -53,96 +53,96 @@ limitations under the License.
sw build id
- enhanced current hue
- enhanced color mode
- color loop active
- color loop direction
- color loop time
- color loop start enhanced hue
- color loop stored enhanced hue
- color capabilities
- color temp physical min
- color temp physical max
-
+ EnhancedCurrentHue
+ EnhancedColorMode
+ ColorLoopActive
+ ColorLoopDirection
+ ColorLoopTime
+ ColorLoopStartEnhancedHue
+ ColorLoopStoredEnhancedHue
+ ColorCapabilities
+ ColorTempPhysicalMinMireds
+ ColorTempPhysicalMaxMireds
+
Command description for EnhancedMoveToHue
-
-
-
-
-
+
+
+
+
+
-
+
Command description for EnhancedMoveHue
-
-
-
-
+
+
+
+
-
+
Command description for EnhancedStepHue
-
-
-
-
-
+
+
+
+
+
-
+
Command description for EnhancedMoveToHueAndSaturation
-
-
-
-
-
+
+
+
+
+
-
+
Command description for ColorLoopSet
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
Command description for StopMoveStep
-
-
+
+
-
+
Command description for MoveColorTemperature
-
-
-
-
-
-
+
+
+
+
+
+
-
+
Command description for StepColorTemperature
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter
index 5ada72cb5d7079..c934293050c8f6 100644
--- a/src/controller/data_model/controller-clusters.matter
+++ b/src/controller/data_model/controller-clusters.matter
@@ -706,37 +706,37 @@ client cluster ColorControl = 768 {
readonly attribute char_string<254> compensationText = 6;
readonly attribute int16u colorTemperature = 7;
readonly attribute enum8 colorMode = 8;
- attribute bitmap8 colorControlOptions = 15;
- readonly attribute int8u numberOfPrimaries = 16;
+ attribute bitmap8 options = 15;
+ readonly attribute nullable int8u numberOfPrimaries = 16;
readonly attribute int16u primary1X = 17;
readonly attribute int16u primary1Y = 18;
- readonly attribute int8u primary1Intensity = 19;
+ readonly attribute nullable int8u primary1Intensity = 19;
readonly attribute int16u primary2X = 21;
readonly attribute int16u primary2Y = 22;
- readonly attribute int8u primary2Intensity = 23;
+ readonly attribute nullable int8u primary2Intensity = 23;
readonly attribute int16u primary3X = 25;
readonly attribute int16u primary3Y = 26;
- readonly attribute int8u primary3Intensity = 27;
+ readonly attribute nullable int8u primary3Intensity = 27;
readonly attribute int16u primary4X = 32;
readonly attribute int16u primary4Y = 33;
- readonly attribute int8u primary4Intensity = 34;
+ readonly attribute nullable int8u primary4Intensity = 34;
readonly attribute int16u primary5X = 36;
readonly attribute int16u primary5Y = 37;
- readonly attribute int8u primary5Intensity = 38;
+ readonly attribute nullable int8u primary5Intensity = 38;
readonly attribute int16u primary6X = 40;
readonly attribute int16u primary6Y = 41;
- readonly attribute int8u primary6Intensity = 42;
+ readonly attribute nullable int8u primary6Intensity = 42;
attribute access(write: manage) int16u whitePointX = 48;
attribute access(write: manage) int16u whitePointY = 49;
attribute access(write: manage) int16u colorPointRX = 50;
attribute access(write: manage) int16u colorPointRY = 51;
- attribute access(write: manage) int8u colorPointRIntensity = 52;
+ attribute access(write: manage) nullable int8u colorPointRIntensity = 52;
attribute access(write: manage) int16u colorPointGX = 54;
attribute access(write: manage) int16u colorPointGY = 55;
- attribute access(write: manage) int8u colorPointGIntensity = 56;
+ attribute access(write: manage) nullable int8u colorPointGIntensity = 56;
attribute access(write: manage) int16u colorPointBX = 58;
attribute access(write: manage) int16u colorPointBY = 59;
- attribute access(write: manage) int8u colorPointBIntensity = 60;
+ attribute access(write: manage) nullable int8u colorPointBIntensity = 60;
readonly attribute int16u enhancedCurrentHue = 16384;
readonly attribute enum8 enhancedColorMode = 16385;
readonly attribute int8u colorLoopActive = 16386;
@@ -745,8 +745,8 @@ client cluster ColorControl = 768 {
readonly attribute int16u colorLoopStartEnhancedHue = 16389;
readonly attribute int16u colorLoopStoredEnhancedHue = 16390;
readonly attribute bitmap16 colorCapabilities = 16394;
- readonly attribute int16u colorTempPhysicalMin = 16395;
- readonly attribute int16u colorTempPhysicalMax = 16396;
+ readonly attribute int16u colorTempPhysicalMinMireds = 16395;
+ readonly attribute int16u colorTempPhysicalMaxMireds = 16396;
readonly attribute int16u coupleColorTempToLevelMinMireds = 16397;
attribute access(write: manage) int16u startUpColorTemperatureMireds = 16400;
readonly attribute command_id generatedCommandList[] = 65528;
@@ -887,8 +887,8 @@ client cluster ColorControl = 768 {
request struct MoveColorTemperatureRequest {
HueMoveMode moveMode = 0;
INT16U rate = 1;
- INT16U colorTemperatureMinimum = 2;
- INT16U colorTemperatureMaximum = 3;
+ INT16U colorTemperatureMinimumMireds = 2;
+ INT16U colorTemperatureMaximumMireds = 3;
BITMAP8 optionsMask = 4;
BITMAP8 optionsOverride = 5;
}
@@ -897,8 +897,8 @@ client cluster ColorControl = 768 {
HueStepMode stepMode = 0;
INT16U stepSize = 1;
INT16U transitionTime = 2;
- INT16U colorTemperatureMinimum = 3;
- INT16U colorTemperatureMaximum = 4;
+ INT16U colorTemperatureMinimumMireds = 3;
+ INT16U colorTemperatureMaximumMireds = 4;
BITMAP8 optionsMask = 5;
BITMAP8 optionsOverride = 6;
}
diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap
index 3288bfaa8d78c2..a8bf69532f75d5 100644
--- a/src/controller/data_model/controller-clusters.zap
+++ b/src/controller/data_model/controller-clusters.zap
@@ -1,5 +1,5 @@
{
- "featureLevel": 70,
+ "featureLevel": 71,
"creator": "zap",
"keyValuePairs": [
{
@@ -12880,7 +12880,7 @@
"commands": [],
"attributes": [
{
- "name": "current hue",
+ "name": "CurrentHue",
"code": 0,
"mfgCode": null,
"side": "server",
@@ -12896,7 +12896,7 @@
"reportableChange": 0
},
{
- "name": "current saturation",
+ "name": "CurrentSaturation",
"code": 1,
"mfgCode": null,
"side": "server",
@@ -12912,7 +12912,7 @@
"reportableChange": 0
},
{
- "name": "remaining time",
+ "name": "RemainingTime",
"code": 2,
"mfgCode": null,
"side": "server",
@@ -12928,7 +12928,7 @@
"reportableChange": 0
},
{
- "name": "current x",
+ "name": "CurrentX",
"code": 3,
"mfgCode": null,
"side": "server",
@@ -12944,7 +12944,7 @@
"reportableChange": 0
},
{
- "name": "current y",
+ "name": "CurrentY",
"code": 4,
"mfgCode": null,
"side": "server",
@@ -12960,7 +12960,7 @@
"reportableChange": 0
},
{
- "name": "drift compensation",
+ "name": "DriftCompensation",
"code": 5,
"mfgCode": null,
"side": "server",
@@ -12976,7 +12976,7 @@
"reportableChange": 0
},
{
- "name": "compensation text",
+ "name": "CompensationText",
"code": 6,
"mfgCode": null,
"side": "server",
@@ -12992,7 +12992,7 @@
"reportableChange": 0
},
{
- "name": "color temperature",
+ "name": "ColorTemperature",
"code": 7,
"mfgCode": null,
"side": "server",
@@ -13008,7 +13008,7 @@
"reportableChange": 0
},
{
- "name": "color mode",
+ "name": "ColorMode",
"code": 8,
"mfgCode": null,
"side": "server",
@@ -13024,7 +13024,7 @@
"reportableChange": 0
},
{
- "name": "color control options",
+ "name": "Options",
"code": 15,
"mfgCode": null,
"side": "server",
@@ -13040,7 +13040,7 @@
"reportableChange": 0
},
{
- "name": "number of primaries",
+ "name": "NumberOfPrimaries",
"code": 16,
"mfgCode": null,
"side": "server",
@@ -13056,7 +13056,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 x",
+ "name": "Primary1X",
"code": 17,
"mfgCode": null,
"side": "server",
@@ -13072,7 +13072,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 y",
+ "name": "Primary1Y",
"code": 18,
"mfgCode": null,
"side": "server",
@@ -13088,7 +13088,7 @@
"reportableChange": 0
},
{
- "name": "primary 1 intensity",
+ "name": "Primary1Intensity",
"code": 19,
"mfgCode": null,
"side": "server",
@@ -13104,7 +13104,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 x",
+ "name": "Primary2X",
"code": 21,
"mfgCode": null,
"side": "server",
@@ -13120,7 +13120,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 y",
+ "name": "Primary2Y",
"code": 22,
"mfgCode": null,
"side": "server",
@@ -13136,7 +13136,7 @@
"reportableChange": 0
},
{
- "name": "primary 2 intensity",
+ "name": "Primary2Intensity",
"code": 23,
"mfgCode": null,
"side": "server",
@@ -13152,7 +13152,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 x",
+ "name": "Primary3X",
"code": 25,
"mfgCode": null,
"side": "server",
@@ -13168,7 +13168,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 y",
+ "name": "Primary3Y",
"code": 26,
"mfgCode": null,
"side": "server",
@@ -13184,7 +13184,7 @@
"reportableChange": 0
},
{
- "name": "primary 3 intensity",
+ "name": "Primary3Intensity",
"code": 27,
"mfgCode": null,
"side": "server",
@@ -13200,7 +13200,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 x",
+ "name": "Primary4X",
"code": 32,
"mfgCode": null,
"side": "server",
@@ -13216,7 +13216,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 y",
+ "name": "Primary4Y",
"code": 33,
"mfgCode": null,
"side": "server",
@@ -13232,7 +13232,7 @@
"reportableChange": 0
},
{
- "name": "primary 4 intensity",
+ "name": "Primary4Intensity",
"code": 34,
"mfgCode": null,
"side": "server",
@@ -13248,7 +13248,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 x",
+ "name": "Primary5X",
"code": 36,
"mfgCode": null,
"side": "server",
@@ -13264,7 +13264,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 y",
+ "name": "Primary5Y",
"code": 37,
"mfgCode": null,
"side": "server",
@@ -13280,7 +13280,7 @@
"reportableChange": 0
},
{
- "name": "primary 5 intensity",
+ "name": "Primary5Intensity",
"code": 38,
"mfgCode": null,
"side": "server",
@@ -13296,7 +13296,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 x",
+ "name": "Primary6X",
"code": 40,
"mfgCode": null,
"side": "server",
@@ -13312,7 +13312,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 y",
+ "name": "Primary6Y",
"code": 41,
"mfgCode": null,
"side": "server",
@@ -13328,7 +13328,7 @@
"reportableChange": 0
},
{
- "name": "primary 6 intensity",
+ "name": "Primary6Intensity",
"code": 42,
"mfgCode": null,
"side": "server",
@@ -13344,7 +13344,7 @@
"reportableChange": 0
},
{
- "name": "white point x",
+ "name": "WhitePointX",
"code": 48,
"mfgCode": null,
"side": "server",
@@ -13360,7 +13360,7 @@
"reportableChange": 0
},
{
- "name": "white point y",
+ "name": "WhitePointY",
"code": 49,
"mfgCode": null,
"side": "server",
@@ -13376,7 +13376,7 @@
"reportableChange": 0
},
{
- "name": "color point r x",
+ "name": "ColorPointRX",
"code": 50,
"mfgCode": null,
"side": "server",
@@ -13392,7 +13392,7 @@
"reportableChange": 0
},
{
- "name": "color point r y",
+ "name": "ColorPointRY",
"code": 51,
"mfgCode": null,
"side": "server",
@@ -13408,7 +13408,7 @@
"reportableChange": 0
},
{
- "name": "color point r intensity",
+ "name": "ColorPointRIntensity",
"code": 52,
"mfgCode": null,
"side": "server",
@@ -13424,7 +13424,7 @@
"reportableChange": 0
},
{
- "name": "color point g x",
+ "name": "ColorPointGX",
"code": 54,
"mfgCode": null,
"side": "server",
@@ -13440,7 +13440,7 @@
"reportableChange": 0
},
{
- "name": "color point g y",
+ "name": "ColorPointGY",
"code": 55,
"mfgCode": null,
"side": "server",
@@ -13456,7 +13456,7 @@
"reportableChange": 0
},
{
- "name": "color point g intensity",
+ "name": "ColorPointGIntensity",
"code": 56,
"mfgCode": null,
"side": "server",
@@ -13472,7 +13472,7 @@
"reportableChange": 0
},
{
- "name": "color point b x",
+ "name": "ColorPointBX",
"code": 58,
"mfgCode": null,
"side": "server",
@@ -13488,7 +13488,7 @@
"reportableChange": 0
},
{
- "name": "color point b y",
+ "name": "ColorPointBY",
"code": 59,
"mfgCode": null,
"side": "server",
@@ -13504,7 +13504,7 @@
"reportableChange": 0
},
{
- "name": "color point b intensity",
+ "name": "ColorPointBIntensity",
"code": 60,
"mfgCode": null,
"side": "server",
@@ -13520,7 +13520,7 @@
"reportableChange": 0
},
{
- "name": "enhanced current hue",
+ "name": "EnhancedCurrentHue",
"code": 16384,
"mfgCode": null,
"side": "server",
@@ -13536,7 +13536,7 @@
"reportableChange": 0
},
{
- "name": "enhanced color mode",
+ "name": "EnhancedColorMode",
"code": 16385,
"mfgCode": null,
"side": "server",
@@ -13552,7 +13552,7 @@
"reportableChange": 0
},
{
- "name": "color loop active",
+ "name": "ColorLoopActive",
"code": 16386,
"mfgCode": null,
"side": "server",
@@ -13568,7 +13568,7 @@
"reportableChange": 0
},
{
- "name": "color loop direction",
+ "name": "ColorLoopDirection",
"code": 16387,
"mfgCode": null,
"side": "server",
@@ -13584,7 +13584,7 @@
"reportableChange": 0
},
{
- "name": "color loop time",
+ "name": "ColorLoopTime",
"code": 16388,
"mfgCode": null,
"side": "server",
@@ -13600,7 +13600,7 @@
"reportableChange": 0
},
{
- "name": "color loop start enhanced hue",
+ "name": "ColorLoopStartEnhancedHue",
"code": 16389,
"mfgCode": null,
"side": "server",
@@ -13616,7 +13616,7 @@
"reportableChange": 0
},
{
- "name": "color loop stored enhanced hue",
+ "name": "ColorLoopStoredEnhancedHue",
"code": 16390,
"mfgCode": null,
"side": "server",
@@ -13632,7 +13632,7 @@
"reportableChange": 0
},
{
- "name": "color capabilities",
+ "name": "ColorCapabilities",
"code": 16394,
"mfgCode": null,
"side": "server",
@@ -13648,7 +13648,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical min",
+ "name": "ColorTempPhysicalMinMireds",
"code": 16395,
"mfgCode": null,
"side": "server",
@@ -13664,7 +13664,7 @@
"reportableChange": 0
},
{
- "name": "color temp physical max",
+ "name": "ColorTempPhysicalMaxMireds",
"code": 16396,
"mfgCode": null,
"side": "server",
@@ -13680,7 +13680,7 @@
"reportableChange": 0
},
{
- "name": "couple color temp to level min-mireds",
+ "name": "CoupleColorTempToLevelMinMireds",
"code": 16397,
"mfgCode": null,
"side": "server",
@@ -13696,7 +13696,7 @@
"reportableChange": 0
},
{
- "name": "start up color temperature mireds",
+ "name": "StartUpColorTemperatureMireds",
"code": 16400,
"mfgCode": null,
"side": "server",
@@ -19545,5 +19545,6 @@
"endpointVersion": 1,
"deviceIdentifier": 22
}
- ]
+ ],
+ "log": []
}
\ No newline at end of file
diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
index 664c1f275aa523..1d274b75bc886c 100644
--- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
+++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp
@@ -3475,8 +3475,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
cppValue, value);
return value;
}
- case Attributes::ColorControlOptions::Id: {
- using TypeInfo = Attributes::ColorControlOptions::TypeInfo;
+ case Attributes::Options::Id: {
+ using TypeInfo = Attributes::Options::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
@@ -3499,10 +3499,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::Primary1X::Id: {
@@ -3544,10 +3551,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::Primary2X::Id: {
@@ -3589,10 +3603,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::Primary3X::Id: {
@@ -3634,10 +3655,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::Primary4X::Id: {
@@ -3679,10 +3707,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::Primary5X::Id: {
@@ -3724,10 +3759,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::Primary6X::Id: {
@@ -3769,10 +3811,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::WhitePointX::Id: {
@@ -3844,10 +3893,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::ColorPointGX::Id: {
@@ -3889,10 +3945,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::ColorPointBX::Id: {
@@ -3934,10 +3997,17 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
return nullptr;
}
jobject value;
- std::string valueClassName = "java/lang/Integer";
- std::string valueCtorSignature = "(I)V";
- chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
- cppValue, value);
+ if (cppValue.IsNull())
+ {
+ value = nullptr;
+ }
+ else
+ {
+ std::string valueClassName = "java/lang/Integer";
+ std::string valueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(),
+ cppValue.Value(), value);
+ }
return value;
}
case Attributes::EnhancedCurrentHue::Id: {
@@ -4060,8 +4130,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
cppValue, value);
return value;
}
- case Attributes::ColorTempPhysicalMin::Id: {
- using TypeInfo = Attributes::ColorTempPhysicalMin::TypeInfo;
+ case Attributes::ColorTempPhysicalMinMireds::Id: {
+ using TypeInfo = Attributes::ColorTempPhysicalMinMireds::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
@@ -4075,8 +4145,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR
cppValue, value);
return value;
}
- case Attributes::ColorTempPhysicalMax::Id: {
- using TypeInfo = Attributes::ColorTempPhysicalMax::TypeInfo;
+ case Attributes::ColorTempPhysicalMaxMireds::Id: {
+ using TypeInfo = Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = app::DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR)
diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h
index bac62c306e1a24..f243c959269df2 100644
--- a/src/controller/java/zap-generated/CHIPCallbackTypes.h
+++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h
@@ -341,8 +341,8 @@ typedef void (*CHIPColorControlClusterColorTemperatureAttributeCallbackType)(
void *, chip::app::Clusters::ColorControl::Attributes::ColorTemperature::TypeInfo::DecodableArgType);
typedef void (*CHIPColorControlClusterColorModeAttributeCallbackType)(
void *, chip::app::Clusters::ColorControl::Attributes::ColorMode::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorControlOptionsAttributeCallbackType)(
- void *, chip::app::Clusters::ColorControl::Attributes::ColorControlOptions::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterOptionsAttributeCallbackType)(
+ void *, chip::app::Clusters::ColorControl::Attributes::Options::TypeInfo::DecodableArgType);
typedef void (*CHIPColorControlClusterNumberOfPrimariesAttributeCallbackType)(
void *, chip::app::Clusters::ColorControl::Attributes::NumberOfPrimaries::TypeInfo::DecodableArgType);
typedef void (*CHIPColorControlClusterPrimary1XAttributeCallbackType)(
@@ -419,10 +419,10 @@ typedef void (*CHIPColorControlClusterColorLoopStoredEnhancedHueAttributeCallbac
void *, chip::app::Clusters::ColorControl::Attributes::ColorLoopStoredEnhancedHue::TypeInfo::DecodableArgType);
typedef void (*CHIPColorControlClusterColorCapabilitiesAttributeCallbackType)(
void *, chip::app::Clusters::ColorControl::Attributes::ColorCapabilities::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorTempPhysicalMinAttributeCallbackType)(
- void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMin::TypeInfo::DecodableArgType);
-typedef void (*CHIPColorControlClusterColorTempPhysicalMaxAttributeCallbackType)(
- void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMax::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorTempPhysicalMinMiredsAttributeCallbackType)(
+ void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMinMireds::TypeInfo::DecodableArgType);
+typedef void (*CHIPColorControlClusterColorTempPhysicalMaxMiredsAttributeCallbackType)(
+ void *, chip::app::Clusters::ColorControl::Attributes::ColorTempPhysicalMaxMireds::TypeInfo::DecodableArgType);
typedef void (*CHIPColorControlClusterCoupleColorTempToLevelMinMiredsAttributeCallbackType)(
void *, chip::app::Clusters::ColorControl::Attributes::CoupleColorTempToLevelMinMireds::TypeInfo::DecodableArgType);
typedef void (*CHIPColorControlClusterStartUpColorTemperatureMiredsAttributeCallbackType)(
diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
index 47b10edd900346..5325e4851a1d43 100644
--- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
+++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp
@@ -767,12 +767,12 @@ JNI_METHOD(void, BridgedDeviceBasicCluster, writeNodeLabelAttribute)
onFailure.release();
}
-JNI_METHOD(void, ColorControlCluster, writeColorControlOptionsAttribute)
+JNI_METHOD(void, ColorControlCluster, writeOptionsAttribute)
(JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs)
{
chip::DeviceLayer::StackLock lock;
ListFreer listFreer;
- using TypeInfo = chip::app::Clusters::ColorControl::Attributes::ColorControlOptions::TypeInfo;
+ using TypeInfo = chip::app::Clusters::ColorControl::Attributes::Options::TypeInfo;
TypeInfo::Type cppValue;
std::vector> cleanupByteArrays;
@@ -1038,8 +1038,16 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointRIntensityAttribute)
std::vector> cleanupByteArrays;
std::vector> cleanupStrings;
- cppValue =
- static_cast>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+ if (value == nullptr)
+ {
+ cppValue.SetNull();
+ }
+ else
+ {
+ auto & nonNullValue_0 = cppValue.SetNonNull();
+ nonNullValue_0 = static_cast>(
+ chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+ }
std::unique_ptr onSuccess(
Platform::New(callback), Platform::Delete);
@@ -1194,8 +1202,16 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointGIntensityAttribute)
std::vector> cleanupByteArrays;
std::vector> cleanupStrings;
- cppValue =
- static_cast>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+ if (value == nullptr)
+ {
+ cppValue.SetNull();
+ }
+ else
+ {
+ auto & nonNullValue_0 = cppValue.SetNonNull();
+ nonNullValue_0 = static_cast>(
+ chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+ }
std::unique_ptr onSuccess(
Platform::New(callback), Platform::Delete);
@@ -1350,8 +1366,16 @@ JNI_METHOD(void, ColorControlCluster, writeColorPointBIntensityAttribute)
std::vector> cleanupByteArrays;
std::vector> cleanupStrings;
- cppValue =
- static_cast>(chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+ if (value == nullptr)
+ {
+ cppValue.SetNull();
+ }
+ else
+ {
+ auto & nonNullValue_0 = cppValue.SetNonNull();
+ nonNullValue_0 = static_cast>(
+ chip::JniReferences::GetInstance().IntegerToPrimitive(value));
+ }
std::unique_ptr onSuccess(
Platform::New(callback), Platform::Delete);
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
index d76dc23fe21cbe..6a0323a9983c47 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp
@@ -4881,6 +4881,676 @@ void CHIPChannelAttributeListAttributeCallback::CallbackFn(void * context,
env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj);
}
+CHIPColorControlNumberOfPrimariesAttributeCallback::CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlNumberOfPrimariesAttributeCallback::~CHIPColorControlNumberOfPrimariesAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlNumberOfPrimariesAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlPrimary1IntensityAttributeCallback::CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlPrimary1IntensityAttributeCallback::~CHIPColorControlPrimary1IntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlPrimary1IntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlPrimary2IntensityAttributeCallback::CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlPrimary2IntensityAttributeCallback::~CHIPColorControlPrimary2IntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlPrimary2IntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlPrimary3IntensityAttributeCallback::CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlPrimary3IntensityAttributeCallback::~CHIPColorControlPrimary3IntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlPrimary3IntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlPrimary4IntensityAttributeCallback::CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlPrimary4IntensityAttributeCallback::~CHIPColorControlPrimary4IntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlPrimary4IntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlPrimary5IntensityAttributeCallback::CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlPrimary5IntensityAttributeCallback::~CHIPColorControlPrimary5IntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlPrimary5IntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlPrimary6IntensityAttributeCallback::CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlPrimary6IntensityAttributeCallback::~CHIPColorControlPrimary6IntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlPrimary6IntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlColorPointRIntensityAttributeCallback::CHIPColorControlColorPointRIntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlColorPointRIntensityAttributeCallback::~CHIPColorControlColorPointRIntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlColorPointRIntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlColorPointGIntensityAttributeCallback::CHIPColorControlColorPointGIntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlColorPointGIntensityAttributeCallback::~CHIPColorControlColorPointGIntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlColorPointGIntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
+CHIPColorControlColorPointBIntensityAttributeCallback::CHIPColorControlColorPointBIntensityAttributeCallback(jobject javaCallback,
+ bool keepAlive) :
+ chip::Callback::Callback(CallbackFn, this),
+ keepAlive(keepAlive)
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ return;
+ }
+
+ javaCallbackRef = env->NewGlobalRef(javaCallback);
+ if (javaCallbackRef == nullptr)
+ {
+ ChipLogError(Zcl, "Could not create global reference for Java callback");
+ }
+}
+
+CHIPColorControlColorPointBIntensityAttributeCallback::~CHIPColorControlColorPointBIntensityAttributeCallback()
+{
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ if (env == nullptr)
+ {
+ ChipLogError(Zcl, "Could not delete global reference for Java callback");
+ return;
+ }
+ env->DeleteGlobalRef(javaCallbackRef);
+}
+
+void CHIPColorControlColorPointBIntensityAttributeCallback::CallbackFn(void * context,
+ const chip::app::DataModel::Nullable & value)
+{
+ chip::DeviceLayer::StackUnlock unlock;
+ CHIP_ERROR err = CHIP_NO_ERROR;
+ JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread();
+ jobject javaCallbackRef;
+
+ VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env"));
+ std::unique_ptr cppCallback(
+ reinterpret_cast(context), maybeDestroy);
+
+ // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback.
+ javaCallbackRef = cppCallback.get()->javaCallbackRef;
+ VerifyOrReturn(javaCallbackRef != nullptr,
+ ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null"));
+
+ jmethodID javaMethod;
+ err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method"));
+
+ jobject javaValue;
+ if (value.IsNull())
+ {
+ javaValue = nullptr;
+ }
+ else
+ {
+ std::string javaValueClassName = "java/lang/Integer";
+ std::string javaValueCtorSignature = "(I)V";
+ chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(),
+ value.Value(), javaValue);
+ }
+
+ env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue);
+}
+
CHIPColorControlGeneratedCommandListAttributeCallback::CHIPColorControlGeneratedCommandListAttributeCallback(jobject javaCallback,
bool keepAlive) :
chip::Callback::Callback(CallbackFn, this),
diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h
index e8cdd218dde4dc..a4673a8a4f4255 100644
--- a/src/controller/java/zap-generated/CHIPReadCallbacks.h
+++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h
@@ -2022,6 +2022,306 @@ class CHIPChannelAttributeListAttributeCallback
bool keepAlive;
};
+class CHIPColorControlNumberOfPrimariesAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlNumberOfPrimariesAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlNumberOfPrimariesAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlNumberOfPrimariesAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlPrimary1IntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlPrimary1IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlPrimary1IntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlPrimary1IntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlPrimary2IntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlPrimary2IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlPrimary2IntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlPrimary2IntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlPrimary3IntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlPrimary3IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlPrimary3IntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlPrimary3IntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlPrimary4IntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlPrimary4IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlPrimary4IntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlPrimary4IntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlPrimary5IntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlPrimary5IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlPrimary5IntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlPrimary5IntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlPrimary6IntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlPrimary6IntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlPrimary6IntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlPrimary6IntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlColorPointRIntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlColorPointRIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlColorPointRIntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlColorPointRIntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlColorPointGIntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlColorPointGIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlColorPointGIntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlColorPointGIntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
+class CHIPColorControlColorPointBIntensityAttributeCallback
+ : public chip::Callback::Callback
+{
+public:
+ CHIPColorControlColorPointBIntensityAttributeCallback(jobject javaCallback, bool keepAlive = false);
+
+ ~CHIPColorControlColorPointBIntensityAttributeCallback();
+
+ static void maybeDestroy(CHIPColorControlColorPointBIntensityAttributeCallback * callback)
+ {
+ if (!callback->keepAlive)
+ {
+ callback->Cancel();
+ chip::Platform::Delete(callback);
+ }
+ }
+
+ static void CallbackFn(void * context, const chip::app::DataModel::Nullable & value);
+ static void OnSubscriptionEstablished(void * context)
+ {
+ CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished(
+ reinterpret_cast(context)->javaCallbackRef);
+ VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err)));
+ };
+
+private:
+ jobject javaCallbackRef;
+ bool keepAlive;
+};
+
class CHIPColorControlGeneratedCommandListAttributeCallback
: public chip::Callback::Callback
{
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
index 6247145057a8e5..cee1e4255a012d 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java
@@ -3857,8 +3857,8 @@ public void moveColorTemperature(
DefaultClusterCallback callback,
Integer moveMode,
Integer rate,
- Integer colorTemperatureMinimum,
- Integer colorTemperatureMaximum,
+ Integer colorTemperatureMinimumMireds,
+ Integer colorTemperatureMaximumMireds,
Integer optionsMask,
Integer optionsOverride) {
moveColorTemperature(
@@ -3866,8 +3866,8 @@ public void moveColorTemperature(
callback,
moveMode,
rate,
- colorTemperatureMinimum,
- colorTemperatureMaximum,
+ colorTemperatureMinimumMireds,
+ colorTemperatureMaximumMireds,
optionsMask,
optionsOverride,
null);
@@ -3877,8 +3877,8 @@ public void moveColorTemperature(
DefaultClusterCallback callback,
Integer moveMode,
Integer rate,
- Integer colorTemperatureMinimum,
- Integer colorTemperatureMaximum,
+ Integer colorTemperatureMinimumMireds,
+ Integer colorTemperatureMaximumMireds,
Integer optionsMask,
Integer optionsOverride,
int timedInvokeTimeoutMs) {
@@ -3887,8 +3887,8 @@ public void moveColorTemperature(
callback,
moveMode,
rate,
- colorTemperatureMinimum,
- colorTemperatureMaximum,
+ colorTemperatureMinimumMireds,
+ colorTemperatureMaximumMireds,
optionsMask,
optionsOverride,
timedInvokeTimeoutMs);
@@ -4159,8 +4159,8 @@ public void stepColorTemperature(
Integer stepMode,
Integer stepSize,
Integer transitionTime,
- Integer colorTemperatureMinimum,
- Integer colorTemperatureMaximum,
+ Integer colorTemperatureMinimumMireds,
+ Integer colorTemperatureMaximumMireds,
Integer optionsMask,
Integer optionsOverride) {
stepColorTemperature(
@@ -4169,8 +4169,8 @@ public void stepColorTemperature(
stepMode,
stepSize,
transitionTime,
- colorTemperatureMinimum,
- colorTemperatureMaximum,
+ colorTemperatureMinimumMireds,
+ colorTemperatureMaximumMireds,
optionsMask,
optionsOverride,
null);
@@ -4181,8 +4181,8 @@ public void stepColorTemperature(
Integer stepMode,
Integer stepSize,
Integer transitionTime,
- Integer colorTemperatureMinimum,
- Integer colorTemperatureMaximum,
+ Integer colorTemperatureMinimumMireds,
+ Integer colorTemperatureMaximumMireds,
Integer optionsMask,
Integer optionsOverride,
int timedInvokeTimeoutMs) {
@@ -4192,8 +4192,8 @@ public void stepColorTemperature(
stepMode,
stepSize,
transitionTime,
- colorTemperatureMinimum,
- colorTemperatureMaximum,
+ colorTemperatureMinimumMireds,
+ colorTemperatureMaximumMireds,
optionsMask,
optionsOverride,
timedInvokeTimeoutMs);
@@ -4351,8 +4351,8 @@ private native void moveColorTemperature(
DefaultClusterCallback Callback,
Integer moveMode,
Integer rate,
- Integer colorTemperatureMinimum,
- Integer colorTemperatureMaximum,
+ Integer colorTemperatureMinimumMireds,
+ Integer colorTemperatureMaximumMireds,
Integer optionsMask,
Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
@@ -4439,8 +4439,8 @@ private native void stepColorTemperature(
Integer stepMode,
Integer stepSize,
Integer transitionTime,
- Integer colorTemperatureMinimum,
- Integer colorTemperatureMaximum,
+ Integer colorTemperatureMinimumMireds,
+ Integer colorTemperatureMaximumMireds,
Integer optionsMask,
Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
@@ -4472,6 +4472,86 @@ private native void stopMoveStep(
Integer optionsOverride,
@Nullable Integer timedInvokeTimeoutMs);
+ public interface NumberOfPrimariesAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface Primary1IntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface Primary2IntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface Primary3IntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface Primary4IntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface Primary5IntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface Primary6IntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface ColorPointRIntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface ColorPointGIntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
+ public interface ColorPointBIntensityAttributeCallback {
+ void onSuccess(@Nullable Integer value);
+
+ void onError(Exception ex);
+
+ default void onSubscriptionEstablished() {}
+ }
+
public interface GeneratedCommandListAttributeCallback {
void onSuccess(List valueList);
@@ -4577,30 +4657,30 @@ public void subscribeColorModeAttribute(
subscribeColorModeAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readColorControlOptionsAttribute(IntegerAttributeCallback callback) {
- readColorControlOptionsAttribute(chipClusterPtr, callback);
+ public void readOptionsAttribute(IntegerAttributeCallback callback) {
+ readOptionsAttribute(chipClusterPtr, callback);
}
- public void writeColorControlOptionsAttribute(DefaultClusterCallback callback, Integer value) {
- writeColorControlOptionsAttribute(chipClusterPtr, callback, value, null);
+ public void writeOptionsAttribute(DefaultClusterCallback callback, Integer value) {
+ writeOptionsAttribute(chipClusterPtr, callback, value, null);
}
- public void writeColorControlOptionsAttribute(
+ public void writeOptionsAttribute(
DefaultClusterCallback callback, Integer value, int timedWriteTimeoutMs) {
- writeColorControlOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
+ writeOptionsAttribute(chipClusterPtr, callback, value, timedWriteTimeoutMs);
}
- public void subscribeColorControlOptionsAttribute(
+ public void subscribeOptionsAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeColorControlOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ subscribeOptionsAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readNumberOfPrimariesAttribute(IntegerAttributeCallback callback) {
+ public void readNumberOfPrimariesAttribute(NumberOfPrimariesAttributeCallback callback) {
readNumberOfPrimariesAttribute(chipClusterPtr, callback);
}
public void subscribeNumberOfPrimariesAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ NumberOfPrimariesAttributeCallback callback, int minInterval, int maxInterval) {
subscribeNumberOfPrimariesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4622,12 +4702,12 @@ public void subscribePrimary1YAttribute(
subscribePrimary1YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readPrimary1IntensityAttribute(IntegerAttributeCallback callback) {
+ public void readPrimary1IntensityAttribute(Primary1IntensityAttributeCallback callback) {
readPrimary1IntensityAttribute(chipClusterPtr, callback);
}
public void subscribePrimary1IntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ Primary1IntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribePrimary1IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4649,12 +4729,12 @@ public void subscribePrimary2YAttribute(
subscribePrimary2YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readPrimary2IntensityAttribute(IntegerAttributeCallback callback) {
+ public void readPrimary2IntensityAttribute(Primary2IntensityAttributeCallback callback) {
readPrimary2IntensityAttribute(chipClusterPtr, callback);
}
public void subscribePrimary2IntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ Primary2IntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribePrimary2IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4676,12 +4756,12 @@ public void subscribePrimary3YAttribute(
subscribePrimary3YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readPrimary3IntensityAttribute(IntegerAttributeCallback callback) {
+ public void readPrimary3IntensityAttribute(Primary3IntensityAttributeCallback callback) {
readPrimary3IntensityAttribute(chipClusterPtr, callback);
}
public void subscribePrimary3IntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ Primary3IntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribePrimary3IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4703,12 +4783,12 @@ public void subscribePrimary4YAttribute(
subscribePrimary4YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readPrimary4IntensityAttribute(IntegerAttributeCallback callback) {
+ public void readPrimary4IntensityAttribute(Primary4IntensityAttributeCallback callback) {
readPrimary4IntensityAttribute(chipClusterPtr, callback);
}
public void subscribePrimary4IntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ Primary4IntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribePrimary4IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4730,12 +4810,12 @@ public void subscribePrimary5YAttribute(
subscribePrimary5YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readPrimary5IntensityAttribute(IntegerAttributeCallback callback) {
+ public void readPrimary5IntensityAttribute(Primary5IntensityAttributeCallback callback) {
readPrimary5IntensityAttribute(chipClusterPtr, callback);
}
public void subscribePrimary5IntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ Primary5IntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribePrimary5IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4757,12 +4837,12 @@ public void subscribePrimary6YAttribute(
subscribePrimary6YAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readPrimary6IntensityAttribute(IntegerAttributeCallback callback) {
+ public void readPrimary6IntensityAttribute(Primary6IntensityAttributeCallback callback) {
readPrimary6IntensityAttribute(chipClusterPtr, callback);
}
public void subscribePrimary6IntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ Primary6IntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribePrimary6IntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4838,7 +4918,7 @@ public void subscribeColorPointRYAttribute(
subscribeColorPointRYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readColorPointRIntensityAttribute(IntegerAttributeCallback callback) {
+ public void readColorPointRIntensityAttribute(ColorPointRIntensityAttributeCallback callback) {
readColorPointRIntensityAttribute(chipClusterPtr, callback);
}
@@ -4852,7 +4932,7 @@ public void writeColorPointRIntensityAttribute(
}
public void subscribeColorPointRIntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ ColorPointRIntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribeColorPointRIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4892,7 +4972,7 @@ public void subscribeColorPointGYAttribute(
subscribeColorPointGYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readColorPointGIntensityAttribute(IntegerAttributeCallback callback) {
+ public void readColorPointGIntensityAttribute(ColorPointGIntensityAttributeCallback callback) {
readColorPointGIntensityAttribute(chipClusterPtr, callback);
}
@@ -4906,7 +4986,7 @@ public void writeColorPointGIntensityAttribute(
}
public void subscribeColorPointGIntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ ColorPointGIntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribeColorPointGIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -4946,7 +5026,7 @@ public void subscribeColorPointBYAttribute(
subscribeColorPointBYAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readColorPointBIntensityAttribute(IntegerAttributeCallback callback) {
+ public void readColorPointBIntensityAttribute(ColorPointBIntensityAttributeCallback callback) {
readColorPointBIntensityAttribute(chipClusterPtr, callback);
}
@@ -4960,7 +5040,7 @@ public void writeColorPointBIntensityAttribute(
}
public void subscribeColorPointBIntensityAttribute(
- IntegerAttributeCallback callback, int minInterval, int maxInterval) {
+ ColorPointBIntensityAttributeCallback callback, int minInterval, int maxInterval) {
subscribeColorPointBIntensityAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
@@ -5038,22 +5118,24 @@ public void subscribeColorCapabilitiesAttribute(
subscribeColorCapabilitiesAttribute(chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readColorTempPhysicalMinAttribute(IntegerAttributeCallback callback) {
- readColorTempPhysicalMinAttribute(chipClusterPtr, callback);
+ public void readColorTempPhysicalMinMiredsAttribute(IntegerAttributeCallback callback) {
+ readColorTempPhysicalMinMiredsAttribute(chipClusterPtr, callback);
}
- public void subscribeColorTempPhysicalMinAttribute(
+ public void subscribeColorTempPhysicalMinMiredsAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeColorTempPhysicalMinAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ subscribeColorTempPhysicalMinMiredsAttribute(
+ chipClusterPtr, callback, minInterval, maxInterval);
}
- public void readColorTempPhysicalMaxAttribute(IntegerAttributeCallback callback) {
- readColorTempPhysicalMaxAttribute(chipClusterPtr, callback);
+ public void readColorTempPhysicalMaxMiredsAttribute(IntegerAttributeCallback callback) {
+ readColorTempPhysicalMaxMiredsAttribute(chipClusterPtr, callback);
}
- public void subscribeColorTempPhysicalMaxAttribute(
+ public void subscribeColorTempPhysicalMaxMiredsAttribute(
IntegerAttributeCallback callback, int minInterval, int maxInterval) {
- subscribeColorTempPhysicalMaxAttribute(chipClusterPtr, callback, minInterval, maxInterval);
+ subscribeColorTempPhysicalMaxMiredsAttribute(
+ chipClusterPtr, callback, minInterval, maxInterval);
}
public void readCoupleColorTempToLevelMinMiredsAttribute(IntegerAttributeCallback callback) {
@@ -5189,23 +5271,26 @@ private native void readColorModeAttribute(
private native void subscribeColorModeAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
- private native void readColorControlOptionsAttribute(
+ private native void readOptionsAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
- private native void writeColorControlOptionsAttribute(
+ private native void writeOptionsAttribute(
long chipClusterPtr,
DefaultClusterCallback callback,
Integer value,
@Nullable Integer timedWriteTimeoutMs);
- private native void subscribeColorControlOptionsAttribute(
+ private native void subscribeOptionsAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readNumberOfPrimariesAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, NumberOfPrimariesAttributeCallback callback);
private native void subscribeNumberOfPrimariesAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ NumberOfPrimariesAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readPrimary1XAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5220,10 +5305,13 @@ private native void subscribePrimary1YAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readPrimary1IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, Primary1IntensityAttributeCallback callback);
private native void subscribePrimary1IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ Primary1IntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readPrimary2XAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5238,10 +5326,13 @@ private native void subscribePrimary2YAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readPrimary2IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, Primary2IntensityAttributeCallback callback);
private native void subscribePrimary2IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ Primary2IntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readPrimary3XAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5256,10 +5347,13 @@ private native void subscribePrimary3YAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readPrimary3IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, Primary3IntensityAttributeCallback callback);
private native void subscribePrimary3IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ Primary3IntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readPrimary4XAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5274,10 +5368,13 @@ private native void subscribePrimary4YAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readPrimary4IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, Primary4IntensityAttributeCallback callback);
private native void subscribePrimary4IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ Primary4IntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readPrimary5XAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5292,10 +5389,13 @@ private native void subscribePrimary5YAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readPrimary5IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, Primary5IntensityAttributeCallback callback);
private native void subscribePrimary5IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ Primary5IntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readPrimary6XAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5310,10 +5410,13 @@ private native void subscribePrimary6YAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readPrimary6IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, Primary6IntensityAttributeCallback callback);
private native void subscribePrimary6IntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ Primary6IntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readWhitePointXAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5364,7 +5467,7 @@ private native void subscribeColorPointRYAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readColorPointRIntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, ColorPointRIntensityAttributeCallback callback);
private native void writeColorPointRIntensityAttribute(
long chipClusterPtr,
@@ -5373,7 +5476,10 @@ private native void writeColorPointRIntensityAttribute(
@Nullable Integer timedWriteTimeoutMs);
private native void subscribeColorPointRIntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ ColorPointRIntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readColorPointGXAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5400,7 +5506,7 @@ private native void subscribeColorPointGYAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readColorPointGIntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, ColorPointGIntensityAttributeCallback callback);
private native void writeColorPointGIntensityAttribute(
long chipClusterPtr,
@@ -5409,7 +5515,10 @@ private native void writeColorPointGIntensityAttribute(
@Nullable Integer timedWriteTimeoutMs);
private native void subscribeColorPointGIntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ ColorPointGIntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readColorPointBXAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5436,7 +5545,7 @@ private native void subscribeColorPointBYAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readColorPointBIntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback);
+ long chipClusterPtr, ColorPointBIntensityAttributeCallback callback);
private native void writeColorPointBIntensityAttribute(
long chipClusterPtr,
@@ -5445,7 +5554,10 @@ private native void writeColorPointBIntensityAttribute(
@Nullable Integer timedWriteTimeoutMs);
private native void subscribeColorPointBIntensityAttribute(
- long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
+ long chipClusterPtr,
+ ColorPointBIntensityAttributeCallback callback,
+ int minInterval,
+ int maxInterval);
private native void readEnhancedCurrentHueAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
@@ -5495,16 +5607,16 @@ private native void readColorCapabilitiesAttribute(
private native void subscribeColorCapabilitiesAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
- private native void readColorTempPhysicalMinAttribute(
+ private native void readColorTempPhysicalMinMiredsAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
- private native void subscribeColorTempPhysicalMinAttribute(
+ private native void subscribeColorTempPhysicalMinMiredsAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
- private native void readColorTempPhysicalMaxAttribute(
+ private native void readColorTempPhysicalMaxMiredsAttribute(
long chipClusterPtr, IntegerAttributeCallback callback);
- private native void subscribeColorTempPhysicalMaxAttribute(
+ private native void subscribeColorTempPhysicalMaxMiredsAttribute(
long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval);
private native void readCoupleColorTempToLevelMinMiredsAttribute(
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
index 8f22416f2169b2..2a92aacd382922 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java
@@ -716,7 +716,7 @@ public static String attributeIdToName(long clusterId, long attributeId) {
return "ColorMode";
}
if (attributeId == 15L) {
- return "ColorControlOptions";
+ return "Options";
}
if (attributeId == 16L) {
return "NumberOfPrimaries";
@@ -833,10 +833,10 @@ public static String attributeIdToName(long clusterId, long attributeId) {
return "ColorCapabilities";
}
if (attributeId == 16395L) {
- return "ColorTempPhysicalMin";
+ return "ColorTempPhysicalMinMireds";
}
if (attributeId == 16396L) {
- return "ColorTempPhysicalMax";
+ return "ColorTempPhysicalMaxMireds";
}
if (attributeId == 16397L) {
return "CoupleColorTempToLevelMinMireds";
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
index 53e0eaef9f1a01..29a7f3902864bb 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java
@@ -8583,18 +8583,18 @@ public Map> getCommandMap() {
"rate", colorControlmoveColorTemperaturerateCommandParameterInfo);
CommandParameterInfo
- colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameterInfo =
- new CommandParameterInfo("colorTemperatureMinimum", Integer.class);
+ colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
+ new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class);
colorControlmoveColorTemperatureCommandParams.put(
- "colorTemperatureMinimum",
- colorControlmoveColorTemperaturecolorTemperatureMinimumCommandParameterInfo);
+ "colorTemperatureMinimumMireds",
+ colorControlmoveColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
CommandParameterInfo
- colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameterInfo =
- new CommandParameterInfo("colorTemperatureMaximum", Integer.class);
+ colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
+ new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class);
colorControlmoveColorTemperatureCommandParams.put(
- "colorTemperatureMaximum",
- colorControlmoveColorTemperaturecolorTemperatureMaximumCommandParameterInfo);
+ "colorTemperatureMaximumMireds",
+ colorControlmoveColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
CommandParameterInfo colorControlmoveColorTemperatureoptionsMaskCommandParameterInfo =
new CommandParameterInfo("optionsMask", Integer.class);
@@ -8614,8 +8614,8 @@ public Map> getCommandMap() {
(DefaultClusterCallback) callback,
(Integer) commandArguments.get("moveMode"),
(Integer) commandArguments.get("rate"),
- (Integer) commandArguments.get("colorTemperatureMinimum"),
- (Integer) commandArguments.get("colorTemperatureMaximum"),
+ (Integer) commandArguments.get("colorTemperatureMinimumMireds"),
+ (Integer) commandArguments.get("colorTemperatureMaximumMireds"),
(Integer) commandArguments.get("optionsMask"),
(Integer) commandArguments.get("optionsOverride"));
},
@@ -8954,18 +8954,18 @@ public Map> getCommandMap() {
"transitionTime", colorControlstepColorTemperaturetransitionTimeCommandParameterInfo);
CommandParameterInfo
- colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameterInfo =
- new CommandParameterInfo("colorTemperatureMinimum", Integer.class);
+ colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo =
+ new CommandParameterInfo("colorTemperatureMinimumMireds", Integer.class);
colorControlstepColorTemperatureCommandParams.put(
- "colorTemperatureMinimum",
- colorControlstepColorTemperaturecolorTemperatureMinimumCommandParameterInfo);
+ "colorTemperatureMinimumMireds",
+ colorControlstepColorTemperaturecolorTemperatureMinimumMiredsCommandParameterInfo);
CommandParameterInfo
- colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameterInfo =
- new CommandParameterInfo("colorTemperatureMaximum", Integer.class);
+ colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo =
+ new CommandParameterInfo("colorTemperatureMaximumMireds", Integer.class);
colorControlstepColorTemperatureCommandParams.put(
- "colorTemperatureMaximum",
- colorControlstepColorTemperaturecolorTemperatureMaximumCommandParameterInfo);
+ "colorTemperatureMaximumMireds",
+ colorControlstepColorTemperaturecolorTemperatureMaximumMiredsCommandParameterInfo);
CommandParameterInfo colorControlstepColorTemperatureoptionsMaskCommandParameterInfo =
new CommandParameterInfo("optionsMask", Integer.class);
@@ -8986,8 +8986,8 @@ public Map> getCommandMap() {
(Integer) commandArguments.get("stepMode"),
(Integer) commandArguments.get("stepSize"),
(Integer) commandArguments.get("transitionTime"),
- (Integer) commandArguments.get("colorTemperatureMinimum"),
- (Integer) commandArguments.get("colorTemperatureMaximum"),
+ (Integer) commandArguments.get("colorTemperatureMinimumMireds"),
+ (Integer) commandArguments.get("colorTemperatureMaximumMireds"),
(Integer) commandArguments.get("optionsMask"),
(Integer) commandArguments.get("optionsOverride"));
},
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
index 80e98afaee6e1f..255e855811356e 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java
@@ -2027,27 +2027,27 @@ public Map> getReadAttributeMap() {
readColorControlColorModeCommandParams);
readColorControlInteractionInfo.put(
"readColorModeAttribute", readColorControlColorModeAttributeInteractionInfo);
- Map readColorControlColorControlOptionsCommandParams =
+ Map readColorControlOptionsCommandParams =
new LinkedHashMap();
- InteractionInfo readColorControlColorControlOptionsAttributeInteractionInfo =
+ InteractionInfo readColorControlOptionsAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readColorControlOptionsAttribute(
- (ChipClusters.IntegerAttributeCallback) callback);
+ .readOptionsAttribute((ChipClusters.IntegerAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
- readColorControlColorControlOptionsCommandParams);
+ readColorControlOptionsCommandParams);
readColorControlInteractionInfo.put(
- "readColorControlOptionsAttribute",
- readColorControlColorControlOptionsAttributeInteractionInfo);
+ "readOptionsAttribute", readColorControlOptionsAttributeInteractionInfo);
Map readColorControlNumberOfPrimariesCommandParams =
new LinkedHashMap();
InteractionInfo readColorControlNumberOfPrimariesAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readNumberOfPrimariesAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readNumberOfPrimariesAttribute(
+ (ChipClusters.ColorControlCluster.NumberOfPrimariesAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlNumberOfPrimariesCommandParams);
@@ -2084,7 +2084,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readPrimary1IntensityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readPrimary1IntensityAttribute(
+ (ChipClusters.ColorControlCluster.Primary1IntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlPrimary1IntensityCommandParams);
@@ -2121,7 +2123,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readPrimary2IntensityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readPrimary2IntensityAttribute(
+ (ChipClusters.ColorControlCluster.Primary2IntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlPrimary2IntensityCommandParams);
@@ -2158,7 +2162,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readPrimary3IntensityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readPrimary3IntensityAttribute(
+ (ChipClusters.ColorControlCluster.Primary3IntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlPrimary3IntensityCommandParams);
@@ -2195,7 +2201,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readPrimary4IntensityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readPrimary4IntensityAttribute(
+ (ChipClusters.ColorControlCluster.Primary4IntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlPrimary4IntensityCommandParams);
@@ -2232,7 +2240,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readPrimary5IntensityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readPrimary5IntensityAttribute(
+ (ChipClusters.ColorControlCluster.Primary5IntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlPrimary5IntensityCommandParams);
@@ -2269,7 +2279,9 @@ public Map> getReadAttributeMap() {
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readPrimary6IntensityAttribute((ChipClusters.IntegerAttributeCallback) callback);
+ .readPrimary6IntensityAttribute(
+ (ChipClusters.ColorControlCluster.Primary6IntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlPrimary6IntensityCommandParams);
@@ -2331,7 +2343,8 @@ public Map> getReadAttributeMap() {
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
.readColorPointRIntensityAttribute(
- (ChipClusters.IntegerAttributeCallback) callback);
+ (ChipClusters.ColorControlCluster.ColorPointRIntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlColorPointRIntensityCommandParams);
@@ -2369,7 +2382,8 @@ public Map> getReadAttributeMap() {
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
.readColorPointGIntensityAttribute(
- (ChipClusters.IntegerAttributeCallback) callback);
+ (ChipClusters.ColorControlCluster.ColorPointGIntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlColorPointGIntensityCommandParams);
@@ -2407,7 +2421,8 @@ public Map> getReadAttributeMap() {
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
.readColorPointBIntensityAttribute(
- (ChipClusters.IntegerAttributeCallback) callback);
+ (ChipClusters.ColorControlCluster.ColorPointBIntensityAttributeCallback)
+ callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
readColorControlColorPointBIntensityCommandParams);
@@ -2520,34 +2535,34 @@ public Map> getReadAttributeMap() {
readColorControlInteractionInfo.put(
"readColorCapabilitiesAttribute",
readColorControlColorCapabilitiesAttributeInteractionInfo);
- Map readColorControlColorTempPhysicalMinCommandParams =
+ Map readColorControlColorTempPhysicalMinMiredsCommandParams =
new LinkedHashMap();
- InteractionInfo readColorControlColorTempPhysicalMinAttributeInteractionInfo =
+ InteractionInfo readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readColorTempPhysicalMinAttribute(
+ .readColorTempPhysicalMinMiredsAttribute(
(ChipClusters.IntegerAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
- readColorControlColorTempPhysicalMinCommandParams);
+ readColorControlColorTempPhysicalMinMiredsCommandParams);
readColorControlInteractionInfo.put(
- "readColorTempPhysicalMinAttribute",
- readColorControlColorTempPhysicalMinAttributeInteractionInfo);
- Map readColorControlColorTempPhysicalMaxCommandParams =
+ "readColorTempPhysicalMinMiredsAttribute",
+ readColorControlColorTempPhysicalMinMiredsAttributeInteractionInfo);
+ Map readColorControlColorTempPhysicalMaxMiredsCommandParams =
new LinkedHashMap();
- InteractionInfo readColorControlColorTempPhysicalMaxAttributeInteractionInfo =
+ InteractionInfo readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .readColorTempPhysicalMaxAttribute(
+ .readColorTempPhysicalMaxMiredsAttribute(
(ChipClusters.IntegerAttributeCallback) callback);
},
() -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(),
- readColorControlColorTempPhysicalMaxCommandParams);
+ readColorControlColorTempPhysicalMaxMiredsCommandParams);
readColorControlInteractionInfo.put(
- "readColorTempPhysicalMaxAttribute",
- readColorControlColorTempPhysicalMaxAttributeInteractionInfo);
+ "readColorTempPhysicalMaxMiredsAttribute",
+ readColorControlColorTempPhysicalMaxMiredsAttributeInteractionInfo);
Map readColorControlCoupleColorTempToLevelMinMiredsCommandParams =
new LinkedHashMap();
InteractionInfo readColorControlCoupleColorTempToLevelMinMiredsAttributeInteractionInfo =
diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
index d3fd4d372b76f2..db8990475c3d9c 100644
--- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
+++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterWriteMapping.java
@@ -160,24 +160,22 @@ public Map> getWriteAttributeMap() {
Map writeChannelInteractionInfo = new LinkedHashMap<>();
writeAttributeMap.put("channel", writeChannelInteractionInfo);
Map writeColorControlInteractionInfo = new LinkedHashMap<>();
- Map writeColorControlColorControlOptionsCommandParams =
+ Map writeColorControlOptionsCommandParams =
new LinkedHashMap();
- CommandParameterInfo colorControlcolorControlOptionsCommandParameterInfo =
+ CommandParameterInfo colorControloptionsCommandParameterInfo =
new CommandParameterInfo("value", Integer.class);
- writeColorControlColorControlOptionsCommandParams.put(
- "value", colorControlcolorControlOptionsCommandParameterInfo);
- InteractionInfo writeColorControlColorControlOptionsAttributeInteractionInfo =
+ writeColorControlOptionsCommandParams.put("value", colorControloptionsCommandParameterInfo);
+ InteractionInfo writeColorControlOptionsAttributeInteractionInfo =
new InteractionInfo(
(cluster, callback, commandArguments) -> {
((ChipClusters.ColorControlCluster) cluster)
- .writeColorControlOptionsAttribute(
+ .writeOptionsAttribute(
(DefaultClusterCallback) callback, (Integer) commandArguments.get("value"));
},
() -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(),
- writeColorControlColorControlOptionsCommandParams);
+ writeColorControlOptionsCommandParams);
writeColorControlInteractionInfo.put(
- "writeColorControlOptionsAttribute",
- writeColorControlColorControlOptionsAttributeInteractionInfo);
+ "writeOptionsAttribute", writeColorControlOptionsAttributeInteractionInfo);
Map writeColorControlWhitePointXCommandParams =
new LinkedHashMap();
CommandParameterInfo colorControlwhitePointXCommandParameterInfo =
diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py
index 02ec693fe7ae62..d13f889796e7ff 100644
--- a/src/controller/python/chip/clusters/CHIPClusters.py
+++ b/src/controller/python/chip/clusters/CHIPClusters.py
@@ -1288,8 +1288,8 @@ class ChipClusters:
"args": {
"moveMode": "int",
"rate": "int",
- "colorTemperatureMinimum": "int",
- "colorTemperatureMaximum": "int",
+ "colorTemperatureMinimumMireds": "int",
+ "colorTemperatureMaximumMireds": "int",
"optionsMask": "int",
"optionsOverride": "int",
},
@@ -1385,8 +1385,8 @@ class ChipClusters:
"stepMode": "int",
"stepSize": "int",
"transitionTime": "int",
- "colorTemperatureMinimum": "int",
- "colorTemperatureMaximum": "int",
+ "colorTemperatureMinimumMireds": "int",
+ "colorTemperatureMaximumMireds": "int",
"optionsMask": "int",
"optionsOverride": "int",
},
@@ -1478,7 +1478,7 @@ class ChipClusters:
"reportable": True,
},
0x0000000F: {
- "attributeName": "ColorControlOptions",
+ "attributeName": "Options",
"attributeId": 0x0000000F,
"type": "int",
"reportable": True,
@@ -1724,13 +1724,13 @@ class ChipClusters:
"reportable": True,
},
0x0000400B: {
- "attributeName": "ColorTempPhysicalMin",
+ "attributeName": "ColorTempPhysicalMinMireds",
"attributeId": 0x0000400B,
"type": "int",
"reportable": True,
},
0x0000400C: {
- "attributeName": "ColorTempPhysicalMax",
+ "attributeName": "ColorTempPhysicalMaxMireds",
"attributeId": 0x0000400C,
"type": "int",
"reportable": True,
diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py
index 2706ef59c39334..706f194ae0b808 100644
--- a/src/controller/python/chip/clusters/Objects.py
+++ b/src/controller/python/chip/clusters/Objects.py
@@ -22023,53 +22023,53 @@ def descriptor(cls) -> ClusterObjectDescriptor:
ClusterObjectFieldDescriptor(Label="currentHue", Tag=0x00000000, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="currentSaturation", Tag=0x00000001, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="remainingTime", Tag=0x00000002, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="currentX", Tag=0x00000003, Type=uint),
- ClusterObjectFieldDescriptor(Label="currentY", Tag=0x00000004, Type=uint),
+ ClusterObjectFieldDescriptor(Label="currentX", Tag=0x00000003, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="currentY", Tag=0x00000004, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="driftCompensation", Tag=0x00000005, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="compensationText", Tag=0x00000006, Type=typing.Optional[str]),
ClusterObjectFieldDescriptor(Label="colorTemperature", Tag=0x00000007, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorMode", Tag=0x00000008, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorControlOptions", Tag=0x0000000F, Type=uint),
- ClusterObjectFieldDescriptor(Label="numberOfPrimaries", Tag=0x00000010, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="colorMode", Tag=0x00000008, Type=uint),
+ ClusterObjectFieldDescriptor(Label="options", Tag=0x0000000F, Type=uint),
+ ClusterObjectFieldDescriptor(Label="numberOfPrimaries", Tag=0x00000010, Type=typing.Union[Nullable, uint]),
ClusterObjectFieldDescriptor(Label="primary1X", Tag=0x00000011, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="primary1Y", Tag=0x00000012, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="primary1Intensity", Tag=0x00000013, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="primary1Intensity", Tag=0x00000013, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="primary2X", Tag=0x00000015, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="primary2Y", Tag=0x00000016, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="primary2Intensity", Tag=0x00000017, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="primary2Intensity", Tag=0x00000017, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="primary3X", Tag=0x00000019, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="primary3Y", Tag=0x0000001A, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="primary3Intensity", Tag=0x0000001B, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="primary3Intensity", Tag=0x0000001B, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="primary4X", Tag=0x00000020, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="primary4Y", Tag=0x00000021, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="primary4Intensity", Tag=0x00000022, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="primary4Intensity", Tag=0x00000022, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="primary5X", Tag=0x00000024, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="primary5Y", Tag=0x00000025, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="primary5Intensity", Tag=0x00000026, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="primary5Intensity", Tag=0x00000026, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="primary6X", Tag=0x00000028, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="primary6Y", Tag=0x00000029, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="primary6Intensity", Tag=0x0000002A, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="primary6Intensity", Tag=0x0000002A, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="whitePointX", Tag=0x00000030, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="whitePointY", Tag=0x00000031, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorPointRX", Tag=0x00000032, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorPointRY", Tag=0x00000033, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorPointRIntensity", Tag=0x00000034, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="colorPointRIntensity", Tag=0x00000034, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="colorPointGX", Tag=0x00000036, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorPointGY", Tag=0x00000037, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorPointGIntensity", Tag=0x00000038, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="colorPointGIntensity", Tag=0x00000038, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="colorPointBX", Tag=0x0000003A, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorPointBY", Tag=0x0000003B, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorPointBIntensity", Tag=0x0000003C, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="colorPointBIntensity", Tag=0x0000003C, Type=typing.Union[None, Nullable, uint]),
ClusterObjectFieldDescriptor(Label="enhancedCurrentHue", Tag=0x00004000, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="enhancedColorMode", Tag=0x00004001, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="enhancedColorMode", Tag=0x00004001, Type=uint),
ClusterObjectFieldDescriptor(Label="colorLoopActive", Tag=0x00004002, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorLoopDirection", Tag=0x00004003, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorLoopTime", Tag=0x00004004, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorLoopStartEnhancedHue", Tag=0x00004005, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="colorLoopStoredEnhancedHue", Tag=0x00004006, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorCapabilities", Tag=0x0000400A, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorTempPhysicalMin", Tag=0x0000400B, Type=typing.Optional[uint]),
- ClusterObjectFieldDescriptor(Label="colorTempPhysicalMax", Tag=0x0000400C, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="colorCapabilities", Tag=0x0000400A, Type=uint),
+ ClusterObjectFieldDescriptor(Label="colorTempPhysicalMinMireds", Tag=0x0000400B, Type=typing.Optional[uint]),
+ ClusterObjectFieldDescriptor(Label="colorTempPhysicalMaxMireds", Tag=0x0000400C, Type=typing.Optional[uint]),
ClusterObjectFieldDescriptor(Label="coupleColorTempToLevelMinMireds", Tag=0x0000400D, Type=uint),
ClusterObjectFieldDescriptor(Label="startUpColorTemperatureMireds", Tag=0x00004010, Type=uint),
ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]),
@@ -22082,53 +22082,53 @@ def descriptor(cls) -> ClusterObjectDescriptor:
currentHue: 'typing.Optional[uint]' = None
currentSaturation: 'typing.Optional[uint]' = None
remainingTime: 'typing.Optional[uint]' = None
- currentX: 'uint' = None
- currentY: 'uint' = None
+ currentX: 'typing.Optional[uint]' = None
+ currentY: 'typing.Optional[uint]' = None
driftCompensation: 'typing.Optional[uint]' = None
compensationText: 'typing.Optional[str]' = None
colorTemperature: 'typing.Optional[uint]' = None
- colorMode: 'typing.Optional[uint]' = None
- colorControlOptions: 'uint' = None
- numberOfPrimaries: 'typing.Optional[uint]' = None
+ colorMode: 'uint' = None
+ options: 'uint' = None
+ numberOfPrimaries: 'typing.Union[Nullable, uint]' = None
primary1X: 'typing.Optional[uint]' = None
primary1Y: 'typing.Optional[uint]' = None
- primary1Intensity: 'typing.Optional[uint]' = None
+ primary1Intensity: 'typing.Union[None, Nullable, uint]' = None
primary2X: 'typing.Optional[uint]' = None
primary2Y: 'typing.Optional[uint]' = None
- primary2Intensity: 'typing.Optional[uint]' = None
+ primary2Intensity: 'typing.Union[None, Nullable, uint]' = None
primary3X: 'typing.Optional[uint]' = None
primary3Y: 'typing.Optional[uint]' = None
- primary3Intensity: 'typing.Optional[uint]' = None
+ primary3Intensity: 'typing.Union[None, Nullable, uint]' = None
primary4X: 'typing.Optional[uint]' = None
primary4Y: 'typing.Optional[uint]' = None
- primary4Intensity: 'typing.Optional[uint]' = None
+ primary4Intensity: 'typing.Union[None, Nullable, uint]' = None
primary5X: 'typing.Optional[uint]' = None
primary5Y: 'typing.Optional[uint]' = None
- primary5Intensity: 'typing.Optional[uint]' = None
+ primary5Intensity: 'typing.Union[None, Nullable, uint]' = None
primary6X: 'typing.Optional[uint]' = None
primary6Y: 'typing.Optional[uint]' = None
- primary6Intensity: 'typing.Optional[uint]' = None
+ primary6Intensity: 'typing.Union[None, Nullable, uint]' = None
whitePointX: 'typing.Optional[uint]' = None
whitePointY: 'typing.Optional[uint]' = None
colorPointRX: 'typing.Optional[uint]' = None
colorPointRY: 'typing.Optional[uint]' = None
- colorPointRIntensity: 'typing.Optional[uint]' = None
+ colorPointRIntensity: 'typing.Union[None, Nullable, uint]' = None
colorPointGX: 'typing.Optional[uint]' = None
colorPointGY: 'typing.Optional[uint]' = None
- colorPointGIntensity: 'typing.Optional[uint]' = None
+ colorPointGIntensity: 'typing.Union[None, Nullable, uint]' = None
colorPointBX: 'typing.Optional[uint]' = None
colorPointBY: 'typing.Optional[uint]' = None
- colorPointBIntensity: 'typing.Optional[uint]' = None
+ colorPointBIntensity: 'typing.Union[None, Nullable, uint]' = None
enhancedCurrentHue: 'typing.Optional[uint]' = None
- enhancedColorMode: 'typing.Optional[uint]' = None
+ enhancedColorMode: 'uint' = None
colorLoopActive: 'typing.Optional[uint]' = None
colorLoopDirection: 'typing.Optional[uint]' = None
colorLoopTime: 'typing.Optional[uint]' = None
colorLoopStartEnhancedHue: 'typing.Optional[uint]' = None
colorLoopStoredEnhancedHue: 'typing.Optional[uint]' = None
- colorCapabilities: 'typing.Optional[uint]' = None
- colorTempPhysicalMin: 'typing.Optional[uint]' = None
- colorTempPhysicalMax: 'typing.Optional[uint]' = None
+ colorCapabilities: 'uint' = None
+ colorTempPhysicalMinMireds: 'typing.Optional[uint]' = None
+ colorTempPhysicalMaxMireds: 'typing.Optional[uint]' = None
coupleColorTempToLevelMinMireds: 'uint' = None
startUpColorTemperatureMireds: 'uint' = None
generatedCommandList: 'typing.List[uint]' = None
@@ -22568,16 +22568,16 @@ def descriptor(cls) -> ClusterObjectDescriptor:
Fields = [
ClusterObjectFieldDescriptor(Label="moveMode", Tag=0, Type=ColorControl.Enums.HueMoveMode),
ClusterObjectFieldDescriptor(Label="rate", Tag=1, Type=uint),
- ClusterObjectFieldDescriptor(Label="colorTemperatureMinimum", Tag=2, Type=uint),
- ClusterObjectFieldDescriptor(Label="colorTemperatureMaximum", Tag=3, Type=uint),
+ ClusterObjectFieldDescriptor(Label="colorTemperatureMinimumMireds", Tag=2, Type=uint),
+ ClusterObjectFieldDescriptor(Label="colorTemperatureMaximumMireds", Tag=3, Type=uint),
ClusterObjectFieldDescriptor(Label="optionsMask", Tag=4, Type=uint),
ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=5, Type=uint),
])
moveMode: 'ColorControl.Enums.HueMoveMode' = 0
rate: 'uint' = 0
- colorTemperatureMinimum: 'uint' = 0
- colorTemperatureMaximum: 'uint' = 0
+ colorTemperatureMinimumMireds: 'uint' = 0
+ colorTemperatureMaximumMireds: 'uint' = 0
optionsMask: 'uint' = 0
optionsOverride: 'uint' = 0
@@ -22594,8 +22594,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
ClusterObjectFieldDescriptor(Label="stepMode", Tag=0, Type=ColorControl.Enums.HueStepMode),
ClusterObjectFieldDescriptor(Label="stepSize", Tag=1, Type=uint),
ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=uint),
- ClusterObjectFieldDescriptor(Label="colorTemperatureMinimum", Tag=3, Type=uint),
- ClusterObjectFieldDescriptor(Label="colorTemperatureMaximum", Tag=4, Type=uint),
+ ClusterObjectFieldDescriptor(Label="colorTemperatureMinimumMireds", Tag=3, Type=uint),
+ ClusterObjectFieldDescriptor(Label="colorTemperatureMaximumMireds", Tag=4, Type=uint),
ClusterObjectFieldDescriptor(Label="optionsMask", Tag=5, Type=uint),
ClusterObjectFieldDescriptor(Label="optionsOverride", Tag=6, Type=uint),
])
@@ -22603,8 +22603,8 @@ def descriptor(cls) -> ClusterObjectDescriptor:
stepMode: 'ColorControl.Enums.HueStepMode' = 0
stepSize: 'uint' = 0
transitionTime: 'uint' = 0
- colorTemperatureMinimum: 'uint' = 0
- colorTemperatureMaximum: 'uint' = 0
+ colorTemperatureMinimumMireds: 'uint' = 0
+ colorTemperatureMaximumMireds: 'uint' = 0
optionsMask: 'uint' = 0
optionsOverride: 'uint' = 0
@@ -22670,9 +22670,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=uint)
+ return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
- value: 'uint' = 0
+ value: 'typing.Optional[uint]' = None
@dataclass
class CurrentY(ClusterAttributeDescriptor):
@@ -22686,9 +22686,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=uint)
+ return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
- value: 'uint' = 0
+ value: 'typing.Optional[uint]' = None
@dataclass
class DriftCompensation(ClusterAttributeDescriptor):
@@ -22750,12 +22750,12 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=uint)
- value: 'typing.Optional[uint]' = None
+ value: 'uint' = 0
@dataclass
- class ColorControlOptions(ClusterAttributeDescriptor):
+ class Options(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0300
@@ -22782,9 +22782,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[Nullable, uint]' = NullValue
@dataclass
class Primary1X(ClusterAttributeDescriptor):
@@ -22830,9 +22830,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class Primary2X(ClusterAttributeDescriptor):
@@ -22878,9 +22878,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class Primary3X(ClusterAttributeDescriptor):
@@ -22926,9 +22926,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class Primary4X(ClusterAttributeDescriptor):
@@ -22974,9 +22974,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class Primary5X(ClusterAttributeDescriptor):
@@ -23022,9 +23022,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class Primary6X(ClusterAttributeDescriptor):
@@ -23070,9 +23070,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class WhitePointX(ClusterAttributeDescriptor):
@@ -23150,9 +23150,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class ColorPointGX(ClusterAttributeDescriptor):
@@ -23198,9 +23198,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class ColorPointBX(ClusterAttributeDescriptor):
@@ -23246,9 +23246,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint])
- value: 'typing.Optional[uint]' = None
+ value: 'typing.Union[None, Nullable, uint]' = None
@dataclass
class EnhancedCurrentHue(ClusterAttributeDescriptor):
@@ -23278,9 +23278,9 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=uint)
- value: 'typing.Optional[uint]' = None
+ value: 'uint' = 0
@dataclass
class ColorLoopActive(ClusterAttributeDescriptor):
@@ -23374,12 +23374,12 @@ def attribute_id(cls) -> int:
@ChipUtility.classproperty
def attribute_type(cls) -> ClusterObjectFieldDescriptor:
- return ClusterObjectFieldDescriptor(Type=typing.Optional[uint])
+ return ClusterObjectFieldDescriptor(Type=uint)
- value: 'typing.Optional[uint]' = None
+ value: 'uint' = 0
@dataclass
- class ColorTempPhysicalMin(ClusterAttributeDescriptor):
+ class ColorTempPhysicalMinMireds(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0300
@@ -23395,7 +23395,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor:
value: 'typing.Optional[uint]' = None
@dataclass
- class ColorTempPhysicalMax(ClusterAttributeDescriptor):
+ class ColorTempPhysicalMaxMireds(ClusterAttributeDescriptor):
@ChipUtility.classproperty
def cluster_id(cls) -> int:
return 0x0300
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
index c100aa9e145db7..71425a9e1c4b9d 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPAttributeTLVValueDecoder.mm
@@ -2906,8 +2906,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
value = [NSNumber numberWithUnsignedChar:cppValue];
return value;
}
- case Attributes::ColorControlOptions::Id: {
- using TypeInfo = Attributes::ColorControlOptions::TypeInfo;
+ case Attributes::Options::Id: {
+ using TypeInfo = Attributes::Options::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
@@ -2924,8 +2924,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::Primary1X::Id: {
@@ -2957,8 +2961,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::Primary2X::Id: {
@@ -2990,8 +2998,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::Primary3X::Id: {
@@ -3023,8 +3035,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::Primary4X::Id: {
@@ -3056,8 +3072,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::Primary5X::Id: {
@@ -3089,8 +3109,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::Primary6X::Id: {
@@ -3122,8 +3146,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::WhitePointX::Id: {
@@ -3177,8 +3205,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::ColorPointGX::Id: {
@@ -3210,8 +3242,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::ColorPointBX::Id: {
@@ -3243,8 +3279,12 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
if (*aError != CHIP_NO_ERROR) {
return nil;
}
- NSNumber * _Nonnull value;
- value = [NSNumber numberWithUnsignedChar:cppValue];
+ NSNumber * _Nullable value;
+ if (cppValue.IsNull()) {
+ value = nil;
+ } else {
+ value = [NSNumber numberWithUnsignedChar:cppValue.Value()];
+ }
return value;
}
case Attributes::EnhancedCurrentHue::Id: {
@@ -3335,8 +3375,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
value = [NSNumber numberWithUnsignedShort:cppValue];
return value;
}
- case Attributes::ColorTempPhysicalMin::Id: {
- using TypeInfo = Attributes::ColorTempPhysicalMin::TypeInfo;
+ case Attributes::ColorTempPhysicalMinMireds::Id: {
+ using TypeInfo = Attributes::ColorTempPhysicalMinMireds::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
@@ -3346,8 +3386,8 @@ id CHIPDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader
value = [NSNumber numberWithUnsignedShort:cppValue];
return value;
}
- case Attributes::ColorTempPhysicalMax::Id: {
- using TypeInfo = Attributes::ColorTempPhysicalMax::TypeInfo;
+ case Attributes::ColorTempPhysicalMaxMireds::Id: {
+ using TypeInfo = Attributes::ColorTempPhysicalMaxMireds::TypeInfo;
TypeInfo::DecodableType cppValue;
*aError = DataModel::Decode(aReader, cppValue);
if (*aError != CHIP_NO_ERROR) {
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
index 93c45f4a1e602f..bb94e9a4641589 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h
@@ -3203,28 +3203,25 @@ NS_ASSUME_NONNULL_BEGIN
queue:(dispatch_queue_t)queue
completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)readAttributeColorControlOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorControlOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorControlOptionsWithValue:(NSNumber * _Nonnull)value
- params:(CHIPWriteParams * _Nullable)params
- completionHandler:(StatusCompletion)completionHandler;
+- (void)readAttributeOptionsWithCompletionHandler:(void (^)(
+ NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler;
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
+ params:(CHIPWriteParams * _Nullable)params
+ completionHandler:(StatusCompletion)completionHandler;
/**
* This API does not support setting autoResubscribe to NO in the
* CHIPSubscribeParams.
*/
-- (void)subscribeAttributeColorControlOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(CHIPSubscribeParams * _Nullable)params
- subscriptionEstablished:
- (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorControlOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(CHIPSubscribeParams * _Nullable)params
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
++ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
- (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler;
@@ -3632,9 +3629,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)readAttributeColorPointRIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeColorPointRIntensityWithValue:(NSNumber * _Nullable)value
params:(CHIPWriteParams * _Nullable)params
completionHandler:(StatusCompletion)completionHandler;
/**
@@ -3700,9 +3697,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)readAttributeColorPointGIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeColorPointGIntensityWithValue:(NSNumber * _Nullable)value
params:(CHIPWriteParams * _Nullable)params
completionHandler:(StatusCompletion)completionHandler;
/**
@@ -3768,9 +3765,9 @@ NS_ASSUME_NONNULL_BEGIN
- (void)readAttributeColorPointBIntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler;
-- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
completionHandler:(StatusCompletion)completionHandler;
-- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nonnull)value
+- (void)writeAttributeColorPointBIntensityWithValue:(NSNumber * _Nullable)value
params:(CHIPWriteParams * _Nullable)params
completionHandler:(StatusCompletion)completionHandler;
/**
@@ -3936,43 +3933,43 @@ NS_ASSUME_NONNULL_BEGIN
completionHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
-- (void)readAttributeColorTempPhysicalMinWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))completionHandler;
+- (void)readAttributeColorTempPhysicalMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))completionHandler;
/**
* This API does not support setting autoResubscribe to NO in the
* CHIPSubscribeParams.
*/
-- (void)subscribeAttributeColorTempPhysicalMinWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(CHIPSubscribeParams * _Nullable)params
- subscriptionEstablished:
- (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorTempPhysicalMinWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorTempPhysicalMinMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(CHIPSubscribeParams * _Nullable)params
+ subscriptionEstablished:
+ (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorTempPhysicalMinMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))completionHandler;
-- (void)readAttributeColorTempPhysicalMaxWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))completionHandler;
+- (void)readAttributeColorTempPhysicalMaxMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))completionHandler;
/**
* This API does not support setting autoResubscribe to NO in the
* CHIPSubscribeParams.
*/
-- (void)subscribeAttributeColorTempPhysicalMaxWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(CHIPSubscribeParams * _Nullable)params
- subscriptionEstablished:
- (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler;
-+ (void)readAttributeColorTempPhysicalMaxWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler;
+- (void)subscribeAttributeColorTempPhysicalMaxMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(CHIPSubscribeParams * _Nullable)params
+ subscriptionEstablished:
+ (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))reportHandler;
++ (void)readAttributeColorTempPhysicalMaxMiredsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:(void (^)(NSNumber * _Nullable value,
+ NSError * _Nullable error))completionHandler;
- (void)readAttributeCoupleColorTempToLevelMinMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler;
diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
index bd9a597b6091b6..3e02cba7ca2617 100644
--- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
+++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm
@@ -11791,8 +11791,8 @@ - (void)moveColorTemperatureWithParams:(CHIPColorControlClusterMoveColorTemperat
}
request.moveMode = static_cast>(params.moveMode.unsignedCharValue);
request.rate = params.rate.unsignedShortValue;
- request.colorTemperatureMinimum = params.colorTemperatureMinimum.unsignedShortValue;
- request.colorTemperatureMaximum = params.colorTemperatureMaximum.unsignedShortValue;
+ request.colorTemperatureMinimumMireds = params.colorTemperatureMinimumMireds.unsignedShortValue;
+ request.colorTemperatureMaximumMireds = params.colorTemperatureMaximumMireds.unsignedShortValue;
request.optionsMask = params.optionsMask.unsignedCharValue;
request.optionsOverride = params.optionsOverride.unsignedCharValue;
@@ -11823,8 +11823,8 @@ - (void)stepColorTemperatureWithParams:(CHIPColorControlClusterStepColorTemperat
request.stepMode = static_cast>(params.stepMode.unsignedCharValue);
request.stepSize = params.stepSize.unsignedShortValue;
request.transitionTime = params.transitionTime.unsignedShortValue;
- request.colorTemperatureMinimum = params.colorTemperatureMinimum.unsignedShortValue;
- request.colorTemperatureMaximum = params.colorTemperatureMaximum.unsignedShortValue;
+ request.colorTemperatureMinimumMireds = params.colorTemperatureMinimumMireds.unsignedShortValue;
+ request.colorTemperatureMaximumMireds = params.colorTemperatureMaximumMireds.unsignedShortValue;
request.optionsMask = params.optionsMask.unsignedCharValue;
request.optionsOverride = params.optionsOverride.unsignedCharValue;
@@ -12391,24 +12391,23 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
});
}
-- (void)readAttributeColorControlOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
- NSError * _Nullable error))completionHandler
+- (void)readAttributeOptionsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::ColorControlOptions::TypeInfo;
+ using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
});
}
-- (void)writeAttributeColorControlOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value completionHandler:(StatusCompletion)completionHandler
{
- [self writeAttributeColorControlOptionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
+ [self writeAttributeOptionsWithValue:(NSNumber * _Nonnull) value params:nil completionHandler:completionHandler];
}
-- (void)writeAttributeColorControlOptionsWithValue:(NSNumber * _Nonnull)value
- params:(CHIPWriteParams * _Nullable)params
- completionHandler:(StatusCompletion)completionHandler
+- (void)writeAttributeOptionsWithValue:(NSNumber * _Nonnull)value
+ params:(CHIPWriteParams * _Nullable)params
+ completionHandler:(StatusCompletion)completionHandler
{
chip::Optional timedWriteTimeoutMs;
if (params != nil) {
@@ -12424,7 +12423,7 @@ new CHIPDefaultSuccessCallbackBridge(
},
^(Cancelable * success, Cancelable * failure) {
ListFreer listFreer;
- using TypeInfo = ColorControl::Attributes::ColorControlOptions::TypeInfo;
+ using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
TypeInfo::Type cppValue;
cppValue = value.unsignedCharValue;
auto successFn = Callback::FromCancelable(success);
@@ -12434,13 +12433,11 @@ new CHIPDefaultSuccessCallbackBridge(
});
}
-- (void)subscribeAttributeColorControlOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
- maxInterval:(NSNumber * _Nonnull)maxInterval
- params:(CHIPSubscribeParams * _Nullable)params
- subscriptionEstablished:
- (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
- reportHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
+- (void)subscribeAttributeOptionsWithMinInterval:(NSNumber * _Nonnull)minInterval
+ maxInterval:(NSNumber * _Nonnull)maxInterval
+ params:(CHIPSubscribeParams * _Nullable)params
+ subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler
+ reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
new CHIPInt8uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
@@ -12449,7 +12446,7 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
// We don't support disabling auto-resubscribe.
return CHIP_ERROR_INVALID_ARGUMENT;
}
- using TypeInfo = ColorControl::Attributes::ColorControlOptions::TypeInfo;
+ using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
@@ -12461,16 +12458,15 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
subscriptionEstablishedHandler);
}
-+ (void)readAttributeColorControlOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
- endpoint:(NSNumber *)endpoint
- queue:(dispatch_queue_t)queue
- completionHandler:
- (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
++ (void)readAttributeOptionsWithAttributeCache:(CHIPAttributeCacheContainer *)attributeCacheContainer
+ endpoint:(NSNumber *)endpoint
+ queue:(dispatch_queue_t)queue
+ completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
- using TypeInfo = ColorControl::Attributes::ColorControlOptions::TypeInfo;
+ using TypeInfo = ColorControl::Attributes::Options::TypeInfo;
path.mEndpointId = static_cast([endpoint unsignedShortValue]);
path.mClusterId = TypeInfo::GetClusterId();
path.mAttributeId = TypeInfo::GetAttributeId();
@@ -12489,12 +12485,13 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
- (void)readAttributeNumberOfPrimariesWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback::FromCancelable(failure);
- return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
- });
+ new CHIPNullableInt8uAttributeCallbackBridge(
+ self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
}
- (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -12504,7 +12501,7 @@ - (void)subscribeAttributeNumberOfPrimariesWithMinInterval:(NSNumber * _Nonnull)
reportHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
- new CHIPInt8uAttributeCallbackSubscriptionBridge(
+ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -12512,11 +12509,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
return CHIP_ERROR_INVALID_ARGUMENT;
}
using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+ CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -12529,7 +12526,7 @@ + (void)readAttributeNumberOfPrimariesWithAttributeCache:(CHIPAttributeCacheCont
completionHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
using TypeInfo = ColorControl::Attributes::NumberOfPrimaries::TypeInfo;
@@ -12538,7 +12535,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value);
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -12671,12 +12668,13 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
- (void)readAttributePrimary1IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback::FromCancelable(failure);
- return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
- });
+ new CHIPNullableInt8uAttributeCallbackBridge(
+ self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
}
- (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -12686,7 +12684,7 @@ - (void)subscribeAttributePrimary1IntensityWithMinInterval:(NSNumber * _Nonnull)
reportHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
- new CHIPInt8uAttributeCallbackSubscriptionBridge(
+ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -12694,11 +12692,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
return CHIP_ERROR_INVALID_ARGUMENT;
}
using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+ CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -12711,7 +12709,7 @@ + (void)readAttributePrimary1IntensityWithAttributeCache:(CHIPAttributeCacheCont
completionHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
using TypeInfo = ColorControl::Attributes::Primary1Intensity::TypeInfo;
@@ -12720,7 +12718,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value);
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -12853,12 +12851,13 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
- (void)readAttributePrimary2IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback::FromCancelable(failure);
- return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
- });
+ new CHIPNullableInt8uAttributeCallbackBridge(
+ self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
}
- (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -12868,7 +12867,7 @@ - (void)subscribeAttributePrimary2IntensityWithMinInterval:(NSNumber * _Nonnull)
reportHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
- new CHIPInt8uAttributeCallbackSubscriptionBridge(
+ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -12876,11 +12875,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
return CHIP_ERROR_INVALID_ARGUMENT;
}
using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+ CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -12893,7 +12892,7 @@ + (void)readAttributePrimary2IntensityWithAttributeCache:(CHIPAttributeCacheCont
completionHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
using TypeInfo = ColorControl::Attributes::Primary2Intensity::TypeInfo;
@@ -12902,7 +12901,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value);
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -13035,12 +13034,13 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
- (void)readAttributePrimary3IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback::FromCancelable(failure);
- return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
- });
+ new CHIPNullableInt8uAttributeCallbackBridge(
+ self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
}
- (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -13050,7 +13050,7 @@ - (void)subscribeAttributePrimary3IntensityWithMinInterval:(NSNumber * _Nonnull)
reportHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
- new CHIPInt8uAttributeCallbackSubscriptionBridge(
+ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -13058,11 +13058,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
return CHIP_ERROR_INVALID_ARGUMENT;
}
using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+ CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -13075,7 +13075,7 @@ + (void)readAttributePrimary3IntensityWithAttributeCache:(CHIPAttributeCacheCont
completionHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
using TypeInfo = ColorControl::Attributes::Primary3Intensity::TypeInfo;
@@ -13084,7 +13084,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value);
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -13217,12 +13217,13 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
- (void)readAttributePrimary4IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback::FromCancelable(failure);
- return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
- });
+ new CHIPNullableInt8uAttributeCallbackBridge(
+ self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
+ auto successFn = Callback::FromCancelable(success);
+ auto failureFn = Callback::FromCancelable(failure);
+ return self.cppCluster.ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall);
+ });
}
- (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)minInterval
@@ -13232,7 +13233,7 @@ - (void)subscribeAttributePrimary4IntensityWithMinInterval:(NSNumber * _Nonnull)
reportHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler
{
- new CHIPInt8uAttributeCallbackSubscriptionBridge(
+ new CHIPNullableInt8uAttributeCallbackSubscriptionBridge(
self.callbackQueue, reportHandler,
^(Cancelable * success, Cancelable * failure) {
if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) {
@@ -13240,11 +13241,11 @@ new CHIPInt8uAttributeCallbackSubscriptionBridge(
return CHIP_ERROR_INVALID_ARGUMENT;
}
using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
auto failureFn = Callback::FromCancelable(failure);
return self.cppCluster.SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall,
[minInterval unsignedShortValue], [maxInterval unsignedShortValue],
- CHIPInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
+ CHIPNullableInt8uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished,
params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue],
params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]);
},
@@ -13257,7 +13258,7 @@ + (void)readAttributePrimary4IntensityWithAttributeCache:(CHIPAttributeCacheCont
completionHandler:
(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
+ new CHIPNullableInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
if (attributeCacheContainer.cppAttributeCache) {
chip::app::ConcreteAttributePath path;
using TypeInfo = ColorControl::Attributes::Primary4Intensity::TypeInfo;
@@ -13266,7 +13267,7 @@ new CHIPInt8uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su
path.mAttributeId = TypeInfo::GetAttributeId();
TypeInfo::DecodableType value;
CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value);
- auto successFn = Callback::FromCancelable(success);
+ auto successFn = Callback::FromCancelable(success);
if (err == CHIP_NO_ERROR) {
successFn->mCall(successFn->mContext, value);
}
@@ -13399,12 +13400,13 @@ new CHIPInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * s
- (void)readAttributePrimary5IntensityWithCompletionHandler:(void (^)(NSNumber * _Nullable value,
NSError * _Nullable error))completionHandler
{
- new CHIPInt8uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) {
- using TypeInfo = ColorControl::Attributes::Primary5Intensity::TypeInfo;
- auto successFn = Callback::FromCancelable(success);
- auto failureFn = Callback