From 3e619a0c808fdb0c4013c4d435d06db5cc7ca036 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 9 Jan 2023 09:36:38 -0500 Subject: [PATCH] Align naming in Switch cluster XML with the spec. (#24317) * Align naming in Switch cluster XML with the spec. * Auto-update ZAP files with new attribute names. * Regenerate generated code. --- .../all-clusters-common/all-clusters-app.zap | 12 +- .../all-clusters-minimal-app.zap | 12 +- .../bridge-app/bridge-common/bridge-app.zap | 6 +- ...tnode_colortemperaturelight_hbUnzYVeyn.zap | 4 +- .../chef/devices/rootnode_fan_7N2TobIlOX.zap | 4 +- .../bridge-common/bridge-app.zap | 6 +- .../light-switch-common/light-switch-app.zap | 6 +- .../placeholder/linux/apps/app1/config.zap | 538 +++++++++--------- .../placeholder/linux/apps/app2/config.zap | 442 +++++++------- .../thermostat-common/thermostat.zap | 12 +- examples/tv-app/tv-common/tv-app.zap | 6 +- .../tv-casting-common/tv-casting-app.zap | 12 +- .../certification/Test_TC_SWTCH_2_1.yaml | 6 +- .../Test_TC_SWTCH_3_1_Simulated.yaml | 6 +- .../zcl/data-model/chip/switch-cluster.xml | 30 +- .../data_model/controller-clusters.zap | 6 +- .../CHIP/templates/availability.yaml | 2 + .../zap-generated/endpoint_config.h | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../zap-generated/endpoint_config.h | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../cluster/logging/DataModelLogger.cpp | 6 +- .../zap-generated/endpoint_config.h | 6 +- .../zap-generated/endpoint_config.h | 4 +- .../app1/zap-generated/endpoint_config.h | 6 +- .../app2/zap-generated/endpoint_config.h | 6 +- .../zap-generated/endpoint_config.h | 4 +- 27 files changed, 582 insertions(+), 580 deletions(-) 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 385bbdba5e28a8..76a1c03975003c 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 @@ -5329,7 +5329,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -5345,7 +5345,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -5361,7 +5361,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", @@ -11953,7 +11953,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -11969,7 +11969,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -11985,7 +11985,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", 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 47702fc123b3d5..516c49fb6b7108 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 @@ -5329,7 +5329,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -5345,7 +5345,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -5361,7 +5361,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", @@ -11803,7 +11803,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -11819,7 +11819,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -11835,7 +11835,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "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 44d80159434847..1948ac7bce1f74 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -7151,7 +7151,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -7167,7 +7167,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -7183,7 +7183,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap index 67432cb95ed0ac..924ab892eecf3f 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.zap @@ -4551,7 +4551,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -4567,7 +4567,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap index 62f52151109311..634824d729bc64 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.zap @@ -4599,7 +4599,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -4615,7 +4615,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap index 44d80159434847..1948ac7bce1f74 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.zap +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.zap @@ -7151,7 +7151,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -7167,7 +7167,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -7183,7 +7183,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", 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 10301e01d011ba..145e0e044d3fec 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 @@ -9071,7 +9071,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -9087,7 +9087,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -9103,7 +9103,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 76b7f6794bfdd4..68583939aaf2ee 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -3009,7 +3009,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -3025,7 +3025,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -3041,7 +3041,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", @@ -8015,13 +8015,29 @@ ] }, { - "name": "Fixed Label", - "code": 64, + "name": "Localization Configuration", + "code": 43, "mfgCode": null, - "define": "FIXED_LABEL_CLUSTER", + "define": "LOCALIZATION_CONFIGURATION_CLUSTER", "side": "client", "enabled": 1, "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -8041,18 +8057,34 @@ ] }, { - "name": "Fixed Label", - "code": 64, + "name": "Localization Configuration", + "code": 43, "mfgCode": null, - "define": "FIXED_LABEL_CLUSTER", + "define": "LOCALIZATION_CONFIGURATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ { - "name": "label list", + "name": "ActiveLocale", "code": 0, "mfgCode": null, "side": "server", + "type": "char_string", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "SupportedLocales", + "code": 1, + "mfgCode": null, + "side": "server", "type": "array", "included": 1, "storageOption": "External", @@ -8064,6 +8096,22 @@ "maxInterval": 65344, "reportableChange": 0 }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, { "name": "ClusterRevision", "code": 65533, @@ -8083,38 +8131,12 @@ ] }, { - "name": "Color Control", - "code": 768, + "name": "Unit Localization", + "code": 45, "mfgCode": null, - "define": "COLOR_CONTROL_CLUSTER", + "define": "UNIT_LOCALIZATION_CLUSTER", "side": "client", - "enabled": 0, - "commands": [ - { - "name": "MoveToColor", - "code": 7, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "MoveColor", - "code": 8, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, - { - "name": "StepColor", - "code": 9, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - } - ], + "enabled": 1, "attributes": [ { "name": "ClusterRevision", @@ -8126,7 +8148,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8135,48 +8157,48 @@ ] }, { - "name": "Color Control", - "code": 768, + "name": "Unit Localization", + "code": 45, "mfgCode": null, - "define": "COLOR_CONTROL_CLUSTER", + "define": "UNIT_LOCALIZATION_CLUSTER", "side": "server", "enabled": 1, "attributes": [ { - "name": "CurrentHue", + "name": "TemperatureUnit", "code": 0, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 0, + "type": "TempUnit", + "included": 1, "storageOption": "RAM", - "singleton": 0, + "singleton": 1, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "", "reportable": 1, - "minInterval": 1, + "minInterval": 0, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentSaturation", - "code": 1, + "name": "FeatureMap", + "code": 65532, "mfgCode": null, "side": "server", - "type": "int8u", - "included": 0, + "type": "bitmap32", + "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "CurrentX", - "code": 3, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", "type": "int16u", @@ -8184,84 +8206,124 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x616B", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Fixed Label", + "code": 64, + "mfgCode": null, + "define": "FIXED_LABEL_CLUSTER", + "side": "client", + "enabled": 1, + "attributes": [ { - "name": "CurrentY", - "code": 4, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, - "side": "server", + "side": "client", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x607D", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - }, + } + ] + }, + { + "name": "Fixed Label", + "code": 64, + "mfgCode": null, + "define": "FIXED_LABEL_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ { - "name": "ColorTemperatureMireds", - "code": 7, + "name": "label list", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", - "included": 0, - "storageOption": "RAM", + "type": "array", + "included": 1, + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "0x00FA", + "defaultValue": "", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 }, { - "name": "Options", - "code": 15, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0x00", + "defaultValue": "1", "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, + "minInterval": 0, + "maxInterval": 65344, "reportableChange": 0 - }, + } + ] + }, + { + "name": "User Label", + "code": 65, + "mfgCode": null, + "define": "USER_LABEL_CLUSTER", + "side": "client", + "enabled": 0, + "attributes": [ { - "name": "CoupleColorTempToLevelMinMireds", - "code": 16397, + "name": "ClusterRevision", + "code": 65533, "mfgCode": null, - "side": "server", + "side": "client", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - }, + } + ] + }, + { + "name": "User Label", + "code": 65, + "mfgCode": null, + "define": "USER_LABEL_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ { - "name": "StartUpColorTemperatureMireds", - "code": 16400, + "name": "label list", + "code": 0, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "array", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -8293,10 +8355,10 @@ "side": "server", "type": "int16u", "included": 1, - "storageOption": "RAM", + "storageOption": "External", "singleton": 0, "bounded": 0, - "defaultValue": "5", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8305,29 +8367,39 @@ ] }, { - "name": "Localization Configuration", - "code": 43, + "name": "Color Control", + "code": 768, "mfgCode": null, - "define": "LOCALIZATION_CONFIGURATION_CLUSTER", + "define": "COLOR_CONTROL_CLUSTER", "side": "client", - "enabled": 1, - "attributes": [ + "enabled": 0, + "commands": [ { - "name": "FeatureMap", - "code": 65532, + "name": "MoveToColor", + "code": 7, "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 + "source": "client", + "incoming": 1, + "outgoing": 0 + }, + { + "name": "MoveColor", + "code": 8, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 }, + { + "name": "StepColor", + "code": 9, + "mfgCode": null, + "source": "client", + "incoming": 1, + "outgoing": 0 + } + ], + "attributes": [ { "name": "ClusterRevision", "code": 65533, @@ -8338,135 +8410,147 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "5", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 } ] }, { - "name": "Localization Configuration", - "code": 43, + "name": "Color Control", + "code": 768, "mfgCode": null, - "define": "LOCALIZATION_CONFIGURATION_CLUSTER", + "define": "COLOR_CONTROL_CLUSTER", "side": "server", "enabled": 1, "attributes": [ { - "name": "ActiveLocale", + "name": "CurrentHue", "code": 0, "mfgCode": null, "side": "server", - "type": "char_string", - "included": 1, + "type": "int8u", + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x00", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "SupportedLocales", + "name": "CurrentSaturation", "code": 1, "mfgCode": null, "side": "server", - "type": "array", + "type": "int8u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "CurrentX", + "code": 3, + "mfgCode": null, + "side": "server", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "", + "defaultValue": "0x616B", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 }, { - "name": "FeatureMap", - "code": 65532, + "name": "CurrentY", + "code": 4, "mfgCode": null, "side": "server", - "type": "bitmap32", + "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "0x607D", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, { - "name": "ClusterRevision", - "code": 65533, + "name": "ColorTemperatureMireds", + "code": 7, "mfgCode": null, "side": "server", "type": "int16u", + "included": 0, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0x00FA", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "Options", + "code": 15, + "mfgCode": null, + "side": "server", + "type": "bitmap8", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "0x00", "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, + "minInterval": 1, + "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Unit Localization", - "code": 45, - "mfgCode": null, - "define": "UNIT_LOCALIZATION_CLUSTER", - "side": "client", - "enabled": 1, - "attributes": [ + }, { - "name": "ClusterRevision", - "code": 65533, + "name": "CoupleColorTempToLevelMinMireds", + "code": 16397, "mfgCode": null, - "side": "client", + "side": "server", "type": "int16u", "included": 1, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 - } - ] - }, - { - "name": "Unit Localization", - "code": 45, - "mfgCode": null, - "define": "UNIT_LOCALIZATION_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ + }, { - "name": "temperature unit", - "code": 0, + "name": "StartUpColorTemperatureMireds", + "code": 16400, "mfgCode": null, "side": "server", - "type": "TempUnit", + "type": "int16u", "included": 1, "storageOption": "RAM", - "singleton": 1, + "singleton": 0, "bounded": 0, "defaultValue": "", "reportable": 1, - "minInterval": 0, + "minInterval": 1, "maxInterval": 65534, "reportableChange": 0 }, @@ -8496,7 +8580,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "5", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -8505,7 +8589,7 @@ ] }, { - "name": "Occupancy Sensor", + "name": "Occupancy Sensing", "code": 1030, "mfgCode": null, "define": "OCCUPANCY_SENSING_CLUSTER", @@ -8529,9 +8613,9 @@ "reportableChange": 0 } ] - }, + }, { - "name": "Occupancy Sensor", + "name": "Occupancy Sensing", "code": 1030, "mfgCode": null, "define": "OCCUPANCY_SENSING_CLUSTER", @@ -8539,7 +8623,7 @@ "enabled": 1, "attributes": [ { - "name": "Occupancy", + "name": "occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8555,7 +8639,7 @@ "reportableChange": 0 }, { - "name": "OccupancySensorType", + "name": "occupancy sensor type", "code": 1, "mfgCode": null, "side": "server", @@ -8571,7 +8655,7 @@ "reportableChange": 0 }, { - "name": "OccupancySensorTypeBitmap", + "name": "occupancy sensor type bitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8587,7 +8671,7 @@ "reportableChange": 0 }, { - "name": "PIROccupiedToUnoccupiedDelay", + "name": "PIR occupied to unoccupied delay", "code": 16, "mfgCode": null, "side": "server", @@ -8603,7 +8687,7 @@ "reportableChange": 0 }, { - "name": "PIRUnoccupiedToOccupiedDelay", + "name": "PIR unoccupied to occupied delay", "code": 17, "mfgCode": null, "side": "server", @@ -8619,11 +8703,11 @@ "reportableChange": 0 }, { - "name": "PIRUnoccupiedToOccupiedThreshold", + "name": "PIR unoccupied to occupied threshold", "code": 18, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8635,7 +8719,7 @@ "reportableChange": 0 }, { - "name": "UltrasonicOccupiedToUnoccupiedDelay", + "name": "ultrasonic occupied to unoccupied delay", "code": 32, "mfgCode": null, "side": "server", @@ -8651,7 +8735,7 @@ "reportableChange": 0 }, { - "name": "UltrasonicUnoccupiedToOccupiedDelay", + "name": "ultrasonic unoccupied to occupied delay", "code": 33, "mfgCode": null, "side": "server", @@ -8667,7 +8751,7 @@ "reportableChange": 0 }, { - "name": "UltrasonicUnoccupiedToOccupiedThreshold", + "name": "ultrasonic unoccupied to occupied threshold", "code": 34, "mfgCode": null, "side": "server", @@ -8683,7 +8767,7 @@ "reportableChange": 0 }, { - "name": "PhysicalContactOccupiedToUnoccupiedDelay", + "name": "physical contact occupied to unoccupied delay", "code": 48, "mfgCode": null, "side": "server", @@ -8699,7 +8783,7 @@ "reportableChange": 0 }, { - "name": "PhysicalContactUnoccupiedToOccupiedDelay", + "name": "physical contact unoccupied to occupied delay", "code": 49, "mfgCode": null, "side": "server", @@ -8715,7 +8799,7 @@ "reportableChange": 0 }, { - "name": "PhysicalContactUnoccupiedToOccupiedThreshold", + "name": "physical contact unoccupied to occupied threshold", "code": 50, "mfgCode": null, "side": "server", @@ -8729,7 +8813,7 @@ "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 - }, + }, { "name": "GeneratedCommandList", "code": 65528, @@ -8811,90 +8895,6 @@ "reportableChange": 0 } ] - }, - { - "name": "User Label", - "code": 65, - "mfgCode": null, - "define": "USER_LABEL_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "User Label", - "code": 65, - "mfgCode": null, - "define": "USER_LABEL_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "LabelList", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "External", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] } ] } diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 5d2f46b4ebedf2..ce4e2c70f33e50 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -920,6 +920,206 @@ } ] }, + { + "name": "Localization Configuration", + "code": 43, + "mfgCode": null, + "define": "LOCALIZATION_CONFIGURATION_CLUSTER", + "side": "client", + "enabled": 0, + "attributes": [ + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "client", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Localization Configuration", + "code": 43, + "mfgCode": null, + "define": "LOCALIZATION_CONFIGURATION_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "ActiveLocale", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "char_string", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "SupportedLocales", + "code": 1, + "mfgCode": null, + "side": "server", + "type": "array", + "included": 1, + "storageOption": "External", + "singleton": 0, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65344, + "reportableChange": 0 + } + ] + }, + { + "name": "Unit Localization", + "code": 45, + "mfgCode": null, + "define": "UNIT_LOCALIZATION_CLUSTER", + "side": "client", + "enabled": 0, + "attributes": [ + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "client", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, + { + "name": "Unit Localization", + "code": 45, + "mfgCode": null, + "define": "UNIT_LOCALIZATION_CLUSTER", + "side": "server", + "enabled": 1, + "attributes": [ + { + "name": "TemperatureUnit", + "code": 0, + "mfgCode": null, + "side": "server", + "type": "TempUnit", + "included": 1, + "storageOption": "RAM", + "singleton": 1, + "bounded": 0, + "defaultValue": "", + "reportable": 1, + "minInterval": 0, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "FeatureMap", + "code": 65532, + "mfgCode": null, + "side": "server", + "type": "bitmap32", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "0", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + }, + { + "name": "ClusterRevision", + "code": 65533, + "mfgCode": null, + "side": "server", + "type": "int16u", + "included": 1, + "storageOption": "RAM", + "singleton": 0, + "bounded": 0, + "defaultValue": "1", + "reportable": 1, + "minInterval": 1, + "maxInterval": 65534, + "reportableChange": 0 + } + ] + }, { "name": "Power Source Configuration", "code": 46, @@ -2450,206 +2650,6 @@ } ] }, - { - "name": "Localization Configuration", - "code": 43, - "mfgCode": null, - "define": "LOCALIZATION_CONFIGURATION_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "client", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Localization Configuration", - "code": 43, - "mfgCode": null, - "define": "LOCALIZATION_CONFIGURATION_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "ActiveLocale", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "char_string", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "SupportedLocales", - "code": 1, - "mfgCode": null, - "side": "server", - "type": "array", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65344, - "reportableChange": 0 - } - ] - }, - { - "name": "Unit Localization", - "code": 45, - "mfgCode": null, - "define": "UNIT_LOCALIZATION_CLUSTER", - "side": "client", - "enabled": 0, - "attributes": [ - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "client", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, - { - "name": "Unit Localization", - "code": 45, - "mfgCode": null, - "define": "UNIT_LOCALIZATION_CLUSTER", - "side": "server", - "enabled": 1, - "attributes": [ - { - "name": "temperature unit", - "code": 0, - "mfgCode": null, - "side": "server", - "type": "TempUnit", - "included": 1, - "storageOption": "RAM", - "singleton": 1, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 0, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "FeatureMap", - "code": 65532, - "mfgCode": null, - "side": "server", - "type": "bitmap32", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "0", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, - { - "name": "ClusterRevision", - "code": 65533, - "mfgCode": null, - "side": "server", - "type": "int16u", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "1", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - } - ] - }, { "name": "WiFi Network Diagnostics", "code": 54, @@ -3209,7 +3209,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -3225,7 +3225,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -3241,7 +3241,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", @@ -3763,7 +3763,7 @@ "enabled": 1, "attributes": [ { - "name": "LabelList", + "name": "label list", "code": 0, "mfgCode": null, "side": "server", @@ -8589,7 +8589,7 @@ ] }, { - "name": "Occupancy Sensor", + "name": "Occupancy Sensing", "code": 1030, "mfgCode": null, "define": "OCCUPANCY_SENSING_CLUSTER", @@ -8613,9 +8613,9 @@ "reportableChange": 0 } ] - }, + }, { - "name": "Occupancy Sensor", + "name": "Occupancy Sensing", "code": 1030, "mfgCode": null, "define": "OCCUPANCY_SENSING_CLUSTER", @@ -8623,7 +8623,7 @@ "enabled": 1, "attributes": [ { - "name": "Occupancy", + "name": "occupancy", "code": 0, "mfgCode": null, "side": "server", @@ -8639,7 +8639,7 @@ "reportableChange": 0 }, { - "name": "OccupancySensorType", + "name": "occupancy sensor type", "code": 1, "mfgCode": null, "side": "server", @@ -8655,7 +8655,7 @@ "reportableChange": 0 }, { - "name": "OccupancySensorTypeBitmap", + "name": "occupancy sensor type bitmap", "code": 2, "mfgCode": null, "side": "server", @@ -8671,7 +8671,7 @@ "reportableChange": 0 }, { - "name": "PIROccupiedToUnoccupiedDelay", + "name": "PIR occupied to unoccupied delay", "code": 16, "mfgCode": null, "side": "server", @@ -8687,7 +8687,7 @@ "reportableChange": 0 }, { - "name": "PIRUnoccupiedToOccupiedDelay", + "name": "PIR unoccupied to occupied delay", "code": 17, "mfgCode": null, "side": "server", @@ -8703,11 +8703,11 @@ "reportableChange": 0 }, { - "name": "PIRUnoccupiedToOccupiedThreshold", + "name": "PIR unoccupied to occupied threshold", "code": 18, "mfgCode": null, "side": "server", - "type": "bitmap8", + "type": "int8u", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8719,7 +8719,7 @@ "reportableChange": 0 }, { - "name": "UltrasonicOccupiedToUnoccupiedDelay", + "name": "ultrasonic occupied to unoccupied delay", "code": 32, "mfgCode": null, "side": "server", @@ -8735,7 +8735,7 @@ "reportableChange": 0 }, { - "name": "UltrasonicUnoccupiedToOccupiedDelay", + "name": "ultrasonic unoccupied to occupied delay", "code": 33, "mfgCode": null, "side": "server", @@ -8751,7 +8751,7 @@ "reportableChange": 0 }, { - "name": "UltrasonicUnoccupiedToOccupiedThreshold", + "name": "ultrasonic unoccupied to occupied threshold", "code": 34, "mfgCode": null, "side": "server", @@ -8767,7 +8767,7 @@ "reportableChange": 0 }, { - "name": "PhysicalContactOccupiedToUnoccupiedDelay", + "name": "physical contact occupied to unoccupied delay", "code": 48, "mfgCode": null, "side": "server", @@ -8783,7 +8783,7 @@ "reportableChange": 0 }, { - "name": "PhysicalContactUnoccupiedToOccupiedDelay", + "name": "physical contact unoccupied to occupied delay", "code": 49, "mfgCode": null, "side": "server", @@ -8799,7 +8799,7 @@ "reportableChange": 0 }, { - "name": "PhysicalContactUnoccupiedToOccupiedThreshold", + "name": "physical contact unoccupied to occupied threshold", "code": 50, "mfgCode": null, "side": "server", @@ -8813,7 +8813,7 @@ "minInterval": 0, "maxInterval": 65344, "reportableChange": 0 - }, + }, { "name": "GeneratedCommandList", "code": 65528, diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 46a2ac12d79943..8b877ec020972d 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -4537,7 +4537,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -4553,7 +4553,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -4569,7 +4569,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", @@ -9655,7 +9655,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -9671,7 +9671,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -9687,7 +9687,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "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 f1a89a06e0b4aa..b80cbc91ef162f 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -4347,7 +4347,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -4363,7 +4363,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -4379,7 +4379,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "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 c5dc34bdaec6af..bd9dbc271e6268 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 @@ -4297,7 +4297,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -4313,7 +4313,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -4329,7 +4329,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", @@ -8957,7 +8957,7 @@ "enabled": 1, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -8973,7 +8973,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -8989,7 +8989,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml index d8427993b96923..a8c7ee1b608f51 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml @@ -33,7 +33,7 @@ tests: - label: "Read NumberOfPositions attribute" command: "readAttribute" - attribute: "number of positions" + attribute: "NumberOfPositions" response: saveAs: NumberOfPositionsValue constraints: @@ -43,7 +43,7 @@ tests: - label: "Read CurrentPosition attribute" command: "readAttribute" - attribute: "current position" + attribute: "CurrentPosition" response: constraints: type: int8u @@ -53,7 +53,7 @@ tests: - label: "Read MultiPressMax attribute" PICS: SWTCH.S.F04 command: "readAttribute" - attribute: "multi press max" + attribute: "MultiPressMax" response: constraints: type: int8u diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_3_1_Simulated.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_3_1_Simulated.yaml index 5abe615c0ef319..a21c04ca722c9a 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_3_1_Simulated.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_3_1_Simulated.yaml @@ -26,12 +26,12 @@ tests: - label: "Read NumberOfPositions attribute" wait: "readAttribute" - attribute: "number of positions" + attribute: "NumberOfPositions" - label: "Read CurrentPosition attribute" wait: "readAttribute" - attribute: "current position" + attribute: "CurrentPosition" - label: "Read MultiPressMax attribute" wait: "readAttribute" - attribute: "multi press max" + attribute: "MultiPressMax" diff --git a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml index 8bb770d56a291f..d8ef3ec5c09bf9 100644 --- a/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml @@ -30,36 +30,36 @@ Interactions with the switch device are exposed as attributes (for the latching - number of positions - current position - multi press max + NumberOfPositions + CurrentPosition + MultiPressMax - Switch Latched + SwitchLatched - Initial Press + InitialPress - Long Press + LongPress - Short Release + ShortRelease - Long Release + LongRelease - MultiPress Ongoing + MultiPressOngoing - MultiPress Complete + MultiPressComplete @@ -68,11 +68,11 @@ Interactions with the switch device are exposed as attributes (for the latching - - - - - + + + + + diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 4c391a42914818..4d4f1497afbe59 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -7829,7 +7829,7 @@ "enabled": 0, "attributes": [ { - "name": "number of positions", + "name": "NumberOfPositions", "code": 0, "mfgCode": null, "side": "server", @@ -7845,7 +7845,7 @@ "reportableChange": 0 }, { - "name": "current position", + "name": "CurrentPosition", "code": 1, "mfgCode": null, "side": "server", @@ -7861,7 +7861,7 @@ "reportableChange": 0 }, { - "name": "multi press max", + "name": "MultiPressMax", "code": 2, "mfgCode": null, "side": "server", diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 79c7d3aa093c36..3de24e29e05fe3 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -36,6 +36,8 @@ # * "ids": Can contain clusters, attributes, commands, events as described # above inside it, but just indicates whether the id was # introduced/deprecated, not the construct itself. +# * "command payloads": Lists commands only, if we introduced the payload without +# actually exposing API for the command. # * "global attributes": An array of names of global attributes. # * "apis": An array of API labels that codegen can use. # 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 f7d01747746db2..20f3dabbd680c6 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -872,9 +872,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* current position */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* multi press max */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentPosition */ \ + { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* MultiPressMax */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index fc8eff8b6e62e2..362705be57112e 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -626,8 +626,8 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* current position */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentPosition */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(1) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index 1ec2bd2a6003f8..25318d5df955a7 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -503,9 +503,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* current position */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* multi press max */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* CurrentPosition */ \ + { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* MultiPressMax */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h index 5782ccff897af0..231cbaf71d1dfb 100644 --- a/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_fan_7N2TobIlOX/zap-generated/endpoint_config.h @@ -244,8 +244,8 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* current position */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentPosition */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ 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 ae348017a890a6..9fb3f7025187bc 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6364,17 +6364,17 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case Switch::Attributes::NumberOfPositions::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("number of positions", 1, value); + return DataModelLogger::LogValue("NumberOfPositions", 1, value); } case Switch::Attributes::CurrentPosition::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("current position", 1, value); + return DataModelLogger::LogValue("CurrentPosition", 1, value); } case Switch::Attributes::MultiPressMax::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("multi press max", 1, value); + return DataModelLogger::LogValue("MultiPressMax", 1, value); } case Switch::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; diff --git a/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h b/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h index 1ec2bd2a6003f8..25318d5df955a7 100644 --- a/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/dynamic-bridge-app/zap-generated/endpoint_config.h @@ -503,9 +503,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* current position */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* multi press max */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(1) }, /* CurrentPosition */ \ + { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* MultiPressMax */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index 813b729d5c95a5..c0e714b566b02c 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -470,8 +470,8 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 2, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* current position */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(0) }, /* CurrentPosition */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(2) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ } diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index ef376538064083..5f3291395e4578 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -336,9 +336,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* current position */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* multi press max */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentPosition */ \ + { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* MultiPressMax */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index 8178333b2e0d40..f9fda829d64fc8 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -349,9 +349,9 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 0, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* current position */ \ - { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* multi press max */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentPosition */ \ + { 0x00000002, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* MultiPressMax */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index bafd2d9c704b1f..25008cde376fc7 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -536,8 +536,8 @@ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Switch (server) */ \ - { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* number of positions */ \ - { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* current position */ \ + { 0x00000000, ZAP_TYPE(INT8U), 1, 0, ZAP_SIMPLE_DEFAULT(2) }, /* NumberOfPositions */ \ + { 0x00000001, ZAP_TYPE(INT8U), 1, 0, ZAP_EMPTY_DEFAULT() }, /* CurrentPosition */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ \