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 96c706ad0ed1fe..8db5aede8014aa 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 @@ -2807,7 +2807,7 @@ server cluster ColorControl = 768 { readonly attribute int16u currentY = 4; readonly attribute enum8 driftCompensation = 5; readonly attribute char_string<254> compensationText = 6; - readonly attribute int16u colorTemperature = 7; + readonly attribute int16u colorTemperatureMireds = 7; readonly attribute enum8 colorMode = 8; attribute bitmap8 options = 15; readonly attribute nullable int8u numberOfPrimaries = 16; @@ -4489,7 +4489,7 @@ endpoint 1 { ram attribute currentY default = 0x607D; ram attribute driftCompensation; ram attribute compensationText; - ram attribute colorTemperature default = 0x00FA; + ram attribute colorTemperatureMireds default = 0x00FA; ram attribute colorMode default = 0x01; ram attribute options; ram attribute numberOfPrimaries; 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 a77c6e149bdbb6..33e49ae0697ae1 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 @@ -16,6 +16,12 @@ } ], "package": [ + { + "pathRelativity": "relativeToZap", + "path": "../../../src/app/zap-templates/app-templates.json", + "type": "gen-templates-json", + "version": "chip-v1" + }, { "pathRelativity": "relativeToZap", "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json", @@ -23,12 +29,6 @@ "category": "matter", "version": 1, "description": "Matter SDK ZCL data with some extensions" - }, - { - "pathRelativity": "relativeToZap", - "path": "../../../src/app/zap-templates/app-templates.json", - "type": "gen-templates-json", - "version": "chip-v1" } ], "endpointTypes": [ @@ -5459,7 +5459,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -6869,7 +6869,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -15721,7 +15721,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -23403,7 +23403,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -24724,6 +24724,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap index 7d8f8a633f86e2..80d7d28427fdef 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -4673,7 +4673,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -4705,7 +4705,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -5459,7 +5459,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -6869,7 +6869,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -15427,7 +15427,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -23195,7 +23195,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index e9ca95c79b6924..e2eeb1a3620ff4 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3417,7 +3417,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3449,7 +3449,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4109,7 +4109,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -4946,7 +4946,7 @@ }, { "name": "Anonymous Endpoint Type", - "deviceTypeName": "MA-bridge", + "deviceTypeName": "MA-aggregator", "deviceTypeCode": 14, "deviceTypeProfileId": 259, "clusters": [ diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap index e7a428eb8115e7..588fd5561c333b 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap index cd2fce9372017d..7f37e9236baf96 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap index 820d114a97782e..af7492a5615161 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap index 8228846b51306e..ea3aed211ff44e 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -7845,7 +7845,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 7fa6bae61d59dc..5f880b59f6a5a7 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -1600,7 +1600,7 @@ server cluster ColorControl = 768 { readonly attribute int16u remainingTime = 2; readonly attribute int16u currentX = 3; readonly attribute int16u currentY = 4; - readonly attribute int16u colorTemperature = 7; + readonly attribute int16u colorTemperatureMireds = 7; readonly attribute enum8 colorMode = 8; attribute bitmap8 options = 15; readonly attribute int16u enhancedCurrentHue = 16384; @@ -2000,7 +2000,7 @@ endpoint 1 { ram attribute remainingTime; ram attribute currentX default = 0x616B; ram attribute currentY default = 0x607D; - ram attribute colorTemperature default = 0x00FA; + ram attribute colorTemperatureMireds default = 0x00FA; ram attribute colorMode default = 0x01; ram attribute options; ram attribute enhancedCurrentHue; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap index b16c3b58499e70..f7366f0da7ec0b 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -7135,7 +7135,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap index f10f2e6e7b1ecd..a9b723752c6b0a 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap index 2eee803747b747..41286c59ffe459 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap index 297a93b41e4a75..6f5405174f454e 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap index 265488764c969f..dc5669b47efff3 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap index 062d239d458a28..31732aaacde1b8 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap index a5e6d76b308973..379141aebbd4e0 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap index 5da6d0e98805ad..b599d2f33b9da4 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap index 2a54b33dd4a9cc..9c4c8aac489d4c 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap index 14b27d8843d7d8..805125d24587b3 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap index 16ef5a77c00073..f6e271e5c8a0ac 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap index 58cea90b0949e8..81bda440771a96 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap index dc8cdf8643ddeb..532c2df0bbba00 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3865,7 +3865,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3897,7 +3897,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4601,7 +4601,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap index cf438a33ac283b..8d91ab416fafd9 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3817,7 +3817,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3849,7 +3849,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/chip-tool/templates/commands.zapt b/examples/chip-tool/templates/commands.zapt index eff75beb058cce..90c796d8cd14f4 100644 --- a/examples/chip-tool/templates/commands.zapt +++ b/examples/chip-tool/templates/commands.zapt @@ -90,6 +90,10 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss make_unique(Id, credsIssuerConfig), // {{#zcl_attributes_server}} make_unique(Id, "{{asDelimitedCommand (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + {{! TODO: Remove after 1.0. See https://github.com/project-chip/connectedhomeip/issues/22341 }} + {{#if (isStrEqual (asUpperCamelCase name) "ColorTemperatureMireds")}} + make_unique(Id, "color-temperature", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + {{/if}} {{/zcl_attributes_server}} make_unique>(Id, credsIssuerConfig), // {{#zcl_attributes_server}} @@ -107,6 +111,10 @@ void registerCluster{{asUpperCamelCase name}}(Commands & commands, CredentialIss {{#zcl_attributes_server}} {{#if isReportable}} make_unique(Id, "{{asDelimitedCommand (asUpperCamelCase name)}}", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + {{! TODO: Remove after 1.0. See https://github.com/project-chip/connectedhomeip/issues/22341 }} + {{#if (isStrEqual (asUpperCamelCase name) "ColorTemperatureMireds")}} + make_unique(Id, "color-temperature", Attributes::{{asUpperCamelCase name}}::Id, credsIssuerConfig), // + {{/if}} {{/if}} {{/zcl_attributes_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 27a458acdc6195..aa577c8581d2ca 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 @@ -1550,7 +1550,7 @@ client cluster ColorControl = 768 { readonly attribute int16u remainingTime = 2; readonly attribute int16u currentX = 3; readonly attribute int16u currentY = 4; - readonly attribute int16u colorTemperature = 7; + readonly attribute int16u colorTemperatureMireds = 7; readonly attribute enum8 colorMode = 8; attribute bitmap8 options = 15; readonly attribute nullable int8u numberOfPrimaries = 16; 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 b5455619544daf..e31aa3a87ee933 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": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3895,7 +3895,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3927,7 +3927,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4631,7 +4631,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -7545,7 +7545,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 43839293478d6d..c1d62ffc86d98c 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1496,7 +1496,7 @@ server cluster ColorControl = 768 { readonly attribute int16u remainingTime = 2; readonly attribute int16u currentX = 3; readonly attribute int16u currentY = 4; - readonly attribute int16u colorTemperature = 7; + readonly attribute int16u colorTemperatureMireds = 7; readonly attribute enum8 colorMode = 8; attribute bitmap8 options = 15; readonly attribute nullable int8u numberOfPrimaries = 16; @@ -2027,7 +2027,7 @@ endpoint 1 { ram attribute remainingTime; ram attribute currentX default = 0x616B; ram attribute currentY default = 0x607D; - ram attribute colorTemperature default = 0x00FA; + ram attribute colorTemperatureMireds default = 0x00FA; ram attribute colorMode default = 0x01; ram attribute options; ram attribute numberOfPrimaries; diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index a80993bbd7b86d..fa1f2533dfef36 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3913,7 +3913,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3945,7 +3945,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4649,7 +4649,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -7255,7 +7255,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index a4fcb00e492537..fb4207ebb35014 100755 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3841,7 +3841,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3873,7 +3873,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4527,7 +4527,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, 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 09bfbe04dee17b..36620b7ea4f44b 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": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -2693,7 +2693,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", 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 764a129926ea6c..563d1c6d40058f 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": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -2439,7 +2439,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -3929,7 +3929,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", 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 bbe0980bd62a45..34e68738c9ee21 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": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -2689,7 +2689,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -4179,7 +4179,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index c4791e2f371137..2c2cd948b17c1c 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3203,7 +3203,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -8139,7 +8139,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index c4791e2f371137..2c2cd948b17c1c 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3203,7 +3203,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -8139,7 +8139,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index c6370d53ff5f76..d32bcff3560125 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -4425,7 +4425,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -4457,7 +4457,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4667,7 +4667,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 65416acc82312b..cbeb3030de4d7c 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -4373,7 +4373,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -4405,7 +4405,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4615,7 +4615,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index 56e02d9950a38c..399d100a2427d9 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -2583,7 +2583,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 3ed706bab2b0fd..73e060aee06fc3 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3891,7 +3891,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3923,7 +3923,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4667,7 +4667,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -6073,7 +6073,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -11647,7 +11647,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 08f76bc0dab220..7b5cd4f4c93c19 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3701,7 +3701,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3733,7 +3733,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4477,7 +4477,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -5967,7 +5967,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "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 127ce0faef1519..e45dbf13845292 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 @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -3651,7 +3651,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -3683,7 +3683,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -4427,7 +4427,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -5819,7 +5819,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -11043,7 +11043,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -15469,7 +15469,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index db3d57c8992302..845c13cc8d4ca1 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -4565,7 +4565,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -4597,7 +4597,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -5305,7 +5305,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, 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 76a6e86d86a06b..b0b033753dd66e 100644 --- a/src/app/clusters/color-control-server/color-control-server.cpp +++ b/src/app/clusters/color-control-server/color-control-server.cpp @@ -2018,8 +2018,8 @@ EmberAfStatus ColorControlServer::moveToColorTemp(EndpointId aEndpoint, uint16_t } // now, kick off the state machine. - Attributes::ColorTemperature::Get(endpoint, &(colorTempTransitionState->initialValue)); - Attributes::ColorTemperature::Get(endpoint, &(colorTempTransitionState->currentValue)); + Attributes::ColorTemperatureMireds::Get(endpoint, &(colorTempTransitionState->initialValue)); + Attributes::ColorTemperatureMireds::Get(endpoint, &(colorTempTransitionState->currentValue)); colorTempTransitionState->finalValue = colorTemperature; colorTempTransitionState->stepsRemaining = transitionTime; @@ -2090,7 +2090,7 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint) if (status == EMBER_ZCL_STATUS_SUCCESS && !startUpColorTemp.IsNull()) { uint16_t updatedColorTemp = MAX_TEMPERATURE_VALUE; - status = Attributes::ColorTemperature::Get(endpoint, &updatedColorTemp); + status = Attributes::ColorTemperatureMireds::Get(endpoint, &updatedColorTemp); if (status == EMBER_ZCL_STATUS_SUCCESS) { @@ -2107,7 +2107,7 @@ void ColorControlServer::startUpColorTempCommand(EndpointId endpoint) // existing setting of ColorTemp attribute will be left unchanged (i.e., treated as // if startup color temp was set to null). updatedColorTemp = startUpColorTemp.Value(); - status = Attributes::ColorTemperature::Set(endpoint, updatedColorTemp); + status = Attributes::ColorTemperatureMireds::Set(endpoint, updatedColorTemp); if (status == EMBER_ZCL_STATUS_SUCCESS) { @@ -2144,7 +2144,7 @@ void ColorControlServer::updateTempCommand(EndpointId endpoint) emberEventControlSetDelayMS(configureTempEventControl(endpoint), UPDATE_TIME_MS); } - Attributes::ColorTemperature::Set(endpoint, colorTempTransitionState->currentValue); + Attributes::ColorTemperatureMireds::Set(endpoint, colorTempTransitionState->currentValue); emberAfColorControlClusterPrintln("Color Temperature %d", colorTempTransitionState->currentValue); @@ -2219,7 +2219,7 @@ bool ColorControlServer::moveColorTempCommand(const app::ConcreteCommandPath & c // now, kick off the state machine. colorTempTransitionState->initialValue = 0; - Attributes::ColorTemperature::Get(endpoint, &colorTempTransitionState->initialValue); + Attributes::ColorTemperatureMireds::Get(endpoint, &colorTempTransitionState->initialValue); colorTempTransitionState->currentValue = colorTempTransitionState->initialValue; if (moveMode == MOVE_MODE_UP) @@ -2337,7 +2337,7 @@ bool ColorControlServer::stepColorTempCommand(const app::ConcreteCommandPath & c // now, kick off the state machine. colorTempTransitionState->initialValue = 0; - Attributes::ColorTemperature::Get(endpoint, &colorTempTransitionState->initialValue); + Attributes::ColorTemperatureMireds::Get(endpoint, &colorTempTransitionState->initialValue); colorTempTransitionState->currentValue = colorTempTransitionState->initialValue; if (stepMode == MOVE_MODE_UP) diff --git a/src/app/clusters/level-control/level-control.cpp b/src/app/clusters/level-control/level-control.cpp index bcf52cd169a2ab..785de0d0febb78 100644 --- a/src/app/clusters/level-control/level-control.cpp +++ b/src/app/clusters/level-control/level-control.cpp @@ -167,7 +167,7 @@ static void reallyUpdateCoupledColorTemp(EndpointId endpoint) return; } - if (emberAfContainsAttribute(endpoint, ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id)) + if (emberAfContainsAttribute(endpoint, ColorControl::Id, ColorControl::Attributes::ColorTemperatureMireds::Id)) { if (READBITS(options, EMBER_ZCL_LEVEL_CONTROL_OPTIONS_COUPLE_COLOR_TEMP_TO_LEVEL)) { 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 a9b196b8938003..00f7eb26fb905f 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 @@ -103,7 +103,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT" PICS: CC.S.A0007 command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: type: int16u 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 3c94e22d8b3e91..f3722b52aa6833 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 @@ -70,7 +70,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: type: int16u @@ -128,7 +128,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: 275 @@ -145,7 +145,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: 255 @@ -162,7 +162,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: 250 @@ -179,7 +179,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: value: 250 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 ef054b7b499ced..9d05f0a81c43f1 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 @@ -69,7 +69,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: type: int16u @@ -137,7 +137,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep2c constraints: @@ -157,7 +157,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep2d constraints: @@ -175,7 +175,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: ColorTemperatureMiredsStep2d @@ -215,7 +215,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep3b constraints: @@ -233,7 +233,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep3c constraints: @@ -251,7 +251,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: ColorTempPhysicalMinMiredsValue @@ -314,7 +314,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep4c constraints: @@ -334,7 +334,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: value: ColorTemperatureMiredsStep4c 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 8a6858324c0c3e..cf7771b31bddbe 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 @@ -69,7 +69,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: type: int16u @@ -139,7 +139,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep2c constraints: @@ -159,7 +159,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep2d constraints: @@ -177,7 +177,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: ColorTemperatureMiredsStep2d @@ -219,7 +219,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep3b constraints: @@ -237,7 +237,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep3c constraints: @@ -255,7 +255,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: constraints: minValue: ColorTempPhysicalMinMiredsValue 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 09ecbf5d22cae4..c443ad18ce9b48 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 @@ -307,7 +307,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.A0007 && CC.S.C4b.Rsp && CC.S.C47.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: saveAs: ColorTemperatureMiredsStep4f constraints: @@ -327,7 +327,7 @@ tests: - label: "TH reads ColorTemperatureMireds attribute from DUT." PICS: CC.S.A0007 && CC.S.C4b.Rsp && CC.S.C47.Rsp command: "readAttribute" - attribute: "ColorTemperature" + attribute: "ColorTemperatureMireds" response: value: ColorTemperatureMiredsStep4f 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 b40807c1b39211..2bded3c28c8b3d 100644 --- a/src/app/zap-templates/zcl/data-model/silabs/ha.xml +++ b/src/app/zap-templates/zcl/data-model/silabs/ha.xml @@ -132,7 +132,7 @@ limitations under the License. CompensationText - ColorTemperature + ColorTemperatureMireds ColorMode diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 962b8b5f65b57b..cbeaaa13dcd95c 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -3134,7 +3134,7 @@ client cluster ColorControl = 768 { readonly attribute int16u currentY = 4; readonly attribute enum8 driftCompensation = 5; readonly attribute char_string<254> compensationText = 6; - readonly attribute int16u colorTemperature = 7; + readonly attribute int16u colorTemperatureMireds = 7; readonly attribute enum8 colorMode = 8; attribute bitmap8 options = 15; readonly attribute nullable int8u numberOfPrimaries = 16; diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index ca5ff6e5217ec9..619c00db488503 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -1,5 +1,5 @@ { - "featureLevel": 77, + "featureLevel": 80, "creator": "zap", "keyValuePairs": [ { @@ -6641,7 +6641,7 @@ "reportableChange": 0 }, { - "name": "delay", + "name": "Delay", "code": 58, "mfgCode": null, "side": "server", @@ -6673,7 +6673,7 @@ "reportableChange": 0 }, { - "name": "ChannelMask", + "name": "ChannelPage0Mask", "code": 60, "mfgCode": null, "side": "server", @@ -8023,7 +8023,7 @@ "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", + "type": "CommissioningWindowStatus", "included": 1, "storageOption": "External", "singleton": 0, @@ -12703,7 +12703,7 @@ "reportableChange": 0 }, { - "name": "ColorTemperature", + "name": "ColorTemperatureMireds", "code": 7, "mfgCode": null, "side": "server", @@ -19469,7 +19469,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -19485,7 +19485,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -19501,7 +19501,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 260e8cd358f8e4..0fa1a10ff6f4be 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -12186,8 +12186,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR value = env->NewStringUTF(std::string(cppValue.data(), cppValue.size()).c_str()); return value; } - case Attributes::ColorTemperature::Id: { - using TypeInfo = Attributes::ColorTemperature::TypeInfo; + case Attributes::ColorTemperatureMireds::Id: { + using TypeInfo = Attributes::ColorTemperatureMireds::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 be01149ef4bc17..989d127c31c2a7 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -1282,8 +1282,8 @@ typedef void (*CHIPColorControlClusterDriftCompensationAttributeCallbackType)( void *, chip::app::Clusters::ColorControl::Attributes::DriftCompensation::TypeInfo::DecodableArgType); typedef void (*CHIPColorControlClusterCompensationTextAttributeCallbackType)( void *, chip::app::Clusters::ColorControl::Attributes::CompensationText::TypeInfo::DecodableArgType); -typedef void (*CHIPColorControlClusterColorTemperatureAttributeCallbackType)( - void *, chip::app::Clusters::ColorControl::Attributes::ColorTemperature::TypeInfo::DecodableArgType); +typedef void (*CHIPColorControlClusterColorTemperatureMiredsAttributeCallbackType)( + void *, chip::app::Clusters::ColorControl::Attributes::ColorTemperatureMireds::TypeInfo::DecodableArgType); typedef void (*CHIPColorControlClusterColorModeAttributeCallbackType)( void *, chip::app::Clusters::ColorControl::Attributes::ColorMode::TypeInfo::DecodableArgType); typedef void (*CHIPColorControlClusterOptionsAttributeCallbackType)( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index bf07546f55e933..8891d153585df9 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -16283,13 +16283,13 @@ public void subscribeCompensationTextAttribute( subscribeCompensationTextAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readColorTemperatureAttribute(IntegerAttributeCallback callback) { - readColorTemperatureAttribute(chipClusterPtr, callback); + public void readColorTemperatureMiredsAttribute(IntegerAttributeCallback callback) { + readColorTemperatureMiredsAttribute(chipClusterPtr, callback); } - public void subscribeColorTemperatureAttribute( + public void subscribeColorTemperatureMiredsAttribute( IntegerAttributeCallback callback, int minInterval, int maxInterval) { - subscribeColorTemperatureAttribute(chipClusterPtr, callback, minInterval, maxInterval); + subscribeColorTemperatureMiredsAttribute(chipClusterPtr, callback, minInterval, maxInterval); } public void readColorModeAttribute(IntegerAttributeCallback callback) { @@ -16904,10 +16904,10 @@ private native void subscribeCompensationTextAttribute( int minInterval, int maxInterval); - private native void readColorTemperatureAttribute( + private native void readColorTemperatureMiredsAttribute( long chipClusterPtr, IntegerAttributeCallback callback); - private native void subscribeColorTemperatureAttribute( + private native void subscribeColorTemperatureMiredsAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); private native void readColorModeAttribute( diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index fddd0ee7c03216..46f3099e8572e5 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -2078,7 +2078,7 @@ public static String attributeIdToName(long clusterId, long attributeId) { return "CompensationText"; } if (attributeId == 7L) { - return "ColorTemperature"; + return "ColorTemperatureMireds"; } if (attributeId == 8L) { return "ColorMode"; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 363098e815aa52..60c7e1f2fb206d 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -8134,18 +8134,20 @@ public Map> getReadAttributeMap() { readColorControlCompensationTextCommandParams); readColorControlInteractionInfo.put( "readCompensationTextAttribute", readColorControlCompensationTextAttributeInteractionInfo); - Map readColorControlColorTemperatureCommandParams = + Map readColorControlColorTemperatureMiredsCommandParams = new LinkedHashMap(); - InteractionInfo readColorControlColorTemperatureAttributeInteractionInfo = + InteractionInfo readColorControlColorTemperatureMiredsAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ColorControlCluster) cluster) - .readColorTemperatureAttribute((ChipClusters.IntegerAttributeCallback) callback); + .readColorTemperatureMiredsAttribute( + (ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readColorControlColorTemperatureCommandParams); + readColorControlColorTemperatureMiredsCommandParams); readColorControlInteractionInfo.put( - "readColorTemperatureAttribute", readColorControlColorTemperatureAttributeInteractionInfo); + "readColorTemperatureMiredsAttribute", + readColorControlColorTemperatureMiredsAttributeInteractionInfo); Map readColorControlColorModeCommandParams = new LinkedHashMap(); InteractionInfo readColorControlColorModeAttributeInteractionInfo = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 4513a38a25ae45..86aa45cf36b047 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -4954,7 +4954,7 @@ class ChipClusters: "reportable": True, }, 0x00000007: { - "attributeName": "ColorTemperature", + "attributeName": "ColorTemperatureMireds", "attributeId": 0x00000007, "type": "int", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 94dbba01c44523..1d82b33183a403 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -18090,7 +18090,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: 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="colorTemperatureMireds", Tag=0x00000007, 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]), @@ -18149,7 +18149,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: currentY: 'typing.Optional[uint]' = None driftCompensation: 'typing.Optional[uint]' = None compensationText: 'typing.Optional[str]' = None - colorTemperature: 'typing.Optional[uint]' = None + colorTemperatureMireds: 'typing.Optional[uint]' = None colorMode: 'uint' = None options: 'uint' = None numberOfPrimaries: 'typing.Union[Nullable, uint]' = None @@ -18786,7 +18786,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'typing.Optional[str]' = None @dataclass - class ColorTemperature(ClusterAttributeDescriptor): + class ColorTemperatureMireds(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x0300 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 064c07e07e814b..12aadfa63c749e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -10624,8 +10624,8 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding]; return value; } - case Attributes::ColorTemperature::Id: { - using TypeInfo = Attributes::ColorTemperature::TypeInfo; + case Attributes::ColorTemperatureMireds::Id: { + using TypeInfo = Attributes::ColorTemperatureMireds::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 32504dbbf5613e..0a51c78d9b0bfa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -12969,23 +12969,24 @@ NS_ASSUME_NONNULL_BEGIN completionHandler: (void (^)(NSString * _Nullable value, NSError * _Nullable error))completionHandler; -- (void)readAttributeColorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, - NSError * _Nullable error))completionHandler; +- (void)readAttributeColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler; /** * This API does not support setting autoResubscribe to NO in the * MTRSubscribeParams. */ -- (void)subscribeAttributeColorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval - maxInterval:(NSNumber * _Nonnull)maxInterval - params:(MTRSubscribeParams * _Nullable)params - subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler - reportHandler: - (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler; -+ (void)readAttributeColorTemperatureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completionHandler: - (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; +- (void)subscribeAttributeColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(MTRSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))reportHandler; ++ (void)readAttributeColorTemperatureMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; - (void)readAttributeColorModeWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 703b006f8a8353..9f3db763080e39 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -54319,12 +54319,12 @@ new MTRCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable }); } -- (void)readAttributeColorTemperatureWithCompletionHandler:(void (^)(NSNumber * _Nullable value, - NSError * _Nullable error))completionHandler +- (void)readAttributeColorTemperatureMiredsWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler { new MTRInt16uAttributeCallbackBridge(self.callbackQueue, self.device, completionHandler, ^(ExchangeManager & exchangeManager, const SessionHandle & session, Cancelable * success, Cancelable * failure) { - using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo; + using TypeInfo = ColorControl::Attributes::ColorTemperatureMireds::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); chip::Controller::ColorControlCluster cppCluster(exchangeManager, session, self->_endpoint); @@ -54332,12 +54332,13 @@ new MTRInt16uAttributeCallbackBridge(self.callbackQueue, self.device, completion }); } -- (void)subscribeAttributeColorTemperatureWithMinInterval:(NSNumber * _Nonnull)minInterval - maxInterval:(NSNumber * _Nonnull)maxInterval - params:(MTRSubscribeParams * _Nullable)params - subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler - reportHandler: - (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +- (void)subscribeAttributeColorTemperatureMiredsWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(MTRSubscribeParams * _Nullable)params + subscriptionEstablished: + (SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { // Make a copy of params before we go async. minInterval = [minInterval copy]; @@ -54350,7 +54351,7 @@ new MTRInt16uAttributeCallbackSubscriptionBridge( // We don't support disabling auto-resubscribe. return CHIP_ERROR_INVALID_ARGUMENT; } - using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo; + using TypeInfo = ColorControl::Attributes::ColorTemperatureMireds::TypeInfo; auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); @@ -54364,16 +54365,16 @@ new MTRInt16uAttributeCallbackSubscriptionBridge( subscriptionEstablishedHandler); } -+ (void)readAttributeColorTemperatureWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer - endpoint:(NSNumber *)endpoint - queue:(dispatch_queue_t)queue - completionHandler: - (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler ++ (void)readAttributeColorTemperatureMiredsWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { new MTRInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = ColorControl::Attributes::ColorTemperature::TypeInfo; + using TypeInfo = ColorControl::Attributes::ColorTemperatureMireds::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 869f034e3b2b92..e94066c0f46d91 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -879,7 +879,7 @@ typedef NS_ENUM(uint32_t, MTRClusterAttributeIDType) { MTRClusterColorControlAttributeCurrentYID = 0x00000004, MTRClusterColorControlAttributeDriftCompensationID = 0x00000005, MTRClusterColorControlAttributeCompensationTextID = 0x00000006, - MTRClusterColorControlAttributeColorTemperatureID = 0x00000007, + MTRClusterColorControlAttributeColorTemperatureMiredsID = 0x00000007, MTRClusterColorControlAttributeColorModeID = 0x00000008, MTRClusterColorControlAttributeOptionsID = 0x0000000F, MTRClusterColorControlAttributeNumberOfPrimariesID = 0x00000010, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index ef8bc064a5524f..0ee41ff38b3b07 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -3115,7 +3115,7 @@ NS_ASSUME_NONNULL_BEGIN - (NSDictionary *)readAttributeCompensationTextWithParams:(MTRReadParams * _Nullable)params; -- (NSDictionary *)readAttributeColorTemperatureWithParams:(MTRReadParams * _Nullable)params; +- (NSDictionary *)readAttributeColorTemperatureMiredsWithParams:(MTRReadParams * _Nullable)params; - (NSDictionary *)readAttributeColorModeWithParams:(MTRReadParams * _Nullable)params; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 9172a6d3b320c2..ee13b7540a75aa 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -12949,11 +12949,11 @@ new MTRCommandSuccessCallbackBridge( params:params]; } -- (NSDictionary *)readAttributeColorTemperatureWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary *)readAttributeColorTemperatureMiredsWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) clusterID:@(MTRClusterColorControlID) - attributeID:@(MTRClusterColorControlAttributeColorTemperatureID) + attributeID:@(MTRClusterColorControlAttributeColorTemperatureMiredsID) params:params]; } diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 6a2279cb2179ca..b9a65afe5d2f7a 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -1091,15 +1091,15 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(2) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \ - { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \ - { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \ - { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \ - { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* DriftCompensation */ \ - { 0x00000006, ZAP_TYPE(CHAR_STRING), 255, 0, ZAP_EMPTY_DEFAULT() }, /* CompensationText */ \ - { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperature */ \ - { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \ + { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \ + { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \ + { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \ + { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* DriftCompensation */ \ + { 0x00000006, ZAP_TYPE(CHAR_STRING), 255, 0, ZAP_EMPTY_DEFAULT() }, /* CompensationText */ \ + { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperatureMireds */ \ + { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \ { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Options */ \ { 0x00000010, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* NumberOfPrimaries */ \ { 0x00000011, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* Primary1X */ \ diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 60f4de6eae617f..4cba25b122d69c 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -17931,7 +17931,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) } // namespace CompensationText -namespace ColorTemperature { +namespace ColorTemperatureMireds { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { @@ -17960,7 +17960,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) return emberAfWriteServerAttribute(endpoint, Clusters::ColorControl::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } -} // namespace ColorTemperature +} // namespace ColorTemperatureMireds namespace ColorMode { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 73deb29ea144ab..f4d9c7fea31405 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -3029,10 +3029,10 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // ch EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); } // namespace CompensationText -namespace ColorTemperature { +namespace ColorTemperatureMireds { EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); -} // namespace ColorTemperature +} // namespace ColorTemperatureMireds namespace ColorMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // enum8 diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp index 1c0bf9098cda3e..c476e944671359 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp @@ -14682,8 +14682,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::CompensationText::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, compensationText)); break; - case Attributes::ColorTemperature::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperature)); + case Attributes::ColorTemperatureMireds::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, colorTemperatureMireds)); break; case Attributes::ColorMode::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, colorMode)); diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 924bfe735eef96..eae961991774c2 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -18674,7 +18674,7 @@ struct TypeInfo static constexpr size_t MaxLength() { return 254; } }; } // namespace CompensationText -namespace ColorTemperature { +namespace ColorTemperatureMireds { struct TypeInfo { using Type = uint16_t; @@ -18682,10 +18682,10 @@ struct TypeInfo using DecodableArgType = uint16_t; static constexpr ClusterId GetClusterId() { return Clusters::ColorControl::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::ColorTemperature::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ColorTemperatureMireds::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace ColorTemperature +} // namespace ColorTemperatureMireds namespace ColorMode { struct TypeInfo { @@ -19260,9 +19260,9 @@ struct TypeInfo Attributes::CurrentY::TypeInfo::DecodableType currentY = static_cast(0); Attributes::DriftCompensation::TypeInfo::DecodableType driftCompensation = static_cast(0); Attributes::CompensationText::TypeInfo::DecodableType compensationText; - Attributes::ColorTemperature::TypeInfo::DecodableType colorTemperature = static_cast(0); - Attributes::ColorMode::TypeInfo::DecodableType colorMode = static_cast(0); - Attributes::Options::TypeInfo::DecodableType options = static_cast(0); + Attributes::ColorTemperatureMireds::TypeInfo::DecodableType colorTemperatureMireds = static_cast(0); + Attributes::ColorMode::TypeInfo::DecodableType colorMode = static_cast(0); + Attributes::Options::TypeInfo::DecodableType options = static_cast(0); Attributes::NumberOfPrimaries::TypeInfo::DecodableType numberOfPrimaries; Attributes::Primary1X::TypeInfo::DecodableType primary1X = static_cast(0); Attributes::Primary1Y::TypeInfo::DecodableType primary1Y = static_cast(0); diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index d56fbc9210279e..0897b6c90df19d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -3046,9 +3046,9 @@ namespace CompensationText { static constexpr AttributeId Id = 0x00000006; } // namespace CompensationText -namespace ColorTemperature { +namespace ColorTemperatureMireds { static constexpr AttributeId Id = 0x00000007; -} // namespace ColorTemperature +} // namespace ColorTemperatureMireds namespace ColorMode { static constexpr AttributeId Id = 0x00000008; diff --git a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h index e7f99834ec16d9..08ca5981f0b424 100644 --- a/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_extendedcolorlight_8lcaaYJVAa/zap-generated/endpoint_config.h @@ -486,13 +486,13 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \ - { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \ - { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \ - { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \ - { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperature */ \ - { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \ + { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \ + { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \ + { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \ + { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperatureMireds */ \ + { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \ { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Options */ \ { 0x00004000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* EnhancedCurrentHue */ \ { 0x00004001, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* EnhancedColorMode */ \ diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index a812e26aec450c..502ded3d0ab0af 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -5045,7 +5045,7 @@ class ThermostatClearWeeklySchedule : public ClusterCommand | * CurrentY | 0x0004 | | * DriftCompensation | 0x0005 | | * CompensationText | 0x0006 | -| * ColorTemperature | 0x0007 | +| * ColorTemperatureMireds | 0x0007 | | * ColorMode | 0x0008 | | * Options | 0x000F | | * NumberOfPrimaries | 0x0010 | @@ -11411,52 +11411,53 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * // // Attributes // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig), // - make_unique(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig), // - make_unique(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig), // - make_unique(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig), // - make_unique(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig), // - make_unique(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig), // - make_unique(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig), // - make_unique(Id, "color-temperature", Attributes::ColorTemperature::Id, credsIssuerConfig), // - make_unique(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig), // - make_unique(Id, "options", Attributes::Options::Id, credsIssuerConfig), // - make_unique(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig), // - make_unique(Id, "primary1x", Attributes::Primary1X::Id, credsIssuerConfig), // - make_unique(Id, "primary1y", Attributes::Primary1Y::Id, credsIssuerConfig), // - make_unique(Id, "primary1intensity", Attributes::Primary1Intensity::Id, credsIssuerConfig), // - make_unique(Id, "primary2x", Attributes::Primary2X::Id, credsIssuerConfig), // - make_unique(Id, "primary2y", Attributes::Primary2Y::Id, credsIssuerConfig), // - make_unique(Id, "primary2intensity", Attributes::Primary2Intensity::Id, credsIssuerConfig), // - make_unique(Id, "primary3x", Attributes::Primary3X::Id, credsIssuerConfig), // - make_unique(Id, "primary3y", Attributes::Primary3Y::Id, credsIssuerConfig), // - make_unique(Id, "primary3intensity", Attributes::Primary3Intensity::Id, credsIssuerConfig), // - make_unique(Id, "primary4x", Attributes::Primary4X::Id, credsIssuerConfig), // - make_unique(Id, "primary4y", Attributes::Primary4Y::Id, credsIssuerConfig), // - make_unique(Id, "primary4intensity", Attributes::Primary4Intensity::Id, credsIssuerConfig), // - make_unique(Id, "primary5x", Attributes::Primary5X::Id, credsIssuerConfig), // - make_unique(Id, "primary5y", Attributes::Primary5Y::Id, credsIssuerConfig), // - make_unique(Id, "primary5intensity", Attributes::Primary5Intensity::Id, credsIssuerConfig), // - make_unique(Id, "primary6x", Attributes::Primary6X::Id, credsIssuerConfig), // - make_unique(Id, "primary6y", Attributes::Primary6Y::Id, credsIssuerConfig), // - make_unique(Id, "primary6intensity", Attributes::Primary6Intensity::Id, credsIssuerConfig), // - make_unique(Id, "white-point-x", Attributes::WhitePointX::Id, credsIssuerConfig), // - make_unique(Id, "white-point-y", Attributes::WhitePointY::Id, credsIssuerConfig), // - make_unique(Id, "color-point-rx", Attributes::ColorPointRX::Id, credsIssuerConfig), // - make_unique(Id, "color-point-ry", Attributes::ColorPointRY::Id, credsIssuerConfig), // - make_unique(Id, "color-point-rintensity", Attributes::ColorPointRIntensity::Id, credsIssuerConfig), // - make_unique(Id, "color-point-gx", Attributes::ColorPointGX::Id, credsIssuerConfig), // - make_unique(Id, "color-point-gy", Attributes::ColorPointGY::Id, credsIssuerConfig), // - make_unique(Id, "color-point-gintensity", Attributes::ColorPointGIntensity::Id, credsIssuerConfig), // - make_unique(Id, "color-point-bx", Attributes::ColorPointBX::Id, credsIssuerConfig), // - make_unique(Id, "color-point-by", Attributes::ColorPointBY::Id, credsIssuerConfig), // - make_unique(Id, "color-point-bintensity", Attributes::ColorPointBIntensity::Id, credsIssuerConfig), // - make_unique(Id, "enhanced-current-hue", Attributes::EnhancedCurrentHue::Id, credsIssuerConfig), // - make_unique(Id, "enhanced-color-mode", Attributes::EnhancedColorMode::Id, credsIssuerConfig), // - make_unique(Id, "color-loop-active", Attributes::ColorLoopActive::Id, credsIssuerConfig), // - make_unique(Id, "color-loop-direction", Attributes::ColorLoopDirection::Id, credsIssuerConfig), // - make_unique(Id, "color-loop-time", Attributes::ColorLoopTime::Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig), // + make_unique(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig), // + make_unique(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig), // + make_unique(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig), // + make_unique(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig), // + make_unique(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig), // + make_unique(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig), // + make_unique(Id, "color-temperature-mireds", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // + make_unique(Id, "color-temperature", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // + make_unique(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig), // + make_unique(Id, "options", Attributes::Options::Id, credsIssuerConfig), // + make_unique(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig), // + make_unique(Id, "primary1x", Attributes::Primary1X::Id, credsIssuerConfig), // + make_unique(Id, "primary1y", Attributes::Primary1Y::Id, credsIssuerConfig), // + make_unique(Id, "primary1intensity", Attributes::Primary1Intensity::Id, credsIssuerConfig), // + make_unique(Id, "primary2x", Attributes::Primary2X::Id, credsIssuerConfig), // + make_unique(Id, "primary2y", Attributes::Primary2Y::Id, credsIssuerConfig), // + make_unique(Id, "primary2intensity", Attributes::Primary2Intensity::Id, credsIssuerConfig), // + make_unique(Id, "primary3x", Attributes::Primary3X::Id, credsIssuerConfig), // + make_unique(Id, "primary3y", Attributes::Primary3Y::Id, credsIssuerConfig), // + make_unique(Id, "primary3intensity", Attributes::Primary3Intensity::Id, credsIssuerConfig), // + make_unique(Id, "primary4x", Attributes::Primary4X::Id, credsIssuerConfig), // + make_unique(Id, "primary4y", Attributes::Primary4Y::Id, credsIssuerConfig), // + make_unique(Id, "primary4intensity", Attributes::Primary4Intensity::Id, credsIssuerConfig), // + make_unique(Id, "primary5x", Attributes::Primary5X::Id, credsIssuerConfig), // + make_unique(Id, "primary5y", Attributes::Primary5Y::Id, credsIssuerConfig), // + make_unique(Id, "primary5intensity", Attributes::Primary5Intensity::Id, credsIssuerConfig), // + make_unique(Id, "primary6x", Attributes::Primary6X::Id, credsIssuerConfig), // + make_unique(Id, "primary6y", Attributes::Primary6Y::Id, credsIssuerConfig), // + make_unique(Id, "primary6intensity", Attributes::Primary6Intensity::Id, credsIssuerConfig), // + make_unique(Id, "white-point-x", Attributes::WhitePointX::Id, credsIssuerConfig), // + make_unique(Id, "white-point-y", Attributes::WhitePointY::Id, credsIssuerConfig), // + make_unique(Id, "color-point-rx", Attributes::ColorPointRX::Id, credsIssuerConfig), // + make_unique(Id, "color-point-ry", Attributes::ColorPointRY::Id, credsIssuerConfig), // + make_unique(Id, "color-point-rintensity", Attributes::ColorPointRIntensity::Id, credsIssuerConfig), // + make_unique(Id, "color-point-gx", Attributes::ColorPointGX::Id, credsIssuerConfig), // + make_unique(Id, "color-point-gy", Attributes::ColorPointGY::Id, credsIssuerConfig), // + make_unique(Id, "color-point-gintensity", Attributes::ColorPointGIntensity::Id, credsIssuerConfig), // + make_unique(Id, "color-point-bx", Attributes::ColorPointBX::Id, credsIssuerConfig), // + make_unique(Id, "color-point-by", Attributes::ColorPointBY::Id, credsIssuerConfig), // + make_unique(Id, "color-point-bintensity", Attributes::ColorPointBIntensity::Id, credsIssuerConfig), // + make_unique(Id, "enhanced-current-hue", Attributes::EnhancedCurrentHue::Id, credsIssuerConfig), // + make_unique(Id, "enhanced-color-mode", Attributes::EnhancedColorMode::Id, credsIssuerConfig), // + make_unique(Id, "color-loop-active", Attributes::ColorLoopActive::Id, credsIssuerConfig), // + make_unique(Id, "color-loop-direction", Attributes::ColorLoopDirection::Id, credsIssuerConfig), // + make_unique(Id, "color-loop-time", Attributes::ColorLoopTime::Id, credsIssuerConfig), // make_unique(Id, "color-loop-start-enhanced-hue", Attributes::ColorLoopStartEnhancedHue::Id, credsIssuerConfig), // make_unique(Id, "color-loop-stored-enhanced-hue", Attributes::ColorLoopStoredEnhancedHue::Id, @@ -11501,16 +11502,18 @@ void registerClusterColorControl(Commands & commands, CredentialIssuerCommands * Id, "color-point-bintensity", 0, UINT8_MAX, Attributes::ColorPointBIntensity::Id, credsIssuerConfig), // make_unique>>( Id, "start-up-color-temperature-mireds", 0, UINT16_MAX, Attributes::StartUpColorTemperatureMireds::Id, - credsIssuerConfig), // - make_unique(Id, credsIssuerConfig), // - make_unique(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig), // - make_unique(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig), // - make_unique(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig), // - make_unique(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig), // - make_unique(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig), // - make_unique(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig), // - make_unique(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig), // - make_unique(Id, "color-temperature", Attributes::ColorTemperature::Id, credsIssuerConfig), // + credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "current-hue", Attributes::CurrentHue::Id, credsIssuerConfig), // + make_unique(Id, "current-saturation", Attributes::CurrentSaturation::Id, credsIssuerConfig), // + make_unique(Id, "remaining-time", Attributes::RemainingTime::Id, credsIssuerConfig), // + make_unique(Id, "current-x", Attributes::CurrentX::Id, credsIssuerConfig), // + make_unique(Id, "current-y", Attributes::CurrentY::Id, credsIssuerConfig), // + make_unique(Id, "drift-compensation", Attributes::DriftCompensation::Id, credsIssuerConfig), // + make_unique(Id, "compensation-text", Attributes::CompensationText::Id, credsIssuerConfig), // + make_unique(Id, "color-temperature-mireds", Attributes::ColorTemperatureMireds::Id, + credsIssuerConfig), // + make_unique(Id, "color-temperature", Attributes::ColorTemperatureMireds::Id, credsIssuerConfig), // make_unique(Id, "color-mode", Attributes::ColorMode::Id, credsIssuerConfig), // make_unique(Id, "options", Attributes::Options::Id, credsIssuerConfig), // make_unique(Id, "number-of-primaries", Attributes::NumberOfPrimaries::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index f50a45e43715b0..66464b3b906bc4 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -7645,10 +7645,10 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CompensationText", 1, value); } - case ColorControl::Attributes::ColorTemperature::Id: { + case ColorControl::Attributes::ColorTemperatureMireds::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ColorTemperature", 1, value); + return DataModelLogger::LogValue("ColorTemperatureMireds", 1, value); } case ColorControl::Attributes::ColorMode::Id: { uint8_t value; diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 3a45ab7303bfd3..358738a95d5e4a 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -4095,8 +4095,8 @@ class Test_TC_CC_2_1Suite : public TestCommand case 8: { LogStep(8, "TH reads ColorTemperatureMireds attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 9: { LogStep(9, "TH reads ColorMode attribute from DUT"); @@ -8736,7 +8736,7 @@ class Test_TC_CC_6_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("colorTemperature", value, 250U)); + VerifyOrReturn(CheckValue("colorTemperatureMireds", value, 250U)); } break; case 17: @@ -8825,8 +8825,8 @@ class Test_TC_CC_6_1Suite : public TestCommand case 5: { LogStep(5, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 6: { LogStep(6, @@ -8876,8 +8876,8 @@ class Test_TC_CC_6_1Suite : public TestCommand case 10: { LogStep(10, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 11: { LogStep(11, "Wait 10s"); @@ -8889,8 +8889,8 @@ class Test_TC_CC_6_1Suite : public TestCommand case 12: { LogStep(12, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 13: { LogStep(13, "Wait 10s"); @@ -8902,8 +8902,8 @@ class Test_TC_CC_6_1Suite : public TestCommand case 14: { LogStep(14, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 15: { LogStep(15, "Wait 5s"); @@ -8915,8 +8915,8 @@ class Test_TC_CC_6_1Suite : public TestCommand case 16: { LogStep(16, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C0a.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 17: { LogStep(17, "TH reads ColorMode attribute from DUT"); @@ -9161,7 +9161,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureMiredsStep4c)); + VerifyOrReturn(CheckValue("colorTemperatureMireds", value, ColorTemperatureMiredsStep4c)); } break; case 28: @@ -9250,8 +9250,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 5: { LogStep(5, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 6: { LogStep(6, @@ -9304,8 +9304,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 10: { LogStep(10, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 11: { LogStep(11, "Wait 10s"); @@ -9317,8 +9317,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 12: { LogStep(12, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 13: { LogStep(13, "Wait 5s"); @@ -9330,8 +9330,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 14: { LogStep(14, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 15: { LogStep(15, @@ -9361,8 +9361,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 17: { LogStep(17, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 18: { LogStep(18, "Wait 10s"); @@ -9374,8 +9374,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 19: { LogStep(19, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 20: { LogStep(20, "Wait 5s"); @@ -9387,8 +9387,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 21: { LogStep(21, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 22: { LogStep(22, @@ -9436,8 +9436,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 25: { LogStep(25, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 26: { LogStep(26, "Wait 2s"); @@ -9449,8 +9449,8 @@ class Test_TC_CC_6_2Suite : public TestCommand case 27: { LogStep(27, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4b.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 28: { LogStep(28, "TH reads ColorMode attribute from DUT"); @@ -9750,8 +9750,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 5: { LogStep(5, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 6: { LogStep(6, @@ -9805,8 +9805,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 10: { LogStep(10, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 11: { LogStep(11, "Wait 10s"); @@ -9818,8 +9818,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 12: { LogStep(12, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 13: { LogStep(13, "Wait 5s"); @@ -9831,8 +9831,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 14: { LogStep(14, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 15: { LogStep(15, @@ -9863,8 +9863,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 17: { LogStep(17, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 18: { LogStep(18, "Wait 10s"); @@ -9876,8 +9876,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 19: { LogStep(19, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 20: { LogStep(20, "Wait 5s"); @@ -9889,8 +9889,8 @@ class Test_TC_CC_6_3Suite : public TestCommand case 21: { LogStep(21, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.F04 && CC.S.A0007 && CC.S.C4c.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 22: { LogStep(22, "TH reads ColorMode attribute from DUT"); @@ -11404,7 +11404,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureMiredsStep4f)); + VerifyOrReturn(CheckValue("colorTemperatureMireds", value, ColorTemperatureMiredsStep4f)); } break; case 29: @@ -11722,8 +11722,8 @@ class Test_TC_CC_8_1Suite : public TestCommand case 26: { LogStep(26, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.A0007 && CC.S.C4b.Rsp && CC.S.C47.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 27: { LogStep(27, "Wait 2s"); @@ -11735,8 +11735,8 @@ class Test_TC_CC_8_1Suite : public TestCommand case 28: { LogStep(28, "TH reads ColorTemperatureMireds attribute from DUT."); VerifyOrDo(!ShouldSkip("CC.S.A0007 && CC.S.C4b.Rsp && CC.S.C47.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorTemperature::Id, - true, chip::NullOptional); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, + ColorControl::Attributes::ColorTemperatureMireds::Id, true, chip::NullOptional); } case 29: { LogStep(29, diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index ded9c6fb369a17..78c940645885f3 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -52810,7 +52810,7 @@ class SubscribeAttributeThermostatUserInterfaceConfigurationClusterRevision : pu | * CurrentY | 0x0004 | | * DriftCompensation | 0x0005 | | * CompensationText | 0x0006 | -| * ColorTemperature | 0x0007 | +| * ColorTemperatureMireds | 0x0007 | | * ColorMode | 0x0008 | | * Options | 0x000F | | * NumberOfPrimaries | 0x0010 | @@ -54345,16 +54345,16 @@ class SubscribeAttributeColorControlCompensationText : public SubscribeAttribute }; /* - * Attribute ColorTemperature + * Attribute ColorTemperatureMireds */ -class ReadColorControlColorTemperature : public ReadAttribute { +class ReadColorControlColorTemperatureMireds : public ReadAttribute { public: - ReadColorControlColorTemperature() - : ReadAttribute("color-temperature") + ReadColorControlColorTemperatureMireds() + : ReadAttribute("color-temperature-mireds") { } - ~ReadColorControlColorTemperature() {} + ~ReadColorControlColorTemperatureMireds() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -54364,10 +54364,10 @@ class ReadColorControlColorTemperature : public ReadAttribute { MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"ColorControl.ColorTemperature response %@", [value description]); + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"ColorControl.ColorTemperatureMireds response %@", [value description]); if (error != nil) { - LogNSError("ColorControl ColorTemperature read Error", error); + LogNSError("ColorControl ColorTemperatureMireds read Error", error); } SetCommandExitStatus(error); }]; @@ -54375,14 +54375,14 @@ class ReadColorControlColorTemperature : public ReadAttribute { } }; -class SubscribeAttributeColorControlColorTemperature : public SubscribeAttribute { +class SubscribeAttributeColorControlColorTemperatureMireds : public SubscribeAttribute { public: - SubscribeAttributeColorControlColorTemperature() - : SubscribeAttribute("color-temperature") + SubscribeAttributeColorControlColorTemperatureMireds() + : SubscribeAttribute("color-temperature-mireds") { } - ~SubscribeAttributeColorControlColorTemperature() {} + ~SubscribeAttributeColorControlColorTemperatureMireds() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { @@ -54395,14 +54395,14 @@ class SubscribeAttributeColorControlColorTemperature : public SubscribeAttribute params.keepPreviousSubscriptions = mKeepSubscriptions.HasValue() ? [NSNumber numberWithBool:mKeepSubscriptions.Value()] : nil; params.fabricFiltered = mFabricFiltered.HasValue() ? [NSNumber numberWithBool:mFabricFiltered.Value()] : nil; - [cluster subscribeAttributeColorTemperatureWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] + [cluster subscribeAttributeColorTemperatureMiredsWithMinInterval:[NSNumber numberWithUnsignedInt:mMinInterval] maxInterval:[NSNumber numberWithUnsignedInt:mMaxInterval] params:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"ColorControl.ColorTemperature response %@", [value description]); + NSLog(@"ColorControl.ColorTemperatureMireds response %@", [value description]); SetCommandExitStatus(error); }]; @@ -95222,8 +95222,8 @@ void registerClusterColorControl(Commands & commands) make_unique(), // make_unique(), // make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 9ed2dc2591b21e..a99e1dccb3d26f 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -6057,14 +6057,14 @@ class Test_TC_CC_2_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads ColorTemperatureMireds attribute from DUT Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); + VerifyOrReturn(CheckConstraintType("colorTemperatureMireds", "int16u", "int16u")); + VerifyOrReturn(CheckConstraintMinValue("colorTemperatureMireds", [value unsignedShortValue], 0U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperatureMireds", [value unsignedShortValue], 65279U)); NextTest(); }]; @@ -15418,16 +15418,16 @@ class Test_TC_CC_6_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); - VerifyOrReturn( - CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); - VerifyOrReturn( - CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMaxMiredsValue)); + VerifyOrReturn(CheckConstraintType("colorTemperatureMireds", "int16u", "int16u")); + VerifyOrReturn(CheckConstraintMinValue( + "colorTemperatureMireds", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); + VerifyOrReturn(CheckConstraintMaxValue( + "colorTemperatureMireds", [value unsignedShortValue], ColorTempPhysicalMaxMiredsValue)); NextTest(); }]; @@ -15511,13 +15511,13 @@ class Test_TC_CC_6_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 275U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 305U)); + VerifyOrReturn(CheckConstraintMinValue("colorTemperatureMireds", [value unsignedShortValue], 275U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperatureMireds", [value unsignedShortValue], 305U)); NextTest(); }]; @@ -15540,13 +15540,13 @@ class Test_TC_CC_6_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 255U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 285U)); + VerifyOrReturn(CheckConstraintMinValue("colorTemperatureMireds", [value unsignedShortValue], 255U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperatureMireds", [value unsignedShortValue], 285U)); NextTest(); }]; @@ -15569,13 +15569,13 @@ class Test_TC_CC_6_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 250U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 280U)); + VerifyOrReturn(CheckConstraintMinValue("colorTemperatureMireds", [value unsignedShortValue], 250U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperatureMireds", [value unsignedShortValue], 280U)); NextTest(); }]; @@ -15598,14 +15598,14 @@ class Test_TC_CC_6_1 : public TestCommandBridge { queue:mCallbackQueue]; VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); - [cluster readAttributeColorTemperatureWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + [cluster readAttributeColorTemperatureMiredsWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { NSLog(@"TH reads ColorTemperatureMireds attribute from DUT. Error: %@", err); VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { id actualValue = value; - VerifyOrReturn(CheckValue("ColorTemperature", actualValue, 250U)); + VerifyOrReturn(CheckValue("ColorTemperatureMireds", actualValue, 250U)); } NextTest(); diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index 4db663755aea03..fa025de3e7e86b 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -512,13 +512,13 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Color Control (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \ - { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \ - { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \ - { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \ - { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperature */ \ - { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentHue */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* CurrentSaturation */ \ + { 0x00000002, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* RemainingTime */ \ + { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x616B) }, /* CurrentX */ \ + { 0x00000004, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x607D) }, /* CurrentY */ \ + { 0x00000007, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00FA) }, /* ColorTemperatureMireds */ \ + { 0x00000008, ZAP_TYPE(ENUM8), 1, 0, ZAP_SIMPLE_DEFAULT(0x01) }, /* ColorMode */ \ { 0x0000000F, ZAP_TYPE(BITMAP8), 1, ZAP_ATTRIBUTE_MASK(WRITABLE), ZAP_SIMPLE_DEFAULT(0x00) }, /* Options */ \ { 0x00000010, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(NULLABLE), ZAP_EMPTY_DEFAULT() }, /* NumberOfPrimaries */ \ { 0x00004000, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0000) }, /* EnhancedCurrentHue */ \