From 6e12e925eb88f1287ecc15a0f74f9e64e920b141 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Tue, 24 Jan 2023 20:52:05 -0500 Subject: [PATCH] Align naming in Scenes cluster XML with the spec. (#24625) * Align naming in Scenes cluster XML with the spec. * Regenerate generated code. --- .../all-clusters-app.matter | 60 +- .../all-clusters-minimal-app.matter | 56 +- .../bridge-common/bridge-app.matter | 4 - ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 4 - ...de_colortemperaturelight_hbUnzYVeyn.matter | 4 - .../rootnode_dimmablelight_bCwGYSDpoe.matter | 4 - ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 4 - ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 4 - .../rootnode_onofflight_bbs1b7IaOV.matter | 4 - ...ootnode_onofflightswitch_FsPlMr090Q.matter | 8 - ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 4 - .../rootnode_speaker_RpzeXdimqA.matter | 4 - .../bridge-common/bridge-app.matter | 4 - .../light-switch-app.matter | 56 +- .../lighting-common/lighting-app.matter | 4 - .../nxp/zap/lighting-on-off.matter | 4 - examples/lock-app/lock-common/lock-app.matter | 4 - .../ota-requestor-app.matter | 4 - .../placeholder/linux/apps/app1/config.matter | 60 +- .../placeholder/linux/apps/app2/config.matter | 60 +- examples/pump-app/pump-common/pump-app.matter | 4 - .../pump-controller-app.matter | 4 - .../thermostat-common/thermostat.matter | 52 +- examples/tv-app/tv-common/tv-app.matter | 4 - .../tv-casting-common/tv-casting-app.matter | 60 +- examples/window-app/common/window-app.matter | 52 +- src/app/clusters/scenes/scenes.cpp | 26 +- .../zcl/data-model/chip/scene.xml | 78 +-- .../data_model/controller-clusters.matter | 56 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 156 ++--- .../chip/devicecontroller/ChipClusters.java | 112 ++-- .../chip/devicecontroller/ChipStructs.java | 20 +- .../devicecontroller/ClusterInfoMapping.java | 150 ++--- .../python/chip/clusters/CHIPClusters.py | 26 +- .../python/chip/clusters/Objects.py | 158 ++--- .../CHIP/templates/availability.yaml | 191 +++++- .../CHIP/zap-generated/MTRBaseClusters.h | 8 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 56 +- .../CHIP/zap-generated/MTRCallbackBridge.mm | 48 +- .../CHIP/zap-generated/MTRClusters.mm | 56 +- .../zap-generated/MTRCommandPayloadsObjc.h | 237 ++++++- .../zap-generated/MTRCommandPayloadsObjc.mm | 626 +++++++++++++++--- .../CHIP/zap-generated/MTRStructsObjc.h | 8 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 36 +- .../app-common/zap-generated/callback.h | 18 +- .../app-common/zap-generated/cluster-enums.h | 12 +- .../zap-generated/cluster-objects.cpp | 232 +++---- .../zap-generated/cluster-objects.h | 236 +++---- .../zap-generated/cluster/Commands.h | 40 +- .../cluster/ComplexArgumentParser.cpp | 16 +- .../cluster/logging/DataModelLogger.cpp | 40 +- .../zap-generated/cluster/Commands.h | 96 +-- 52 files changed, 1991 insertions(+), 1279 deletions(-) diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 83126e8d9e74ba..6b121545e8db80 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 @@ -108,17 +108,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -131,52 +135,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -184,25 +188,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -245,10 +249,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; @@ -292,10 +292,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index cb715aace82caf..a600995b60cdfa 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -107,17 +107,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -130,52 +134,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -183,25 +187,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -244,10 +248,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 9ad049a62dd53c..12d4bf0330abc9 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -75,10 +75,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 050a119036d258..074abc58c8897f 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -132,10 +132,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index a73febd35b22ab..37ddc92e299bcd 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -138,10 +138,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly nosubscribe attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 5f2806abc28224..45473a2e4140b3 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -132,10 +132,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index 29a4b8ca37a86c..a2520e905c4478 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -132,10 +132,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index f90838ab7e8fb8..f2d7633500a71d 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -132,10 +132,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 580ace00aef332..4a2bf2810685a4 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -132,10 +132,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 277af201cfc145..861c60deef8bef 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -132,10 +132,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; @@ -178,10 +174,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 22a24464488aa5..237b62a61af864 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -132,10 +132,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 23b37a6390cf72..71a51a8ad27c61 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -129,10 +129,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter index 9ad049a62dd53c..12d4bf0330abc9 100644 --- a/examples/dynamic-bridge-app/bridge-common/bridge-app.matter +++ b/examples/dynamic-bridge-app/bridge-common/bridge-app.matter @@ -75,10 +75,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; 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 5809b1a6b1ca41..80ce834e080870 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 @@ -143,17 +143,21 @@ server cluster Groups = 4 { } client cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -166,52 +170,52 @@ client cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -219,25 +223,25 @@ client cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -280,10 +284,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 08d65c1210d1bd..55b96977afcc26 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -137,10 +137,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 9cb8188a05df26..6114c82e64eaa2 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -138,10 +138,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly nosubscribe attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 236536d36f27ff..ee9b2f66387879 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -71,10 +71,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 03ad652e3d1638..5f60378d897bad 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -137,10 +137,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 483d167fb11996..a450e3060fa3ba 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -102,17 +102,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -125,52 +129,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -178,25 +182,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -239,10 +243,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; @@ -300,10 +300,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 2931da30072bbb..28dd9286eddd09 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -102,17 +102,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -125,52 +129,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -178,25 +182,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -239,10 +243,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; @@ -300,10 +300,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index a115a3f11bbabe..1e97e38e112bb2 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -69,10 +69,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 3465b3d2f2531e..b407eddb02e656 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -69,10 +69,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index a15060632caa3c..95cc23327b23b0 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -137,17 +137,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -160,52 +164,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -213,25 +217,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index d8ec1ac03e2590..105bfb2a7f654b 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -41,10 +41,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 313ef0dece7880..30dd570ec0d003 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -102,17 +102,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -125,52 +129,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -178,25 +182,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -239,10 +243,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; @@ -286,10 +286,6 @@ server cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index c3ec3827ddc565..47230a0e09dd18 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -114,17 +114,21 @@ server cluster Groups = 4 { } server cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -140,52 +144,52 @@ server cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -193,25 +197,25 @@ server cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } diff --git a/src/app/clusters/scenes/scenes.cpp b/src/app/clusters/scenes/scenes.cpp index b17e12c8fbc92d..580f6234c388ac 100644 --- a/src/app/clusters/scenes/scenes.cpp +++ b/src/app/clusters/scenes/scenes.cpp @@ -202,8 +202,8 @@ void emAfPluginScenesServerPrintInfo() bool emberAfScenesClusterAddSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::AddScene::DecodableType & commandData) { - auto & groupId = commandData.groupId; - auto & sceneId = commandData.sceneId; + auto & groupId = commandData.groupID; + auto & sceneId = commandData.sceneID; auto & transitionTime = commandData.transitionTime; auto & sceneName = commandData.sceneName; auto & extensionFieldSets = commandData.extensionFieldSets; @@ -215,8 +215,8 @@ bool emberAfScenesClusterAddSceneCallback(app::CommandHandler * commandObj, cons bool emberAfScenesClusterViewSceneCallback(app::CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::ViewScene::DecodableType & commandData) { - auto & groupId = commandData.groupId; - auto & sceneId = commandData.sceneId; + auto & groupId = commandData.groupID; + auto & sceneId = commandData.sceneID; return emberAfPluginScenesServerParseViewScene(commandObj, emberAfCurrentCommand(), groupId, sceneId); } @@ -225,8 +225,8 @@ bool emberAfScenesClusterRemoveSceneCallback(app::CommandHandler * commandObj, c const Commands::RemoveScene::DecodableType & commandData) { auto fabricIndex = commandObj->GetAccessingFabricIndex(); - auto & groupId = commandData.groupId; - auto & sceneId = commandData.sceneId; + auto & groupId = commandData.groupID; + auto & sceneId = commandData.sceneID; EmberAfStatus status = EMBER_ZCL_STATUS_NOT_FOUND; CHIP_ERROR err = CHIP_NO_ERROR; @@ -283,7 +283,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback(app::CommandHandler * commandOb const Commands::RemoveAllScenes::DecodableType & commandData) { auto fabricIndex = commandObj->GetAccessingFabricIndex(); - auto & groupId = commandData.groupId; + auto & groupId = commandData.groupID; EmberAfStatus status = EMBER_ZCL_STATUS_INVALID_COMMAND; CHIP_ERROR err = CHIP_NO_ERROR; @@ -334,8 +334,8 @@ bool emberAfScenesClusterStoreSceneCallback(app::CommandHandler * commandObj, co const Commands::StoreScene::DecodableType & commandData) { auto fabricIndex = commandObj->GetAccessingFabricIndex(); - auto & groupId = commandData.groupId; - auto & sceneId = commandData.sceneId; + auto & groupId = commandData.groupID; + auto & sceneId = commandData.sceneID; EmberAfStatus status; CHIP_ERROR err = CHIP_NO_ERROR; @@ -369,8 +369,8 @@ bool emberAfScenesClusterRecallSceneCallback(app::CommandHandler * commandObj, c const Commands::RecallScene::DecodableType & commandData) { auto fabricIndex = commandObj->GetAccessingFabricIndex(); - auto & groupId = commandData.groupId; - auto & sceneId = commandData.sceneId; + auto & groupId = commandData.groupID; + auto & sceneId = commandData.sceneID; // NOTE: TransitionTime field in the RecallScene command is currently // ignored. Per Zigbee Alliance ZCL 7 (07-5123-07): @@ -407,7 +407,7 @@ bool emberAfScenesClusterGetSceneMembershipCallback(app::CommandHandler * comman const Commands::GetSceneMembership::DecodableType & commandData) { auto fabricIndex = commandObj->GetAccessingFabricIndex(); - auto & groupId = commandData.groupId; + auto & groupId = commandData.groupID; CHIP_ERROR err = CHIP_NO_ERROR; EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; @@ -822,7 +822,7 @@ bool emberAfPluginScenesServerParseAddScene( { auto & fieldSet = fieldSetIter.GetValue(); - ClusterId clusterId = fieldSet.clusterId; + ClusterId clusterId = fieldSet.clusterID; // TODO: We need to encode scene field sets in TLV. // https://github.com/project-chip/connectedhomeip/issues/10334 diff --git a/src/app/zap-templates/zcl/data-model/chip/scene.xml b/src/app/zap-templates/zcl/data-model/chip/scene.xml index 3653e5c1db6530..e8e899b1bd54d7 100644 --- a/src/app/zap-templates/zcl/data-model/chip/scene.xml +++ b/src/app/zap-templates/zcl/data-model/chip/scene.xml @@ -22,7 +22,7 @@ limitations under the License. - + @@ -30,7 +30,7 @@ limitations under the License. - + @@ -56,8 +56,8 @@ limitations under the License. Add a scene to the scene table. Extension field sets are supported, and are inputed as '{"ClusterID": VALUE, "AttributeValueList":[{"AttributeId": VALUE, "AttributeValue": VALUE}]}' - - + + @@ -68,16 +68,16 @@ limitations under the License. Retrieves the requested scene entry from its Scene table. - - + + Removes the requested scene entry, corresponding to the value of the GroupID field, from its Scene Table - - + + @@ -85,7 +85,7 @@ limitations under the License. Remove all scenes, corresponding to the value of the GroupID field, from its Scene Table - + @@ -93,8 +93,8 @@ limitations under the License. Adds the scene entry into its Scene Table along with all extension field sets corresponding to the current state of other clusters on the same endpoint - - + + @@ -102,8 +102,8 @@ limitations under the License. Set the attributes and corresponding state for each other cluster implemented on the endpoint accordingly to the resquested scene entry in the Scene Table - - + + @@ -111,15 +111,15 @@ limitations under the License. Get an unused scene identifier when no commissioning tool is in the network, or for a commissioning tool to get the used scene identifiers within a certain group - + Allows a scene to be added using a finer scene transition time than the AddScene command. - - + + @@ -128,18 +128,18 @@ limitations under the License. Allows a scene to be retrieved using a finer scene transition time than the ViewScene command - - + + Allows a client to efficiently copy scenes from one group/scene identifier pair to another group/scene identifier pair. - - - - + + + + @@ -147,8 +147,8 @@ limitations under the License. The command is generated in response to a received unicast AddScene command, - - + + @@ -156,8 +156,8 @@ limitations under the License. The command is generated in response to a received unicast ViewScene command - - + + @@ -168,8 +168,8 @@ limitations under the License. The command is generated in response to a received unicast RemoveScene command - - + + @@ -177,7 +177,7 @@ limitations under the License. The command is generated in response to a received unicast RemoveAllScenes command - + @@ -185,8 +185,8 @@ limitations under the License. The command is generated in response to a received unicast StoreScene command - - + + @@ -195,7 +195,7 @@ limitations under the License. - + @@ -204,8 +204,8 @@ limitations under the License. The command is generated in response to a received unicast EnhancedAddScene command - - + + @@ -213,8 +213,8 @@ limitations under the License. The command is generated in response to a received unicast EnhancedViewScene command - - + + @@ -225,13 +225,13 @@ limitations under the License. The command is generated in response to a received unicast CopyScene command - - + + - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index b5c4392d8834ec..dd5be7df89a34c 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -119,17 +119,21 @@ client cluster Groups = 4 { } client cluster Scenes = 5 { + bitmap SceneFeatures : BITMAP32 { + kSceneNames = 0x1; + } + bitmap ScenesCopyMode : BITMAP8 { kCopyAllScenes = 0x1; } struct ExtensionFieldSet { - cluster_id clusterId = 0; + cluster_id clusterID = 0; AttributeValuePair attributeValueList[] = 1; } struct AttributeValuePair { - optional attrib_id attributeId = 0; + optional attrib_id attributeID = 0; int8u attributeValue[] = 1; } @@ -145,52 +149,52 @@ client cluster Scenes = 5 { readonly attribute int16u clusterRevision = 65533; request struct AddSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; INT16U transitionTime = 2; CHAR_STRING sceneName = 3; ExtensionFieldSet extensionFieldSets[] = 4; } request struct ViewSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RemoveAllScenesRequest { - group_id groupId = 0; + group_id groupID = 0; } request struct StoreSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; } request struct RecallSceneRequest { - group_id groupId = 0; - INT8U sceneId = 1; + group_id groupID = 0; + INT8U sceneID = 1; optional nullable INT16U transitionTime = 2; } request struct GetSceneMembershipRequest { - group_id groupId = 0; + group_id groupID = 0; } response struct AddSceneResponse = 0 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct ViewSceneResponse = 1 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; optional INT16U transitionTime = 3; optional CHAR_STRING sceneName = 4; optional ExtensionFieldSet extensionFieldSets[] = 5; @@ -198,25 +202,25 @@ client cluster Scenes = 5 { response struct RemoveSceneResponse = 2 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct RemoveAllScenesResponse = 3 { ENUM8 status = 0; - group_id groupId = 1; + group_id groupID = 1; } response struct StoreSceneResponse = 4 { ENUM8 status = 0; - group_id groupId = 1; - INT8U sceneId = 2; + group_id groupID = 1; + INT8U sceneID = 2; } response struct GetSceneMembershipResponse = 6 { ENUM8 status = 0; nullable INT8U capacity = 1; - group_id groupId = 2; + group_id groupID = 2; optional INT8U sceneList[] = 3; } @@ -259,10 +263,6 @@ client cluster OnOff = 6 { kLighting = 0x1; } - bitmap SceneFeatures : BITMAP32 { - kSceneNames = 0x1; - } - readonly attribute boolean onOff = 0; readonly attribute boolean globalSceneControl = 16384; attribute int16u onTime = 16385; diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index c008c2928d6635..3625bafd95a607 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -365,18 +365,18 @@ void CHIPScenesClusterAddSceneResponseCallback::CallbackFn( std::string StatusCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), dataResponse.status, Status); - jobject GroupId; - std::string GroupIdClassName = "java/lang/Integer"; - std::string GroupIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(), - dataResponse.groupId, GroupId); - jobject SceneId; - std::string SceneIdClassName = "java/lang/Integer"; - std::string SceneIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(), - dataResponse.sceneId, SceneId); - - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId); + jobject GroupID; + std::string GroupIDClassName = "java/lang/Integer"; + std::string GroupIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(), + dataResponse.groupID, GroupID); + jobject SceneID; + std::string SceneIDClassName = "java/lang/Integer"; + std::string SceneIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(SceneIDClassName.c_str(), SceneIDCtorSignature.c_str(), + dataResponse.sceneID, SceneID); + + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID, SceneID); } CHIPScenesClusterViewSceneResponseCallback::CHIPScenesClusterViewSceneResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -437,16 +437,16 @@ void CHIPScenesClusterViewSceneResponseCallback::CallbackFn( std::string StatusCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), dataResponse.status, Status); - jobject GroupId; - std::string GroupIdClassName = "java/lang/Integer"; - std::string GroupIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(), - dataResponse.groupId, GroupId); - jobject SceneId; - std::string SceneIdClassName = "java/lang/Integer"; - std::string SceneIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(), - dataResponse.sceneId, SceneId); + jobject GroupID; + std::string GroupIDClassName = "java/lang/Integer"; + std::string GroupIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(), + dataResponse.groupID, GroupID); + jobject SceneID; + std::string SceneIDClassName = "java/lang/Integer"; + std::string SceneIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(SceneIDClassName.c_str(), SceneIDCtorSignature.c_str(), + dataResponse.sceneID, SceneID); jobject TransitionTime; if (!dataResponse.transitionTime.HasValue()) { @@ -489,12 +489,12 @@ void CHIPScenesClusterViewSceneResponseCallback::CallbackFn( { auto & entry_1 = iter_ExtensionFieldSetsInsideOptional_1.GetValue(); jobject newElement_1; - jobject newElement_1_clusterId; - std::string newElement_1_clusterIdClassName = "java/lang/Long"; - std::string newElement_1_clusterIdCtorSignature = "(J)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_clusterIdClassName.c_str(), - newElement_1_clusterIdCtorSignature.c_str(), - entry_1.clusterId, newElement_1_clusterId); + jobject newElement_1_clusterID; + std::string newElement_1_clusterIDClassName = "java/lang/Long"; + std::string newElement_1_clusterIDCtorSignature = "(J)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_1_clusterIDClassName.c_str(), + newElement_1_clusterIDCtorSignature.c_str(), + entry_1.clusterID, newElement_1_clusterID); jobject newElement_1_attributeValueList; chip::JniReferences::GetInstance().CreateArrayList(newElement_1_attributeValueList); @@ -503,22 +503,22 @@ void CHIPScenesClusterViewSceneResponseCallback::CallbackFn( { auto & entry_3 = iter_newElement_1_attributeValueList_3.GetValue(); jobject newElement_3; - jobject newElement_3_attributeId; - if (!entry_3.attributeId.HasValue()) + jobject newElement_3_attributeID; + if (!entry_3.attributeID.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_3_attributeId); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_3_attributeID); } else { - jobject newElement_3_attributeIdInsideOptional; - std::string newElement_3_attributeIdInsideOptionalClassName = "java/lang/Long"; - std::string newElement_3_attributeIdInsideOptionalCtorSignature = "(J)V"; + jobject newElement_3_attributeIDInsideOptional; + std::string newElement_3_attributeIDInsideOptionalClassName = "java/lang/Long"; + std::string newElement_3_attributeIDInsideOptionalCtorSignature = "(J)V"; chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_3_attributeIdInsideOptionalClassName.c_str(), - newElement_3_attributeIdInsideOptionalCtorSignature.c_str(), entry_3.attributeId.Value(), - newElement_3_attributeIdInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_3_attributeIdInsideOptional, - newElement_3_attributeId); + newElement_3_attributeIDInsideOptionalClassName.c_str(), + newElement_3_attributeIDInsideOptionalCtorSignature.c_str(), entry_3.attributeID.Value(), + newElement_3_attributeIDInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_3_attributeIDInsideOptional, + newElement_3_attributeID); } jobject newElement_3_attributeValue; chip::JniReferences::GetInstance().CreateArrayList(newElement_3_attributeValue); @@ -552,7 +552,7 @@ void CHIPScenesClusterViewSceneResponseCallback::CallbackFn( } newElement_3 = env->NewObject(attributeValuePairStructClass_4, attributeValuePairStructCtor_4, - newElement_3_attributeId, newElement_3_attributeValue); + newElement_3_attributeID, newElement_3_attributeValue); chip::JniReferences::GetInstance().AddToList(newElement_1_attributeValueList, newElement_3); } @@ -572,14 +572,14 @@ void CHIPScenesClusterViewSceneResponseCallback::CallbackFn( return; } - newElement_1 = env->NewObject(extensionFieldSetStructClass_2, extensionFieldSetStructCtor_2, newElement_1_clusterId, + newElement_1 = env->NewObject(extensionFieldSetStructClass_2, extensionFieldSetStructCtor_2, newElement_1_clusterID, newElement_1_attributeValueList); chip::JniReferences::GetInstance().AddToList(ExtensionFieldSetsInsideOptional, newElement_1); } chip::JniReferences::GetInstance().CreateOptional(ExtensionFieldSetsInsideOptional, ExtensionFieldSets); } - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId, TransitionTime, SceneName, ExtensionFieldSets); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID, SceneID, TransitionTime, SceneName, ExtensionFieldSets); } CHIPScenesClusterRemoveSceneResponseCallback::CHIPScenesClusterRemoveSceneResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -638,18 +638,18 @@ void CHIPScenesClusterRemoveSceneResponseCallback::CallbackFn( std::string StatusCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), dataResponse.status, Status); - jobject GroupId; - std::string GroupIdClassName = "java/lang/Integer"; - std::string GroupIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(), - dataResponse.groupId, GroupId); - jobject SceneId; - std::string SceneIdClassName = "java/lang/Integer"; - std::string SceneIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(), - dataResponse.sceneId, SceneId); - - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId); + jobject GroupID; + std::string GroupIDClassName = "java/lang/Integer"; + std::string GroupIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(), + dataResponse.groupID, GroupID); + jobject SceneID; + std::string SceneIDClassName = "java/lang/Integer"; + std::string SceneIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(SceneIDClassName.c_str(), SceneIDCtorSignature.c_str(), + dataResponse.sceneID, SceneID); + + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID, SceneID); } CHIPScenesClusterRemoveAllScenesResponseCallback::CHIPScenesClusterRemoveAllScenesResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -708,13 +708,13 @@ void CHIPScenesClusterRemoveAllScenesResponseCallback::CallbackFn( std::string StatusCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), dataResponse.status, Status); - jobject GroupId; - std::string GroupIdClassName = "java/lang/Integer"; - std::string GroupIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(), - dataResponse.groupId, GroupId); + jobject GroupID; + std::string GroupIDClassName = "java/lang/Integer"; + std::string GroupIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(), + dataResponse.groupID, GroupID); - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID); } CHIPScenesClusterStoreSceneResponseCallback::CHIPScenesClusterStoreSceneResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -773,18 +773,18 @@ void CHIPScenesClusterStoreSceneResponseCallback::CallbackFn( std::string StatusCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), dataResponse.status, Status); - jobject GroupId; - std::string GroupIdClassName = "java/lang/Integer"; - std::string GroupIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(), - dataResponse.groupId, GroupId); - jobject SceneId; - std::string SceneIdClassName = "java/lang/Integer"; - std::string SceneIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(SceneIdClassName.c_str(), SceneIdCtorSignature.c_str(), - dataResponse.sceneId, SceneId); - - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupId, SceneId); + jobject GroupID; + std::string GroupIDClassName = "java/lang/Integer"; + std::string GroupIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(), + dataResponse.groupID, GroupID); + jobject SceneID; + std::string SceneIDClassName = "java/lang/Integer"; + std::string SceneIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(SceneIDClassName.c_str(), SceneIDCtorSignature.c_str(), + dataResponse.sceneID, SceneID); + + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, GroupID, SceneID); } CHIPScenesClusterGetSceneMembershipResponseCallback::CHIPScenesClusterGetSceneMembershipResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) @@ -857,11 +857,11 @@ void CHIPScenesClusterGetSceneMembershipResponseCallback::CallbackFn( chip::JniReferences::GetInstance().CreateBoxedObject(CapacityClassName.c_str(), CapacityCtorSignature.c_str(), dataResponse.capacity.Value(), Capacity); } - jobject GroupId; - std::string GroupIdClassName = "java/lang/Integer"; - std::string GroupIdCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(GroupIdClassName.c_str(), GroupIdCtorSignature.c_str(), - dataResponse.groupId, GroupId); + jobject GroupID; + std::string GroupIDClassName = "java/lang/Integer"; + std::string GroupIDCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(GroupIDClassName.c_str(), GroupIDCtorSignature.c_str(), + dataResponse.groupID, GroupID); jobject SceneList; if (!dataResponse.sceneList.HasValue()) { @@ -886,7 +886,7 @@ void CHIPScenesClusterGetSceneMembershipResponseCallback::CallbackFn( chip::JniReferences::GetInstance().CreateOptional(SceneListInsideOptional, SceneList); } - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Capacity, GroupId, SceneList); + env->CallVoidMethod(javaCallbackRef, javaMethod, Status, Capacity, GroupID, SceneList); } CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback::CHIPOtaSoftwareUpdateProviderClusterQueryImageResponseCallback( jobject javaCallback) : diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 3d091494df2d02..6a6058623a10f3 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -602,16 +602,16 @@ public ScenesCluster(long devicePtr, int endpointId) { public void addScene( AddSceneResponseCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, Integer transitionTime, String sceneName, ArrayList extensionFieldSets) { addScene( chipClusterPtr, callback, - groupId, - sceneId, + groupID, + sceneID, transitionTime, sceneName, extensionFieldSets, @@ -620,8 +620,8 @@ public void addScene( public void addScene( AddSceneResponseCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, Integer transitionTime, String sceneName, ArrayList extensionFieldSets, @@ -629,91 +629,91 @@ public void addScene( addScene( chipClusterPtr, callback, - groupId, - sceneId, + groupID, + sceneID, transitionTime, sceneName, extensionFieldSets, timedInvokeTimeoutMs); } - public void viewScene(ViewSceneResponseCallback callback, Integer groupId, Integer sceneId) { - viewScene(chipClusterPtr, callback, groupId, sceneId, null); + public void viewScene(ViewSceneResponseCallback callback, Integer groupID, Integer sceneID) { + viewScene(chipClusterPtr, callback, groupID, sceneID, null); } public void viewScene( ViewSceneResponseCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, int timedInvokeTimeoutMs) { - viewScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs); + viewScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs); } public void removeScene( - RemoveSceneResponseCallback callback, Integer groupId, Integer sceneId) { - removeScene(chipClusterPtr, callback, groupId, sceneId, null); + RemoveSceneResponseCallback callback, Integer groupID, Integer sceneID) { + removeScene(chipClusterPtr, callback, groupID, sceneID, null); } public void removeScene( RemoveSceneResponseCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, int timedInvokeTimeoutMs) { - removeScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs); + removeScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs); } - public void removeAllScenes(RemoveAllScenesResponseCallback callback, Integer groupId) { - removeAllScenes(chipClusterPtr, callback, groupId, null); + public void removeAllScenes(RemoveAllScenesResponseCallback callback, Integer groupID) { + removeAllScenes(chipClusterPtr, callback, groupID, null); } public void removeAllScenes( - RemoveAllScenesResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) { - removeAllScenes(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs); + RemoveAllScenesResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) { + removeAllScenes(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs); } - public void storeScene(StoreSceneResponseCallback callback, Integer groupId, Integer sceneId) { - storeScene(chipClusterPtr, callback, groupId, sceneId, null); + public void storeScene(StoreSceneResponseCallback callback, Integer groupID, Integer sceneID) { + storeScene(chipClusterPtr, callback, groupID, sceneID, null); } public void storeScene( StoreSceneResponseCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, int timedInvokeTimeoutMs) { - storeScene(chipClusterPtr, callback, groupId, sceneId, timedInvokeTimeoutMs); + storeScene(chipClusterPtr, callback, groupID, sceneID, timedInvokeTimeoutMs); } public void recallScene( DefaultClusterCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, @Nullable Optional transitionTime) { - recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, null); + recallScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, null); } public void recallScene( DefaultClusterCallback callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, @Nullable Optional transitionTime, int timedInvokeTimeoutMs) { - recallScene(chipClusterPtr, callback, groupId, sceneId, transitionTime, timedInvokeTimeoutMs); + recallScene(chipClusterPtr, callback, groupID, sceneID, transitionTime, timedInvokeTimeoutMs); } - public void getSceneMembership(GetSceneMembershipResponseCallback callback, Integer groupId) { - getSceneMembership(chipClusterPtr, callback, groupId, null); + public void getSceneMembership(GetSceneMembershipResponseCallback callback, Integer groupID) { + getSceneMembership(chipClusterPtr, callback, groupID, null); } public void getSceneMembership( - GetSceneMembershipResponseCallback callback, Integer groupId, int timedInvokeTimeoutMs) { - getSceneMembership(chipClusterPtr, callback, groupId, timedInvokeTimeoutMs); + GetSceneMembershipResponseCallback callback, Integer groupID, int timedInvokeTimeoutMs) { + getSceneMembership(chipClusterPtr, callback, groupID, timedInvokeTimeoutMs); } private native void addScene( long chipClusterPtr, AddSceneResponseCallback Callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, Integer transitionTime, String sceneName, ArrayList extensionFieldSets, @@ -722,46 +722,46 @@ private native void addScene( private native void viewScene( long chipClusterPtr, ViewSceneResponseCallback Callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, @Nullable Integer timedInvokeTimeoutMs); private native void removeScene( long chipClusterPtr, RemoveSceneResponseCallback Callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, @Nullable Integer timedInvokeTimeoutMs); private native void removeAllScenes( long chipClusterPtr, RemoveAllScenesResponseCallback Callback, - Integer groupId, + Integer groupID, @Nullable Integer timedInvokeTimeoutMs); private native void storeScene( long chipClusterPtr, StoreSceneResponseCallback Callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, @Nullable Integer timedInvokeTimeoutMs); private native void recallScene( long chipClusterPtr, DefaultClusterCallback Callback, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, @Nullable Optional transitionTime, @Nullable Integer timedInvokeTimeoutMs); private native void getSceneMembership( long chipClusterPtr, GetSceneMembershipResponseCallback Callback, - Integer groupId, + Integer groupID, @Nullable Integer timedInvokeTimeoutMs); public interface AddSceneResponseCallback { - void onSuccess(Integer status, Integer groupId, Integer sceneId); + void onSuccess(Integer status, Integer groupID, Integer sceneID); void onError(Exception error); } @@ -769,8 +769,8 @@ public interface AddSceneResponseCallback { public interface ViewSceneResponseCallback { void onSuccess( Integer status, - Integer groupId, - Integer sceneId, + Integer groupID, + Integer sceneID, Optional transitionTime, Optional sceneName, Optional> extensionFieldSets); @@ -779,19 +779,19 @@ void onSuccess( } public interface RemoveSceneResponseCallback { - void onSuccess(Integer status, Integer groupId, Integer sceneId); + void onSuccess(Integer status, Integer groupID, Integer sceneID); void onError(Exception error); } public interface RemoveAllScenesResponseCallback { - void onSuccess(Integer status, Integer groupId); + void onSuccess(Integer status, Integer groupID); void onError(Exception error); } public interface StoreSceneResponseCallback { - void onSuccess(Integer status, Integer groupId, Integer sceneId); + void onSuccess(Integer status, Integer groupID, Integer sceneID); void onError(Exception error); } @@ -800,7 +800,7 @@ public interface GetSceneMembershipResponseCallback { void onSuccess( Integer status, @Nullable Integer capacity, - Integer groupId, + Integer groupID, Optional> sceneList); void onError(Exception error); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index c5ada81ecbf732..56810ab1fb2871 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -25,12 +25,12 @@ public class ChipStructs { public static class ScenesClusterAttributeValuePair { - public Optional attributeId; + public Optional attributeID; public ArrayList attributeValue; public ScenesClusterAttributeValuePair( - Optional attributeId, ArrayList attributeValue) { - this.attributeId = attributeId; + Optional attributeID, ArrayList attributeValue) { + this.attributeID = attributeID; this.attributeValue = attributeValue; } @@ -38,8 +38,8 @@ public ScenesClusterAttributeValuePair( public String toString() { StringBuilder output = new StringBuilder(); output.append("ScenesClusterAttributeValuePair {\n"); - output.append("\tattributeId: "); - output.append(attributeId); + output.append("\tattributeID: "); + output.append(attributeID); output.append("\n"); output.append("\tattributeValue: "); output.append(attributeValue); @@ -50,12 +50,12 @@ public String toString() { } public static class ScenesClusterExtensionFieldSet { - public Long clusterId; + public Long clusterID; public ArrayList attributeValueList; public ScenesClusterExtensionFieldSet( - Long clusterId, ArrayList attributeValueList) { - this.clusterId = clusterId; + Long clusterID, ArrayList attributeValueList) { + this.clusterID = clusterID; this.attributeValueList = attributeValueList; } @@ -63,8 +63,8 @@ public ScenesClusterExtensionFieldSet( public String toString() { StringBuilder output = new StringBuilder(); output.append("ScenesClusterExtensionFieldSet {\n"); - output.append("\tclusterId: "); - output.append(clusterId); + output.append("\tclusterID: "); + output.append(clusterID); output.append("\n"); output.append("\tattributeValueList: "); output.append(attributeValueList); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 2a2b85e1ccca50..6d1316f170da2f 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -479,14 +479,14 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) { + public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); responseValues.put(StatusResponseValue, Status); - CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer"); - responseValues.put(GroupIdResponseValue, GroupId); - CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer"); - responseValues.put(SceneIdResponseValue, SceneId); + CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer"); + responseValues.put(GroupIDResponseValue, GroupID); + CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer"); + responseValues.put(SceneIDResponseValue, SceneID); callback.onSuccess(responseValues); } @@ -508,18 +508,18 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( Integer Status, - Integer GroupId, - Integer SceneId, + Integer GroupID, + Integer SceneID, Optional TransitionTime, Optional SceneName, Optional> ExtensionFieldSets) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); responseValues.put(StatusResponseValue, Status); - CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer"); - responseValues.put(GroupIdResponseValue, GroupId); - CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer"); - responseValues.put(SceneIdResponseValue, SceneId); + CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer"); + responseValues.put(GroupIDResponseValue, GroupID); + CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer"); + responseValues.put(SceneIDResponseValue, SceneID); CommandResponseInfo TransitionTimeResponseValue = new CommandResponseInfo("TransitionTime", "Optional"); responseValues.put(TransitionTimeResponseValue, TransitionTime); @@ -547,14 +547,14 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) { + public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); responseValues.put(StatusResponseValue, Status); - CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer"); - responseValues.put(GroupIdResponseValue, GroupId); - CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer"); - responseValues.put(SceneIdResponseValue, SceneId); + CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer"); + responseValues.put(GroupIDResponseValue, GroupID); + CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer"); + responseValues.put(SceneIDResponseValue, SceneID); callback.onSuccess(responseValues); } @@ -575,12 +575,12 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer Status, Integer GroupId) { + public void onSuccess(Integer Status, Integer GroupID) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); responseValues.put(StatusResponseValue, Status); - CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer"); - responseValues.put(GroupIdResponseValue, GroupId); + CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer"); + responseValues.put(GroupIDResponseValue, GroupID); callback.onSuccess(responseValues); } @@ -600,14 +600,14 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(Integer Status, Integer GroupId, Integer SceneId) { + public void onSuccess(Integer Status, Integer GroupID, Integer SceneID) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); responseValues.put(StatusResponseValue, Status); - CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer"); - responseValues.put(GroupIdResponseValue, GroupId); - CommandResponseInfo SceneIdResponseValue = new CommandResponseInfo("SceneId", "Integer"); - responseValues.put(SceneIdResponseValue, SceneId); + CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer"); + responseValues.put(GroupIDResponseValue, GroupID); + CommandResponseInfo SceneIDResponseValue = new CommandResponseInfo("SceneID", "Integer"); + responseValues.put(SceneIDResponseValue, SceneID); callback.onSuccess(responseValues); } @@ -631,15 +631,15 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { public void onSuccess( Integer Status, @Nullable Integer Capacity, - Integer GroupId, + Integer GroupID, Optional> SceneList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); responseValues.put(StatusResponseValue, Status); CommandResponseInfo CapacityResponseValue = new CommandResponseInfo("Capacity", "Integer"); responseValues.put(CapacityResponseValue, Capacity); - CommandResponseInfo GroupIdResponseValue = new CommandResponseInfo("GroupId", "Integer"); - responseValues.put(GroupIdResponseValue, GroupId); + CommandResponseInfo GroupIDResponseValue = new CommandResponseInfo("GroupID", "Integer"); + responseValues.put(GroupIDResponseValue, GroupID); // SceneList: /* TYPE WARNING: array array defaults to */ uint8_t * // Conversion from this type to Java is not properly implemented yet callback.onSuccess(responseValues); @@ -7848,13 +7848,13 @@ public Map> getCommandMap() { Map scenesClusterInteractionInfoMap = new LinkedHashMap<>(); Map scenesaddSceneCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesaddScenegroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); - scenesaddSceneCommandParams.put("groupId", scenesaddScenegroupIdCommandParameterInfo); + CommandParameterInfo scenesaddScenegroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); + scenesaddSceneCommandParams.put("groupID", scenesaddScenegroupIDCommandParameterInfo); - CommandParameterInfo scenesaddScenesceneIdCommandParameterInfo = - new CommandParameterInfo("sceneId", Integer.class, Integer.class); - scenesaddSceneCommandParams.put("sceneId", scenesaddScenesceneIdCommandParameterInfo); + CommandParameterInfo scenesaddScenesceneIDCommandParameterInfo = + new CommandParameterInfo("sceneID", Integer.class, Integer.class); + scenesaddSceneCommandParams.put("sceneID", scenesaddScenesceneIDCommandParameterInfo); CommandParameterInfo scenesaddScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Integer.class, Integer.class); @@ -7871,8 +7871,8 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .addScene( (ChipClusters.ScenesCluster.AddSceneResponseCallback) callback, - (Integer) commandArguments.get("groupId"), - (Integer) commandArguments.get("sceneId"), + (Integer) commandArguments.get("groupID"), + (Integer) commandArguments.get("sceneID"), (Integer) commandArguments.get("transitionTime"), (String) commandArguments.get("sceneName"), (ArrayList) @@ -7883,13 +7883,13 @@ public Map> getCommandMap() { scenesClusterInteractionInfoMap.put("addScene", scenesaddSceneInteractionInfo); Map scenesviewSceneCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesviewScenegroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); - scenesviewSceneCommandParams.put("groupId", scenesviewScenegroupIdCommandParameterInfo); + CommandParameterInfo scenesviewScenegroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); + scenesviewSceneCommandParams.put("groupID", scenesviewScenegroupIDCommandParameterInfo); - CommandParameterInfo scenesviewScenesceneIdCommandParameterInfo = - new CommandParameterInfo("sceneId", Integer.class, Integer.class); - scenesviewSceneCommandParams.put("sceneId", scenesviewScenesceneIdCommandParameterInfo); + CommandParameterInfo scenesviewScenesceneIDCommandParameterInfo = + new CommandParameterInfo("sceneID", Integer.class, Integer.class); + scenesviewSceneCommandParams.put("sceneID", scenesviewScenesceneIDCommandParameterInfo); InteractionInfo scenesviewSceneInteractionInfo = new InteractionInfo( @@ -7897,21 +7897,21 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .viewScene( (ChipClusters.ScenesCluster.ViewSceneResponseCallback) callback, - (Integer) commandArguments.get("groupId"), - (Integer) commandArguments.get("sceneId")); + (Integer) commandArguments.get("groupID"), + (Integer) commandArguments.get("sceneID")); }, () -> new DelegatedScenesClusterViewSceneResponseCallback(), scenesviewSceneCommandParams); scenesClusterInteractionInfoMap.put("viewScene", scenesviewSceneInteractionInfo); Map scenesremoveSceneCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesremoveScenegroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); - scenesremoveSceneCommandParams.put("groupId", scenesremoveScenegroupIdCommandParameterInfo); + CommandParameterInfo scenesremoveScenegroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); + scenesremoveSceneCommandParams.put("groupID", scenesremoveScenegroupIDCommandParameterInfo); - CommandParameterInfo scenesremoveScenesceneIdCommandParameterInfo = - new CommandParameterInfo("sceneId", Integer.class, Integer.class); - scenesremoveSceneCommandParams.put("sceneId", scenesremoveScenesceneIdCommandParameterInfo); + CommandParameterInfo scenesremoveScenesceneIDCommandParameterInfo = + new CommandParameterInfo("sceneID", Integer.class, Integer.class); + scenesremoveSceneCommandParams.put("sceneID", scenesremoveScenesceneIDCommandParameterInfo); InteractionInfo scenesremoveSceneInteractionInfo = new InteractionInfo( @@ -7919,18 +7919,18 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .removeScene( (ChipClusters.ScenesCluster.RemoveSceneResponseCallback) callback, - (Integer) commandArguments.get("groupId"), - (Integer) commandArguments.get("sceneId")); + (Integer) commandArguments.get("groupID"), + (Integer) commandArguments.get("sceneID")); }, () -> new DelegatedScenesClusterRemoveSceneResponseCallback(), scenesremoveSceneCommandParams); scenesClusterInteractionInfoMap.put("removeScene", scenesremoveSceneInteractionInfo); Map scenesremoveAllScenesCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesremoveAllScenesgroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); + CommandParameterInfo scenesremoveAllScenesgroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); scenesremoveAllScenesCommandParams.put( - "groupId", scenesremoveAllScenesgroupIdCommandParameterInfo); + "groupID", scenesremoveAllScenesgroupIDCommandParameterInfo); InteractionInfo scenesremoveAllScenesInteractionInfo = new InteractionInfo( @@ -7938,20 +7938,20 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .removeAllScenes( (ChipClusters.ScenesCluster.RemoveAllScenesResponseCallback) callback, - (Integer) commandArguments.get("groupId")); + (Integer) commandArguments.get("groupID")); }, () -> new DelegatedScenesClusterRemoveAllScenesResponseCallback(), scenesremoveAllScenesCommandParams); scenesClusterInteractionInfoMap.put("removeAllScenes", scenesremoveAllScenesInteractionInfo); Map scenesstoreSceneCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesstoreScenegroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); - scenesstoreSceneCommandParams.put("groupId", scenesstoreScenegroupIdCommandParameterInfo); + CommandParameterInfo scenesstoreScenegroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); + scenesstoreSceneCommandParams.put("groupID", scenesstoreScenegroupIDCommandParameterInfo); - CommandParameterInfo scenesstoreScenesceneIdCommandParameterInfo = - new CommandParameterInfo("sceneId", Integer.class, Integer.class); - scenesstoreSceneCommandParams.put("sceneId", scenesstoreScenesceneIdCommandParameterInfo); + CommandParameterInfo scenesstoreScenesceneIDCommandParameterInfo = + new CommandParameterInfo("sceneID", Integer.class, Integer.class); + scenesstoreSceneCommandParams.put("sceneID", scenesstoreScenesceneIDCommandParameterInfo); InteractionInfo scenesstoreSceneInteractionInfo = new InteractionInfo( @@ -7959,21 +7959,21 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .storeScene( (ChipClusters.ScenesCluster.StoreSceneResponseCallback) callback, - (Integer) commandArguments.get("groupId"), - (Integer) commandArguments.get("sceneId")); + (Integer) commandArguments.get("groupID"), + (Integer) commandArguments.get("sceneID")); }, () -> new DelegatedScenesClusterStoreSceneResponseCallback(), scenesstoreSceneCommandParams); scenesClusterInteractionInfoMap.put("storeScene", scenesstoreSceneInteractionInfo); Map scenesrecallSceneCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesrecallScenegroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); - scenesrecallSceneCommandParams.put("groupId", scenesrecallScenegroupIdCommandParameterInfo); + CommandParameterInfo scenesrecallScenegroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); + scenesrecallSceneCommandParams.put("groupID", scenesrecallScenegroupIDCommandParameterInfo); - CommandParameterInfo scenesrecallScenesceneIdCommandParameterInfo = - new CommandParameterInfo("sceneId", Integer.class, Integer.class); - scenesrecallSceneCommandParams.put("sceneId", scenesrecallScenesceneIdCommandParameterInfo); + CommandParameterInfo scenesrecallScenesceneIDCommandParameterInfo = + new CommandParameterInfo("sceneID", Integer.class, Integer.class); + scenesrecallSceneCommandParams.put("sceneID", scenesrecallScenesceneIDCommandParameterInfo); CommandParameterInfo scenesrecallScenetransitionTimeCommandParameterInfo = new CommandParameterInfo("transitionTime", Optional.class, Integer.class); @@ -7986,8 +7986,8 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .recallScene( (DefaultClusterCallback) callback, - (Integer) commandArguments.get("groupId"), - (Integer) commandArguments.get("sceneId"), + (Integer) commandArguments.get("groupID"), + (Integer) commandArguments.get("sceneID"), (Optional) commandArguments.get("transitionTime")); }, () -> new DelegatedDefaultClusterCallback(), @@ -7995,10 +7995,10 @@ public Map> getCommandMap() { scenesClusterInteractionInfoMap.put("recallScene", scenesrecallSceneInteractionInfo); Map scenesgetSceneMembershipCommandParams = new LinkedHashMap(); - CommandParameterInfo scenesgetSceneMembershipgroupIdCommandParameterInfo = - new CommandParameterInfo("groupId", Integer.class, Integer.class); + CommandParameterInfo scenesgetSceneMembershipgroupIDCommandParameterInfo = + new CommandParameterInfo("groupID", Integer.class, Integer.class); scenesgetSceneMembershipCommandParams.put( - "groupId", scenesgetSceneMembershipgroupIdCommandParameterInfo); + "groupID", scenesgetSceneMembershipgroupIDCommandParameterInfo); InteractionInfo scenesgetSceneMembershipInteractionInfo = new InteractionInfo( @@ -8006,7 +8006,7 @@ public Map> getCommandMap() { ((ChipClusters.ScenesCluster) cluster) .getSceneMembership( (ChipClusters.ScenesCluster.GetSceneMembershipResponseCallback) callback, - (Integer) commandArguments.get("groupId")); + (Integer) commandArguments.get("groupID")); }, () -> new DelegatedScenesClusterGetSceneMembershipResponseCallback(), scenesgetSceneMembershipCommandParams); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 08278978018e50..cc69cb02ec9887 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -188,11 +188,11 @@ class ChipClusters: "commandId": 0x00000000, "commandName": "AddScene", "args": { - "groupId": "int", - "sceneId": "int", + "groupID": "int", + "sceneID": "int", "transitionTime": "int", "sceneName": "str", - "clusterId": "int", + "clusterID": "int", "attributeValueList": "", }, }, @@ -200,39 +200,39 @@ class ChipClusters: "commandId": 0x00000001, "commandName": "ViewScene", "args": { - "groupId": "int", - "sceneId": "int", + "groupID": "int", + "sceneID": "int", }, }, 0x00000002: { "commandId": 0x00000002, "commandName": "RemoveScene", "args": { - "groupId": "int", - "sceneId": "int", + "groupID": "int", + "sceneID": "int", }, }, 0x00000003: { "commandId": 0x00000003, "commandName": "RemoveAllScenes", "args": { - "groupId": "int", + "groupID": "int", }, }, 0x00000004: { "commandId": 0x00000004, "commandName": "StoreScene", "args": { - "groupId": "int", - "sceneId": "int", + "groupID": "int", + "sceneID": "int", }, }, 0x00000005: { "commandId": 0x00000005, "commandName": "RecallScene", "args": { - "groupId": "int", - "sceneId": "int", + "groupID": "int", + "sceneID": "int", "transitionTime": "int", }, }, @@ -240,7 +240,7 @@ class ChipClusters: "commandId": 0x00000006, "commandName": "GetSceneMembership", "args": { - "groupId": "int", + "groupID": "int", }, }, }, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 9606e03acb8170..9a282b92480b6d 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -589,6 +589,9 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Bitmaps: + class SceneFeatures(IntFlag): + kSceneNames = 0x1 + class ScenesCopyMode(IntFlag): kCopyAllScenes = 0x1 @@ -600,11 +603,11 @@ class AttributeValuePair(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="attributeId", Tag=0, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="attributeID", Tag=0, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="attributeValue", Tag=1, Type=typing.List[uint]), ]) - attributeId: 'typing.Optional[uint]' = None + attributeID: 'typing.Optional[uint]' = None attributeValue: 'typing.List[uint]' = field(default_factory=lambda: []) @dataclass @@ -613,11 +616,11 @@ class ExtensionFieldSet(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="clusterId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="clusterID", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="attributeValueList", Tag=1, Type=typing.List[Scenes.Structs.AttributeValuePair]), ]) - clusterId: 'uint' = 0 + clusterID: 'uint' = 0 attributeValueList: 'typing.List[Scenes.Structs.AttributeValuePair]' = field(default_factory=lambda: []) @@ -634,15 +637,15 @@ class AddScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="sceneName", Tag=3, Type=str), ClusterObjectFieldDescriptor(Label="extensionFieldSets", Tag=4, Type=typing.List[Scenes.Structs.ExtensionFieldSet]), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 transitionTime: 'uint' = 0 sceneName: 'str' = "" extensionFieldSets: 'typing.List[Scenes.Structs.ExtensionFieldSet]' = field(default_factory=lambda: []) @@ -659,13 +662,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=2, Type=uint), ]) status: 'uint' = 0 - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class ViewScene(ClusterCommand): @@ -678,12 +681,12 @@ class ViewScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class ViewSceneResponse(ClusterCommand): @@ -697,16 +700,16 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=3, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="sceneName", Tag=4, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="extensionFieldSets", Tag=5, Type=typing.Optional[typing.List[Scenes.Structs.ExtensionFieldSet]]), ]) status: 'uint' = 0 - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 transitionTime: 'typing.Optional[uint]' = None sceneName: 'typing.Optional[str]' = None extensionFieldSets: 'typing.Optional[typing.List[Scenes.Structs.ExtensionFieldSet]]' = None @@ -722,12 +725,12 @@ class RemoveScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class RemoveSceneResponse(ClusterCommand): @@ -741,13 +744,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=2, Type=uint), ]) status: 'uint' = 0 - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class RemoveAllScenes(ClusterCommand): @@ -760,10 +763,10 @@ class RemoveAllScenes(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), ]) - groupId: 'uint' = 0 + groupID: 'uint' = 0 @dataclass class RemoveAllScenesResponse(ClusterCommand): @@ -777,11 +780,11 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), ]) status: 'uint' = 0 - groupId: 'uint' = 0 + groupID: 'uint' = 0 @dataclass class StoreScene(ClusterCommand): @@ -794,12 +797,12 @@ class StoreScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class StoreSceneResponse(ClusterCommand): @@ -813,13 +816,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=2, Type=uint), ]) status: 'uint' = 0 - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class RecallScene(ClusterCommand): @@ -832,13 +835,13 @@ class RecallScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=typing.Union[None, Nullable, uint]), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 transitionTime: 'typing.Union[None, Nullable, uint]' = None @dataclass @@ -852,10 +855,10 @@ class GetSceneMembership(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), ]) - groupId: 'uint' = 0 + groupID: 'uint' = 0 @dataclass class GetSceneMembershipResponse(ClusterCommand): @@ -870,13 +873,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="capacity", Tag=1, Type=typing.Union[Nullable, uint]), - ClusterObjectFieldDescriptor(Label="groupId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="sceneList", Tag=3, Type=typing.Optional[typing.List[uint]]), ]) status: 'uint' = 0 capacity: 'typing.Union[Nullable, uint]' = NullValue - groupId: 'uint' = 0 + groupID: 'uint' = 0 sceneList: 'typing.Optional[typing.List[uint]]' = None @dataclass @@ -890,15 +893,15 @@ class EnhancedAddScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="sceneName", Tag=3, Type=str), ClusterObjectFieldDescriptor(Label="extensionFieldSets", Tag=4, Type=typing.List[Scenes.Structs.ExtensionFieldSet]), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 transitionTime: 'uint' = 0 sceneName: 'str' = "" extensionFieldSets: 'typing.List[Scenes.Structs.ExtensionFieldSet]' = field(default_factory=lambda: []) @@ -915,13 +918,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=2, Type=uint), ]) status: 'uint' = 0 - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class EnhancedViewScene(ClusterCommand): @@ -934,12 +937,12 @@ class EnhancedViewScene(ClusterCommand): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ - ClusterObjectFieldDescriptor(Label="groupId", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=1, Type=uint), ]) - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 @dataclass class EnhancedViewSceneResponse(ClusterCommand): @@ -953,16 +956,16 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupId", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneId", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupID", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneID", Tag=2, Type=uint), ClusterObjectFieldDescriptor(Label="transitionTime", Tag=3, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="sceneName", Tag=4, Type=typing.Optional[str]), ClusterObjectFieldDescriptor(Label="extensionFieldSets", Tag=5, Type=typing.Optional[typing.List[Scenes.Structs.ExtensionFieldSet]]), ]) status: 'uint' = 0 - groupId: 'uint' = 0 - sceneId: 'uint' = 0 + groupID: 'uint' = 0 + sceneID: 'uint' = 0 transitionTime: 'typing.Optional[uint]' = None sceneName: 'typing.Optional[str]' = None extensionFieldSets: 'typing.Optional[typing.List[Scenes.Structs.ExtensionFieldSet]]' = None @@ -979,17 +982,17 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="mode", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupIdFrom", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneIdFrom", Tag=2, Type=uint), - ClusterObjectFieldDescriptor(Label="groupIdTo", Tag=3, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneIdTo", Tag=4, Type=uint), + ClusterObjectFieldDescriptor(Label="groupIdentifierFrom", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneIdentifierFrom", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupIdentifierTo", Tag=3, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneIdentifierTo", Tag=4, Type=uint), ]) mode: 'uint' = 0 - groupIdFrom: 'uint' = 0 - sceneIdFrom: 'uint' = 0 - groupIdTo: 'uint' = 0 - sceneIdTo: 'uint' = 0 + groupIdentifierFrom: 'uint' = 0 + sceneIdentifierFrom: 'uint' = 0 + groupIdentifierTo: 'uint' = 0 + sceneIdentifierTo: 'uint' = 0 @dataclass class CopySceneResponse(ClusterCommand): @@ -1003,13 +1006,13 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields = [ ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="groupIdFrom", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="sceneIdFrom", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="groupIdentifierFrom", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="sceneIdentifierFrom", Tag=2, Type=uint), ]) status: 'uint' = 0 - groupIdFrom: 'uint' = 0 - sceneIdFrom: 'uint' = 0 + groupIdentifierFrom: 'uint' = 0 + sceneIdentifierFrom: 'uint' = 0 class Attributes: @@ -1268,9 +1271,6 @@ class OnOffControl(IntFlag): class OnOffFeature(IntFlag): kLighting = 0x1 - class SceneFeatures(IntFlag): - kSceneNames = 0x1 - class Commands: diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index a698ca4fc3e041..4a50ef1d40b8ed 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -4054,7 +4054,6 @@ OnOff: - OnOffControl - OnOffFeature - - SceneFeatures LevelControl: - LevelControlFeature Actions: @@ -4142,8 +4141,6 @@ - AcceptOnlyWhenOn OnOffFeature: - Lighting - SceneFeatures: - - SceneNames LevelControl: LevelControlFeature: - OnOff @@ -5040,6 +5037,62 @@ LauncherResponse: - status - data + Scenes: + AddScene: + - groupID + - sceneID + ViewScene: + - groupID + - sceneID + RemoveScene: + - groupID + - sceneID + RemoveAllScenes: + - groupID + StoreScene: + - groupID + - sceneID + RecallScene: + - groupID + - sceneID + GetSceneMembership: + - groupID + EnhancedAddScene: + - groupID + - sceneID + EnhancedViewScene: + - groupID + - sceneID + CopyScene: + - groupIdentifierFrom + - sceneIdentifierFrom + - groupIdentifierTo + - sceneIdentifierTo + AddSceneResponse: + - groupID + - sceneID + ViewSceneResponse: + - groupID + - sceneID + RemoveSceneResponse: + - groupID + - sceneID + RemoveAllScenesResponse: + - groupID + StoreSceneResponse: + - groupID + - sceneID + GetSceneMembershipResponse: + - groupID + EnhancedAddSceneResponse: + - groupID + - sceneID + EnhancedViewSceneResponse: + - groupID + - sceneID + CopySceneResponse: + - groupIdentifierFrom + - sceneIdentifierFrom structs: OTASoftwareUpdateRequestor: - ProviderLocation @@ -5284,6 +5337,11 @@ # introduced them in this release. - catalogVendorId - applicationId + Scenes: + AttributeValuePair: + - attributeID + ExtensionFieldSet: + - clusterID events: OTASoftwareUpdateRequestor: - StateTransition @@ -5644,6 +5702,8 @@ - DaysMaskMap PumpConfigurationAndControl: - PumpFeature + Scenes: + - SceneFeatures bitmap values: UnitTesting: Bitmap8MaskMap: @@ -5718,6 +5778,9 @@ ModeForSequence: - HeatSetpointPresent - CoolSetpointPresent + Scenes: + SceneFeatures: + - SceneNames deprecated: clusters: - OtaSoftwareUpdateProvider @@ -5796,6 +5859,62 @@ AnnounceOTAProvider: - providerNodeId - vendorId + Scenes: + AddScene: + - groupId + - sceneId + ViewScene: + - groupId + - sceneId + RemoveScene: + - groupId + - sceneId + RemoveAllScenes: + - groupId + StoreScene: + - groupId + - sceneId + RecallScene: + - groupId + - sceneId + GetSceneMembership: + - groupId + EnhancedAddScene: + - groupId + - sceneId + EnhancedViewScene: + - groupId + - sceneId + CopyScene: + - groupIdFrom + - sceneIdFrom + - groupIdTo + - sceneIdTo + AddSceneResponse: + - groupId + - sceneId + ViewSceneResponse: + - groupId + - sceneId + RemoveSceneResponse: + - groupId + - sceneId + RemoveAllScenesResponse: + - groupId + StoreSceneResponse: + - groupId + - sceneId + GetSceneMembershipResponse: + - groupId + EnhancedAddSceneResponse: + - groupId + - sceneId + EnhancedViewSceneResponse: + - groupId + - sceneId + CopySceneResponse: + - groupIdFrom + - sceneIdFrom structs: Descriptor: - DeviceType @@ -5859,6 +5978,11 @@ ApplicationStruct: - catalogVendorId - applicationId + Scenes: + AttributeValuePair: + - attributeId + ExtensionFieldSet: + - clusterId event fields: Switch: MultiPressComplete: @@ -6124,6 +6248,62 @@ ColorControl: MoveToColorTemperature: colorTemperatureMireds: colorTemperature + Scenes: + AddScene: + groupID: groupId + sceneID: sceneId + ViewScene: + groupID: groupId + sceneID: sceneId + RemoveScene: + groupID: groupId + sceneID: sceneId + RemoveAllScenes: + groupID: groupId + StoreScene: + groupID: groupId + sceneID: sceneId + RecallScene: + groupID: groupId + sceneID: sceneId + GetSceneMembership: + groupID: groupId + EnhancedAddScene: + groupID: groupId + sceneID: sceneId + EnhancedViewScene: + groupID: groupId + sceneID: sceneId + CopyScene: + groupIdentifierFrom: groupIdFrom + sceneIdentifierFrom: sceneIdFrom + groupIdentifierTo: groupIdTo + sceneIdentifierTo: sceneIdTo + AddSceneResponse: + groupID: groupId + sceneID: sceneId + ViewSceneResponse: + groupID: groupId + sceneID: sceneId + RemoveSceneResponse: + groupID: groupId + sceneID: sceneId + RemoveAllScenesResponse: + groupID: groupId + StoreSceneResponse: + groupID: groupId + sceneID: sceneId + GetSceneMembershipResponse: + groupID: groupId + EnhancedAddSceneResponse: + groupID: groupId + sceneID: sceneId + EnhancedViewSceneResponse: + groupID: groupId + sceneID: sceneId + CopySceneResponse: + groupIdentifierFrom: groupIdFrom + sceneIdentifierFrom: sceneIdFrom structs: AccessControl: AccessControlEntryStruct: AccessControlEntry @@ -6181,6 +6361,11 @@ ApplicationStruct: catalogVendorID: catalogVendorId applicationID: applicationId + Scenes: + AttributeValuePair: + attributeID: attributeId + ExtensionFieldSet: + clusterID: clusterId event fields: Switch: MultiPressComplete: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 237b7c0301343f..b4fda6eb1bc9a4 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -17065,6 +17065,10 @@ typedef NS_OPTIONS(uint32_t, MTRGroupsGroupClusterFeature) { MTRGroupsGroupClusterFeatureGroupNames API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +typedef NS_OPTIONS(uint32_t, MTRScenesSceneFeatures) { + MTRScenesSceneFeaturesSceneNames MTR_NEWLY_AVAILABLE = 0x1, +} MTR_NEWLY_AVAILABLE; + typedef NS_OPTIONS(uint8_t, MTRScenesCopyMode) { MTRScenesCopyModeCopyAllScenes API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -17102,10 +17106,6 @@ typedef NS_OPTIONS(uint32_t, MTROnOffFeature) { MTROnOffFeatureLighting API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, } API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -typedef NS_OPTIONS(uint32_t, MTROnOffSceneFeatures) { - MTROnOffSceneFeaturesSceneNames API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x1, -} API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); - typedef NS_ENUM(uint8_t, MTRLevelControlMoveMode) { MTRLevelControlMoveModeUp API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x00, MTRLevelControlMoveModeDown API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) = 0x01, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 4f3e7c997a6012..b9ff0ac45ee50c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -1693,8 +1693,8 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; request.transitionTime = params.transitionTime.unsignedShortValue; request.sceneName = [self asCharSpan:params.sceneName]; { @@ -1712,7 +1712,7 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (MTRScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0]; - listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue; + listHolder_0->mList[i_0].clusterID = element_0.clusterID.unsignedIntValue; { using ListType_2 = std::remove_reference_tmList[i_0].attributeValueList)>; using ListMemberType_2 = ListMemberTypeGetter::Type; @@ -1729,9 +1729,9 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params return CHIP_ERROR_INVALID_ARGUMENT; } auto element_2 = (MTRScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2]; - if (element_2.attributeId != nil) { - auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace(); - definedValue_4 = element_2.attributeId.unsignedIntValue; + if (element_2.attributeID != nil) { + auto & definedValue_4 = listHolder_2->mList[i_2].attributeID.Emplace(); + definedValue_4 = element_2.attributeID.unsignedIntValue; } { using ListType_4 @@ -1803,8 +1803,8 @@ - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1838,8 +1838,8 @@ - (void)removeSceneWithParams:(MTRScenesClusterRemoveSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1874,7 +1874,7 @@ - (void)removeAllScenesWithParams:(MTRScenesClusterRemoveAllScenesParams *)param invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; + request.groupID = params.groupID.unsignedShortValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1908,8 +1908,8 @@ - (void)storeSceneWithParams:(MTRScenesClusterStoreSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1945,8 +1945,8 @@ - (void)recallSceneWithParams:(MTRScenesClusterRecallSceneParams *)params comple invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; if (params.transitionTime != nil) { auto & definedValue_0 = request.transitionTime.Emplace(); if (params.transitionTime == nil) { @@ -1990,7 +1990,7 @@ - (void)getSceneMembershipWithParams:(MTRScenesClusterGetSceneMembershipParams * invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; + request.groupID = params.groupID.unsignedShortValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -2025,8 +2025,8 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; request.transitionTime = params.transitionTime.unsignedShortValue; request.sceneName = [self asCharSpan:params.sceneName]; { @@ -2044,7 +2044,7 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (MTRScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0]; - listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue; + listHolder_0->mList[i_0].clusterID = element_0.clusterID.unsignedIntValue; { using ListType_2 = std::remove_reference_tmList[i_0].attributeValueList)>; using ListMemberType_2 = ListMemberTypeGetter::Type; @@ -2061,9 +2061,9 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par return CHIP_ERROR_INVALID_ARGUMENT; } auto element_2 = (MTRScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2]; - if (element_2.attributeId != nil) { - auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace(); - definedValue_4 = element_2.attributeId.unsignedIntValue; + if (element_2.attributeID != nil) { + auto & definedValue_4 = listHolder_2->mList[i_2].attributeID.Emplace(); + definedValue_4 = element_2.attributeID.unsignedIntValue; } { using ListType_4 @@ -2136,8 +2136,8 @@ - (void)enhancedViewSceneWithParams:(MTRScenesClusterEnhancedViewSceneParams *)p invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -2172,10 +2172,10 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params } } request.mode = static_cast>(params.mode.unsignedCharValue); - request.groupIdFrom = params.groupIdFrom.unsignedShortValue; - request.sceneIdFrom = params.sceneIdFrom.unsignedCharValue; - request.groupIdTo = params.groupIdTo.unsignedShortValue; - request.sceneIdTo = params.sceneIdTo.unsignedCharValue; + request.groupIdentifierFrom = params.groupIdentifierFrom.unsignedShortValue; + request.sceneIdentifierFrom = params.sceneIdentifierFrom.unsignedCharValue; + request.groupIdentifierTo = params.groupIdentifierTo.unsignedShortValue; + request.sceneIdentifierTo = params.sceneIdentifierTo.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index e0ad62db1c9967..bc1d0e3e7544e2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -11342,10 +11342,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { - response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId]; + response.sceneID = [NSNumber numberWithUnsignedChar:data.sceneID]; } DispatchSuccess(context, response); }; @@ -11358,10 +11358,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { - response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId]; + response.sceneID = [NSNumber numberWithUnsignedChar:data.sceneID]; } { if (data.transitionTime.HasValue()) { @@ -11388,7 +11388,7 @@ auto & entry_1 = iter_1.GetValue(); MTRScenesClusterExtensionFieldSet * newElement_1; newElement_1 = [MTRScenesClusterExtensionFieldSet new]; - newElement_1.clusterId = [NSNumber numberWithUnsignedInt:entry_1.clusterId]; + newElement_1.clusterID = [NSNumber numberWithUnsignedInt:entry_1.clusterID]; { // Scope for our temporary variables auto * array_3 = [NSMutableArray new]; auto iter_3 = entry_1.attributeValueList.begin(); @@ -11396,10 +11396,10 @@ auto & entry_3 = iter_3.GetValue(); MTRScenesClusterAttributeValuePair * newElement_3; newElement_3 = [MTRScenesClusterAttributeValuePair new]; - if (entry_3.attributeId.HasValue()) { - newElement_3.attributeId = [NSNumber numberWithUnsignedInt:entry_3.attributeId.Value()]; + if (entry_3.attributeID.HasValue()) { + newElement_3.attributeID = [NSNumber numberWithUnsignedInt:entry_3.attributeID.Value()]; } else { - newElement_3.attributeId = nil; + newElement_3.attributeID = nil; } { // Scope for our temporary variables auto * array_5 = [NSMutableArray new]; @@ -11450,10 +11450,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { - response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId]; + response.sceneID = [NSNumber numberWithUnsignedChar:data.sceneID]; } DispatchSuccess(context, response); }; @@ -11466,7 +11466,7 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } DispatchSuccess(context, response); }; @@ -11479,10 +11479,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { - response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId]; + response.sceneID = [NSNumber numberWithUnsignedChar:data.sceneID]; } DispatchSuccess(context, response); }; @@ -11502,7 +11502,7 @@ } } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { if (data.sceneList.HasValue()) { @@ -11537,10 +11537,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { - response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId]; + response.sceneID = [NSNumber numberWithUnsignedChar:data.sceneID]; } DispatchSuccess(context, response); }; @@ -11553,10 +11553,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupId = [NSNumber numberWithUnsignedShort:data.groupId]; + response.groupID = [NSNumber numberWithUnsignedShort:data.groupID]; } { - response.sceneId = [NSNumber numberWithUnsignedChar:data.sceneId]; + response.sceneID = [NSNumber numberWithUnsignedChar:data.sceneID]; } { if (data.transitionTime.HasValue()) { @@ -11583,7 +11583,7 @@ auto & entry_1 = iter_1.GetValue(); MTRScenesClusterExtensionFieldSet * newElement_1; newElement_1 = [MTRScenesClusterExtensionFieldSet new]; - newElement_1.clusterId = [NSNumber numberWithUnsignedInt:entry_1.clusterId]; + newElement_1.clusterID = [NSNumber numberWithUnsignedInt:entry_1.clusterID]; { // Scope for our temporary variables auto * array_3 = [NSMutableArray new]; auto iter_3 = entry_1.attributeValueList.begin(); @@ -11591,10 +11591,10 @@ auto & entry_3 = iter_3.GetValue(); MTRScenesClusterAttributeValuePair * newElement_3; newElement_3 = [MTRScenesClusterAttributeValuePair new]; - if (entry_3.attributeId.HasValue()) { - newElement_3.attributeId = [NSNumber numberWithUnsignedInt:entry_3.attributeId.Value()]; + if (entry_3.attributeID.HasValue()) { + newElement_3.attributeID = [NSNumber numberWithUnsignedInt:entry_3.attributeID.Value()]; } else { - newElement_3.attributeId = nil; + newElement_3.attributeID = nil; } { // Scope for our temporary variables auto * array_5 = [NSMutableArray new]; @@ -11645,10 +11645,10 @@ response.status = [NSNumber numberWithUnsignedChar:data.status]; } { - response.groupIdFrom = [NSNumber numberWithUnsignedShort:data.groupIdFrom]; + response.groupIdentifierFrom = [NSNumber numberWithUnsignedShort:data.groupIdentifierFrom]; } { - response.sceneIdFrom = [NSNumber numberWithUnsignedChar:data.sceneIdFrom]; + response.sceneIdentifierFrom = [NSNumber numberWithUnsignedChar:data.sceneIdentifierFrom]; } DispatchSuccess(context, response); }; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 06c3f450b4c15c..0247bc118dc256 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -984,8 +984,8 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; request.transitionTime = params.transitionTime.unsignedShortValue; request.sceneName = [self asCharSpan:params.sceneName]; { @@ -1003,7 +1003,7 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (MTRScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0]; - listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue; + listHolder_0->mList[i_0].clusterID = element_0.clusterID.unsignedIntValue; { using ListType_2 = std::remove_reference_tmList[i_0].attributeValueList)>; using ListMemberType_2 = ListMemberTypeGetter::Type; @@ -1020,9 +1020,9 @@ - (void)addSceneWithParams:(MTRScenesClusterAddSceneParams *)params return CHIP_ERROR_INVALID_ARGUMENT; } auto element_2 = (MTRScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2]; - if (element_2.attributeId != nil) { - auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace(); - definedValue_4 = element_2.attributeId.unsignedIntValue; + if (element_2.attributeID != nil) { + auto & definedValue_4 = listHolder_2->mList[i_2].attributeID.Emplace(); + definedValue_4 = element_2.attributeID.unsignedIntValue; } { using ListType_4 @@ -1130,8 +1130,8 @@ - (void)viewSceneWithParams:(MTRScenesClusterViewSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1201,8 +1201,8 @@ - (void)removeSceneWithParams:(MTRScenesClusterRemoveSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1272,7 +1272,7 @@ - (void)removeAllScenesWithParams:(MTRScenesClusterRemoveAllScenesParams *)param invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; + request.groupID = params.groupID.unsignedShortValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1341,8 +1341,8 @@ - (void)storeSceneWithParams:(MTRScenesClusterStoreSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1410,8 +1410,8 @@ - (void)recallSceneWithParams:(MTRScenesClusterRecallSceneParams *)params invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; if (params.transitionTime != nil) { auto & definedValue_0 = request.transitionTime.Emplace(); if (params.transitionTime == nil) { @@ -1490,7 +1490,7 @@ - (void)getSceneMembershipWithParams:(MTRScenesClusterGetSceneMembershipParams * invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; + request.groupID = params.groupID.unsignedShortValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1560,8 +1560,8 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; request.transitionTime = params.transitionTime.unsignedShortValue; request.sceneName = [self asCharSpan:params.sceneName]; { @@ -1579,7 +1579,7 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par return CHIP_ERROR_INVALID_ARGUMENT; } auto element_0 = (MTRScenesClusterExtensionFieldSet *) params.extensionFieldSets[i_0]; - listHolder_0->mList[i_0].clusterId = element_0.clusterId.unsignedIntValue; + listHolder_0->mList[i_0].clusterID = element_0.clusterID.unsignedIntValue; { using ListType_2 = std::remove_reference_tmList[i_0].attributeValueList)>; using ListMemberType_2 = ListMemberTypeGetter::Type; @@ -1596,9 +1596,9 @@ - (void)enhancedAddSceneWithParams:(MTRScenesClusterEnhancedAddSceneParams *)par return CHIP_ERROR_INVALID_ARGUMENT; } auto element_2 = (MTRScenesClusterAttributeValuePair *) element_0.attributeValueList[i_2]; - if (element_2.attributeId != nil) { - auto & definedValue_4 = listHolder_2->mList[i_2].attributeId.Emplace(); - definedValue_4 = element_2.attributeId.unsignedIntValue; + if (element_2.attributeID != nil) { + auto & definedValue_4 = listHolder_2->mList[i_2].attributeID.Emplace(); + definedValue_4 = element_2.attributeID.unsignedIntValue; } { using ListType_4 @@ -1707,8 +1707,8 @@ - (void)enhancedViewSceneWithParams:(MTRScenesClusterEnhancedViewSceneParams *)p invokeTimeout.SetValue(Seconds16(serverSideProcessingTimeout.unsignedShortValue)); } } - request.groupId = params.groupId.unsignedShortValue; - request.sceneId = params.sceneId.unsignedCharValue; + request.groupID = params.groupID.unsignedShortValue; + request.sceneID = params.sceneID.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); @@ -1778,10 +1778,10 @@ - (void)copySceneWithParams:(MTRScenesClusterCopySceneParams *)params } } request.mode = static_cast>(params.mode.unsignedCharValue); - request.groupIdFrom = params.groupIdFrom.unsignedShortValue; - request.sceneIdFrom = params.sceneIdFrom.unsignedCharValue; - request.groupIdTo = params.groupIdTo.unsignedShortValue; - request.sceneIdTo = params.sceneIdTo.unsignedCharValue; + request.groupIdentifierFrom = params.groupIdentifierFrom.unsignedShortValue; + request.sceneIdentifierFrom = params.sceneIdentifierFrom.unsignedCharValue; + request.groupIdentifierTo = params.groupIdentifierTo.unsignedShortValue; + request.sceneIdentifierTo = params.sceneIdentifierTo.unsignedCharValue; return MTRStartInvokeInteraction(typedBridge, request, exchangeManager, session, successCb, failureCb, self->_endpoint, timedInvokeTimeoutMs, invokeTimeout); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index d01abc49e50d15..f424065352ee77 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -407,9 +407,9 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterAddSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull transitionTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -442,14 +442,23 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterAddSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterAddSceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -468,12 +477,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterAddSceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterViewSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -500,14 +518,23 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterViewSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterViewSceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable transitionTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -532,12 +559,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterViewSceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterRemoveSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -564,14 +600,23 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterRemoveSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterRemoveSceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -590,10 +635,19 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterRemoveSceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterRemoveAllScenesParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -620,12 +674,18 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterRemoveAllScenesParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterRemoveAllScenesResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -644,12 +704,18 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterRemoveAllScenesResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterStoreSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -676,14 +742,23 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterStoreSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterStoreSceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -702,12 +777,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterStoreSceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterRecallSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable transitionTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** @@ -736,10 +820,19 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterRecallSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterGetSceneMembershipParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -766,6 +859,12 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterGetSceneMembershipParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterGetSceneMembershipResponseParams : NSObject @@ -773,7 +872,7 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nullable capacity API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSArray * _Nullable sceneList API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); /** @@ -794,12 +893,18 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterGetSceneMembershipResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterEnhancedAddSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull transitionTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -832,14 +937,23 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterEnhancedAddSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterEnhancedAddSceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -858,12 +972,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterEnhancedAddSceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterEnhancedViewSceneParams : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -890,14 +1013,23 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterEnhancedViewSceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterEnhancedViewSceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupID MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneID MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nullable transitionTime API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -922,18 +1054,27 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterEnhancedViewSceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupID"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneID"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterCopySceneParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull mode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupIdentifierFrom MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneIdentifierFrom MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull groupIdTo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupIdentifierTo MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneIdTo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneIdentifierTo MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -960,14 +1101,29 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +@interface MTRScenesClusterCopySceneParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupIdentifierFrom"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneIdentifierFrom"); + +@property (nonatomic, copy) NSNumber * _Nonnull groupIdTo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupIdentifierTo"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneIdTo API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneIdentifierTo"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterCopySceneResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSNumber * _Nonnull groupIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull groupIdentifierFrom MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull sceneIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull sceneIdentifierFrom MTR_NEWLY_AVAILABLE; /** * Controls whether the command is a timed command (using Timed Invoke). * @@ -986,6 +1142,15 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) tvos(16.1)) MTR_NEWLY_DEPRECATED("Timed invoke does not make sense for server to client commands"); @end +@interface MTRScenesClusterCopySceneResponseParams (Deprecated) + +@property (nonatomic, copy) NSNumber * _Nonnull groupIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use groupIdentifierFrom"); + +@property (nonatomic, copy) NSNumber * _Nonnull sceneIdFrom API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use sceneIdentifierFrom"); +@end + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTROnOffClusterOffParams : NSObject /** diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 3426f9172a390f..afc4fd9d807ac7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -496,9 +496,9 @@ - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _transitionTime = @(0); @@ -515,8 +515,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterAddSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.transitionTime = self.transitionTime; other.sceneName = self.sceneName; other.extensionFieldSets = self.extensionFieldSets; @@ -529,11 +529,34 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", - NSStringFromClass([self class]), _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets]; + [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", + NSStringFromClass([self class]), _groupID, _sceneID, _transitionTime, _sceneName, _extensionFieldSets]; return descriptionString; } +@end + +@implementation MTRScenesClusterAddSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterAddSceneResponseParams - (instancetype)init @@ -542,9 +565,9 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; } return self; @@ -555,8 +578,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterAddSceneResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; return other; @@ -564,20 +587,43 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >", - NSStringFromClass([self class]), _status, _groupId, _sceneId]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; sceneID:%@; >", + NSStringFromClass([self class]), _status, _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterAddSceneResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterViewSceneParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -588,8 +634,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterViewSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -599,10 +645,33 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId]; + [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; >", NSStringFromClass([self class]), _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterViewSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterViewSceneResponseParams - (instancetype)init @@ -611,9 +680,9 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _transitionTime = nil; @@ -630,8 +699,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterViewSceneResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.transitionTime = self.transitionTime; other.sceneName = self.sceneName; other.extensionFieldSets = self.extensionFieldSets; @@ -643,20 +712,43 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = [NSString - stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", - NSStringFromClass([self class]), _status, _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets]; + stringWithFormat:@"<%@: status:%@; groupID:%@; sceneID:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", + NSStringFromClass([self class]), _status, _groupID, _sceneID, _transitionTime, _sceneName, _extensionFieldSets]; return descriptionString; } +@end + +@implementation MTRScenesClusterViewSceneResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterRemoveSceneParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -667,8 +759,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterRemoveSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -678,10 +770,33 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId]; + [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; >", NSStringFromClass([self class]), _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterRemoveSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterRemoveSceneResponseParams - (instancetype)init @@ -690,9 +805,9 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; } return self; @@ -703,8 +818,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterRemoveSceneResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; return other; @@ -712,18 +827,41 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >", - NSStringFromClass([self class]), _status, _groupId, _sceneId]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; sceneID:%@; >", + NSStringFromClass([self class]), _status, _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterRemoveSceneResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterRemoveAllScenesParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -734,7 +872,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterRemoveAllScenesParams alloc] init]; - other.groupId = self.groupId; + other.groupID = self.groupID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -743,10 +881,23 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupID:%@; >", NSStringFromClass([self class]), _groupID]; return descriptionString; } +@end + +@implementation MTRScenesClusterRemoveAllScenesParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} @end @implementation MTRScenesClusterRemoveAllScenesResponseParams - (instancetype)init @@ -755,7 +906,7 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); _timedInvokeTimeoutMs = nil; } return self; @@ -766,7 +917,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterRemoveAllScenesResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; + other.groupID = self.groupID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; return other; @@ -775,19 +926,32 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; >", NSStringFromClass([self class]), _status, _groupId]; + [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; >", NSStringFromClass([self class]), _status, _groupID]; return descriptionString; } +@end + +@implementation MTRScenesClusterRemoveAllScenesResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} @end @implementation MTRScenesClusterStoreSceneParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -798,8 +962,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterStoreSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -809,10 +973,33 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId]; + [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; >", NSStringFromClass([self class]), _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterStoreSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterStoreSceneResponseParams - (instancetype)init @@ -821,9 +1008,9 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; } return self; @@ -834,8 +1021,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterStoreSceneResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; return other; @@ -843,20 +1030,43 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >", - NSStringFromClass([self class]), _status, _groupId, _sceneId]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; sceneID:%@; >", + NSStringFromClass([self class]), _status, _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterStoreSceneResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterRecallSceneParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _transitionTime = nil; _timedInvokeTimeoutMs = nil; @@ -869,8 +1079,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterRecallSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.transitionTime = self.transitionTime; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -880,18 +1090,41 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; transitionTime:%@; >", - NSStringFromClass([self class]), _groupId, _sceneId, _transitionTime]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; transitionTime:%@; >", + NSStringFromClass([self class]), _groupID, _sceneID, _transitionTime]; return descriptionString; } +@end + +@implementation MTRScenesClusterRecallSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterGetSceneMembershipParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -902,7 +1135,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterGetSceneMembershipParams alloc] init]; - other.groupId = self.groupId; + other.groupID = self.groupID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -911,10 +1144,23 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupId:%@; >", NSStringFromClass([self class]), _groupId]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: groupID:%@; >", NSStringFromClass([self class]), _groupID]; return descriptionString; } +@end + +@implementation MTRScenesClusterGetSceneMembershipParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} @end @implementation MTRScenesClusterGetSceneMembershipResponseParams - (instancetype)init @@ -925,7 +1171,7 @@ - (instancetype)init _capacity = nil; - _groupId = @(0); + _groupID = @(0); _sceneList = nil; _timedInvokeTimeoutMs = nil; @@ -939,7 +1185,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; other.status = self.status; other.capacity = self.capacity; - other.groupId = self.groupId; + other.groupID = self.groupID; other.sceneList = self.sceneList; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -948,20 +1194,33 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; capacity:%@; groupId:%@; sceneList:%@; >", - NSStringFromClass([self class]), _status, _capacity, _groupId, _sceneList]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; capacity:%@; groupID:%@; sceneList:%@; >", + NSStringFromClass([self class]), _status, _capacity, _groupID, _sceneList]; return descriptionString; } +@end + +@implementation MTRScenesClusterGetSceneMembershipResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} @end @implementation MTRScenesClusterEnhancedAddSceneParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _transitionTime = @(0); @@ -978,8 +1237,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterEnhancedAddSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.transitionTime = self.transitionTime; other.sceneName = self.sceneName; other.extensionFieldSets = self.extensionFieldSets; @@ -992,11 +1251,34 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", - NSStringFromClass([self class]), _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets]; + [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", + NSStringFromClass([self class]), _groupID, _sceneID, _transitionTime, _sceneName, _extensionFieldSets]; return descriptionString; } +@end + +@implementation MTRScenesClusterEnhancedAddSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterEnhancedAddSceneResponseParams - (instancetype)init @@ -1005,9 +1287,9 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; } return self; @@ -1018,8 +1300,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterEnhancedAddSceneResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; return other; @@ -1027,20 +1309,43 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; >", - NSStringFromClass([self class]), _status, _groupId, _sceneId]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupID:%@; sceneID:%@; >", + NSStringFromClass([self class]), _status, _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterEnhancedAddSceneResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterEnhancedViewSceneParams - (instancetype)init { if (self = [super init]) { - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -1051,8 +1356,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; { auto other = [[MTRScenesClusterEnhancedViewSceneParams alloc] init]; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -1062,10 +1367,33 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = - [NSString stringWithFormat:@"<%@: groupId:%@; sceneId:%@; >", NSStringFromClass([self class]), _groupId, _sceneId]; + [NSString stringWithFormat:@"<%@: groupID:%@; sceneID:%@; >", NSStringFromClass([self class]), _groupID, _sceneID]; return descriptionString; } +@end + +@implementation MTRScenesClusterEnhancedViewSceneParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterEnhancedViewSceneResponseParams - (instancetype)init @@ -1074,9 +1402,9 @@ - (instancetype)init _status = @(0); - _groupId = @(0); + _groupID = @(0); - _sceneId = @(0); + _sceneID = @(0); _transitionTime = nil; @@ -1093,8 +1421,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterEnhancedViewSceneResponseParams alloc] init]; other.status = self.status; - other.groupId = self.groupId; - other.sceneId = self.sceneId; + other.groupID = self.groupID; + other.sceneID = self.sceneID; other.transitionTime = self.transitionTime; other.sceneName = self.sceneName; other.extensionFieldSets = self.extensionFieldSets; @@ -1106,11 +1434,34 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { NSString * descriptionString = [NSString - stringWithFormat:@"<%@: status:%@; groupId:%@; sceneId:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", - NSStringFromClass([self class]), _status, _groupId, _sceneId, _transitionTime, _sceneName, _extensionFieldSets]; + stringWithFormat:@"<%@: status:%@; groupID:%@; sceneID:%@; transitionTime:%@; sceneName:%@; extensionFieldSets:%@; >", + NSStringFromClass([self class]), _status, _groupID, _sceneID, _transitionTime, _sceneName, _extensionFieldSets]; return descriptionString; } +@end + +@implementation MTRScenesClusterEnhancedViewSceneResponseParams (Deprecated) + +- (void)setGroupId:(NSNumber * _Nonnull)groupId +{ + self.groupID = groupId; +} + +- (NSNumber * _Nonnull)groupId +{ + return self.groupID; +} + +- (void)setSceneId:(NSNumber * _Nonnull)sceneId +{ + self.sceneID = sceneId; +} + +- (NSNumber * _Nonnull)sceneId +{ + return self.sceneID; +} @end @implementation MTRScenesClusterCopySceneParams - (instancetype)init @@ -1119,13 +1470,13 @@ - (instancetype)init _mode = @(0); - _groupIdFrom = @(0); + _groupIdentifierFrom = @(0); - _sceneIdFrom = @(0); + _sceneIdentifierFrom = @(0); - _groupIdTo = @(0); + _groupIdentifierTo = @(0); - _sceneIdTo = @(0); + _sceneIdentifierTo = @(0); _timedInvokeTimeoutMs = nil; _serverSideProcessingTimeout = nil; } @@ -1137,10 +1488,10 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterCopySceneParams alloc] init]; other.mode = self.mode; - other.groupIdFrom = self.groupIdFrom; - other.sceneIdFrom = self.sceneIdFrom; - other.groupIdTo = self.groupIdTo; - other.sceneIdTo = self.sceneIdTo; + other.groupIdentifierFrom = self.groupIdentifierFrom; + other.sceneIdentifierFrom = self.sceneIdentifierFrom; + other.groupIdentifierTo = self.groupIdentifierTo; + other.sceneIdentifierTo = self.sceneIdentifierTo; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; @@ -1149,12 +1500,56 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = - [NSString stringWithFormat:@"<%@: mode:%@; groupIdFrom:%@; sceneIdFrom:%@; groupIdTo:%@; sceneIdTo:%@; >", - NSStringFromClass([self class]), _mode, _groupIdFrom, _sceneIdFrom, _groupIdTo, _sceneIdTo]; + NSString * descriptionString = [NSString + stringWithFormat: + @"<%@: mode:%@; groupIdentifierFrom:%@; sceneIdentifierFrom:%@; groupIdentifierTo:%@; sceneIdentifierTo:%@; >", + NSStringFromClass([self class]), _mode, _groupIdentifierFrom, _sceneIdentifierFrom, _groupIdentifierTo, _sceneIdentifierTo]; return descriptionString; } +@end + +@implementation MTRScenesClusterCopySceneParams (Deprecated) + +- (void)setGroupIdFrom:(NSNumber * _Nonnull)groupIdFrom +{ + self.groupIdentifierFrom = groupIdFrom; +} + +- (NSNumber * _Nonnull)groupIdFrom +{ + return self.groupIdentifierFrom; +} + +- (void)setSceneIdFrom:(NSNumber * _Nonnull)sceneIdFrom +{ + self.sceneIdentifierFrom = sceneIdFrom; +} + +- (NSNumber * _Nonnull)sceneIdFrom +{ + return self.sceneIdentifierFrom; +} + +- (void)setGroupIdTo:(NSNumber * _Nonnull)groupIdTo +{ + self.groupIdentifierTo = groupIdTo; +} + +- (NSNumber * _Nonnull)groupIdTo +{ + return self.groupIdentifierTo; +} + +- (void)setSceneIdTo:(NSNumber * _Nonnull)sceneIdTo +{ + self.sceneIdentifierTo = sceneIdTo; +} + +- (NSNumber * _Nonnull)sceneIdTo +{ + return self.sceneIdentifierTo; +} @end @implementation MTRScenesClusterCopySceneResponseParams - (instancetype)init @@ -1163,9 +1558,9 @@ - (instancetype)init _status = @(0); - _groupIdFrom = @(0); + _groupIdentifierFrom = @(0); - _sceneIdFrom = @(0); + _sceneIdentifierFrom = @(0); _timedInvokeTimeoutMs = nil; } return self; @@ -1176,8 +1571,8 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; auto other = [[MTRScenesClusterCopySceneResponseParams alloc] init]; other.status = self.status; - other.groupIdFrom = self.groupIdFrom; - other.sceneIdFrom = self.sceneIdFrom; + other.groupIdentifierFrom = self.groupIdentifierFrom; + other.sceneIdentifierFrom = self.sceneIdentifierFrom; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; return other; @@ -1185,11 +1580,34 @@ - (id)copyWithZone:(NSZone * _Nullable)zone; - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupIdFrom:%@; sceneIdFrom:%@; >", - NSStringFromClass([self class]), _status, _groupIdFrom, _sceneIdFrom]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: status:%@; groupIdentifierFrom:%@; sceneIdentifierFrom:%@; >", + NSStringFromClass([self class]), _status, _groupIdentifierFrom, _sceneIdentifierFrom]; return descriptionString; } +@end + +@implementation MTRScenesClusterCopySceneResponseParams (Deprecated) + +- (void)setGroupIdFrom:(NSNumber * _Nonnull)groupIdFrom +{ + self.groupIdentifierFrom = groupIdFrom; +} + +- (NSNumber * _Nonnull)groupIdFrom +{ + return self.groupIdentifierFrom; +} + +- (void)setSceneIdFrom:(NSNumber * _Nonnull)sceneIdFrom +{ + self.sceneIdentifierFrom = sceneIdFrom; +} + +- (NSNumber * _Nonnull)sceneIdFrom +{ + return self.sceneIdentifierFrom; +} @end @implementation MTROnOffClusterOffParams - (instancetype)init diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index ded81da62c0444..ceb991b57649cd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -21,13 +21,17 @@ NS_ASSUME_NONNULL_BEGIN API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterAttributeValuePair : NSObject -@property (nonatomic, copy) NSNumber * _Nullable attributeId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nullable attributeID MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable attributeId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use attributeID"); @property (nonatomic, copy) NSArray * _Nonnull attributeValue API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRScenesClusterExtensionFieldSet : NSObject -@property (nonatomic, copy) NSNumber * _Nonnull clusterId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +@property (nonatomic, copy) NSNumber * _Nonnull clusterID MTR_NEWLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull clusterId API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) + MTR_NEWLY_DEPRECATED("Please use clusterID"); @property (nonatomic, copy) NSArray * _Nonnull attributeValueList API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 21c96d9e460ed1..975e505e51ec9f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -24,7 +24,7 @@ - (instancetype)init { if (self = [super init]) { - _attributeId = nil; + _attributeID = nil; _attributeValue = [NSArray array]; } @@ -35,7 +35,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone { auto other = [[MTRScenesClusterAttributeValuePair alloc] init]; - other.attributeId = self.attributeId; + other.attributeID = self.attributeID; other.attributeValue = self.attributeValue; return other; @@ -43,11 +43,21 @@ - (id)copyWithZone:(NSZone * _Nullable)zone - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: attributeId:%@; attributeValue:%@; >", - NSStringFromClass([self class]), _attributeId, _attributeValue]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: attributeID:%@; attributeValue:%@; >", + NSStringFromClass([self class]), _attributeID, _attributeValue]; return descriptionString; } +- (void)setAttributeId:(NSNumber * _Nullable)attributeId +{ + self.attributeID = attributeId; +} + +- (NSNumber * _Nullable)attributeId +{ + return self.attributeID; +} + @end @implementation MTRScenesClusterExtensionFieldSet @@ -55,7 +65,7 @@ - (instancetype)init { if (self = [super init]) { - _clusterId = @(0); + _clusterID = @(0); _attributeValueList = [NSArray array]; } @@ -66,7 +76,7 @@ - (id)copyWithZone:(NSZone * _Nullable)zone { auto other = [[MTRScenesClusterExtensionFieldSet alloc] init]; - other.clusterId = self.clusterId; + other.clusterID = self.clusterID; other.attributeValueList = self.attributeValueList; return other; @@ -74,11 +84,21 @@ - (id)copyWithZone:(NSZone * _Nullable)zone - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: clusterId:%@; attributeValueList:%@; >", - NSStringFromClass([self class]), _clusterId, _attributeValueList]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: clusterID:%@; attributeValueList:%@; >", + NSStringFromClass([self class]), _clusterID, _attributeValueList]; return descriptionString; } +- (void)setClusterId:(NSNumber * _Nonnull)clusterId +{ + self.clusterID = clusterId; +} + +- (NSNumber * _Nonnull)clusterId +{ + return self.clusterID; +} + @end @implementation MTRDescriptorClusterDeviceTypeStruct diff --git a/zzz_generated/app-common/app-common/zap-generated/callback.h b/zzz_generated/app-common/app-common/zap-generated/callback.h index bd91719cd0f2a6..4f8e3743198027 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -7639,7 +7639,7 @@ bool emberAfScenesClusterAddSceneCallback(chip::app::CommandHandler * commandObj * @brief Scenes Cluster AddSceneResponse Command callback (from server) */ bool emberAfScenesClusterAddSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status, - chip::GroupId GroupId, uint8_t SceneId); + chip::GroupId GroupID, uint8_t SceneID); /** * @brief Scenes Cluster ViewScene Command callback (from client) */ @@ -7650,7 +7650,7 @@ bool emberAfScenesClusterViewSceneCallback(chip::app::CommandHandler * commandOb * @brief Scenes Cluster ViewSceneResponse Command callback (from server) */ bool emberAfScenesClusterViewSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status, - chip::GroupId GroupId, uint8_t SceneId, uint16_t TransitionTime, + chip::GroupId GroupID, uint8_t SceneID, uint16_t TransitionTime, chip::CharSpan SceneName, /* TYPE WARNING: array array defaults to */ uint8_t * ExtensionFieldSets); /** @@ -7663,7 +7663,7 @@ bool emberAfScenesClusterRemoveSceneCallback(chip::app::CommandHandler * command * @brief Scenes Cluster RemoveSceneResponse Command callback (from server) */ bool emberAfScenesClusterRemoveSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t Status, chip::GroupId GroupId, uint8_t SceneId); + uint8_t Status, chip::GroupId GroupID, uint8_t SceneID); /** * @brief Scenes Cluster RemoveAllScenes Command callback (from client) */ @@ -7674,7 +7674,7 @@ bool emberAfScenesClusterRemoveAllScenesCallback( * @brief Scenes Cluster RemoveAllScenesResponse Command callback (from server) */ bool emberAfScenesClusterRemoveAllScenesResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t Status, chip::GroupId GroupId); + uint8_t Status, chip::GroupId GroupID); /** * @brief Scenes Cluster StoreScene Command callback (from client) */ @@ -7685,7 +7685,7 @@ bool emberAfScenesClusterStoreSceneCallback(chip::app::CommandHandler * commandO * @brief Scenes Cluster StoreSceneResponse Command callback (from server) */ bool emberAfScenesClusterStoreSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t Status, chip::GroupId GroupId, uint8_t SceneId); + uint8_t Status, chip::GroupId GroupID, uint8_t SceneID); /** * @brief Scenes Cluster RecallScene Command callback (from client) */ @@ -7702,7 +7702,7 @@ bool emberAfScenesClusterGetSceneMembershipCallback( * @brief Scenes Cluster GetSceneMembershipResponse Command callback (from server) */ bool emberAfScenesClusterGetSceneMembershipResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t Status, uint8_t Capacity, chip::GroupId GroupId, + uint8_t Status, uint8_t Capacity, chip::GroupId GroupID, /* TYPE WARNING: array array defaults to */ uint8_t * SceneList); /** * @brief Scenes Cluster EnhancedAddScene Command callback (from client) @@ -7714,7 +7714,7 @@ bool emberAfScenesClusterEnhancedAddSceneCallback( * @brief Scenes Cluster EnhancedAddSceneResponse Command callback (from server) */ bool emberAfScenesClusterEnhancedAddSceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint8_t Status, chip::GroupId GroupId, uint8_t SceneId); + uint8_t Status, chip::GroupId GroupID, uint8_t SceneID); /** * @brief Scenes Cluster EnhancedViewScene Command callback (from client) */ @@ -7725,7 +7725,7 @@ bool emberAfScenesClusterEnhancedViewSceneCallback( * @brief Scenes Cluster EnhancedViewSceneResponse Command callback (from server) */ bool emberAfScenesClusterEnhancedViewSceneResponseCallback( - chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status, chip::GroupId GroupId, uint8_t SceneId, + chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status, chip::GroupId GroupID, uint8_t SceneID, uint16_t TransitionTime, chip::CharSpan SceneName, /* TYPE WARNING: array array defaults to */ uint8_t * ExtensionFieldSets); /** * @brief Scenes Cluster CopyScene Command callback (from client) @@ -7737,7 +7737,7 @@ bool emberAfScenesClusterCopySceneCallback(chip::app::CommandHandler * commandOb * @brief Scenes Cluster CopySceneResponse Command callback (from server) */ bool emberAfScenesClusterCopySceneResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, uint8_t Status, - chip::GroupId GroupIdFrom, uint8_t SceneIdFrom); + chip::GroupId GroupIdentifierFrom, uint8_t SceneIdentifierFrom); /** * @brief On/Off Cluster Off Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index d7cf365c928f49..25c76b14c33c66 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -107,6 +107,12 @@ enum class GroupClusterFeature : uint32_t namespace Scenes { +// Bitmap for SceneFeatures +enum class SceneFeatures : uint32_t +{ + kSceneNames = 0x1, +}; + // Bitmap for ScenesCopyMode enum class ScenesCopyMode : uint8_t { @@ -200,12 +206,6 @@ enum class OnOffFeature : uint32_t { kLighting = 0x1, }; - -// Bitmap for SceneFeatures -enum class SceneFeatures : uint32_t -{ - kSceneNames = 0x1, -}; } // namespace OnOff namespace OnOffSwitchConfiguration {} // namespace OnOffSwitchConfiguration 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 8ce0b83858e360..03fc87468fda2a 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 @@ -677,7 +677,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeId)), attributeId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeID)), attributeID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeValue)), attributeValue)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; @@ -698,8 +698,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kAttributeId): - ReturnErrorOnFailure(DataModel::Decode(reader, attributeId)); + case to_underlying(Fields::kAttributeID): + ReturnErrorOnFailure(DataModel::Decode(reader, attributeID)); break; case to_underlying(Fields::kAttributeValue): ReturnErrorOnFailure(DataModel::Decode(reader, attributeValue)); @@ -721,7 +721,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClusterId)), clusterId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kClusterID)), clusterID)); ReturnErrorOnFailure( DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kAttributeValueList)), attributeValueList)); ReturnErrorOnFailure(writer.EndContainer(outer)); @@ -743,8 +743,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kClusterId): - ReturnErrorOnFailure(DataModel::Decode(reader, clusterId)); + case to_underlying(Fields::kClusterID): + ReturnErrorOnFailure(DataModel::Decode(reader, clusterID)); break; case to_underlying(Fields::kAttributeValueList): ReturnErrorOnFailure(DataModel::Decode(reader, attributeValueList)); @@ -769,8 +769,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneName)), sceneName)); ReturnErrorOnFailure( @@ -793,11 +793,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; case to_underlying(Fields::kTransitionTime): ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); @@ -824,8 +824,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -847,11 +847,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -868,8 +868,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -888,11 +888,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -910,8 +910,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneName)), sceneName)); ReturnErrorOnFailure( @@ -937,11 +937,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; case to_underlying(Fields::kTransitionTime): ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); @@ -967,8 +967,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -987,11 +987,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -1009,8 +1009,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1032,11 +1032,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -1053,7 +1053,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1072,8 +1072,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; default: break; @@ -1091,7 +1091,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1113,8 +1113,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; default: break; @@ -1131,8 +1131,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1151,11 +1151,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -1173,8 +1173,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1196,11 +1196,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -1217,8 +1217,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; @@ -1238,11 +1238,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; case to_underlying(Fields::kTransitionTime): ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); @@ -1262,7 +1262,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1281,8 +1281,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; default: break; @@ -1301,7 +1301,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kCapacity)), capacity)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneList)), sceneList)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; @@ -1327,8 +1327,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kCapacity): ReturnErrorOnFailure(DataModel::Decode(reader, capacity)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; case to_underlying(Fields::kSceneList): ReturnErrorOnFailure(DataModel::Decode(reader, sceneList)); @@ -1348,8 +1348,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneName)), sceneName)); ReturnErrorOnFailure( @@ -1372,11 +1372,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; case to_underlying(Fields::kTransitionTime): ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); @@ -1403,8 +1403,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1426,11 +1426,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -1447,8 +1447,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1467,11 +1467,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; default: break; @@ -1489,8 +1489,8 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupId)), groupId)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneId)), sceneId)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupID)), groupID)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneID)), sceneID)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kTransitionTime)), transitionTime)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneName)), sceneName)); ReturnErrorOnFailure( @@ -1516,11 +1516,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupId): - ReturnErrorOnFailure(DataModel::Decode(reader, groupId)); + case to_underlying(Fields::kGroupID): + ReturnErrorOnFailure(DataModel::Decode(reader, groupID)); break; - case to_underlying(Fields::kSceneId): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneId)); + case to_underlying(Fields::kSceneID): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneID)); break; case to_underlying(Fields::kTransitionTime): ReturnErrorOnFailure(DataModel::Decode(reader, transitionTime)); @@ -1547,10 +1547,12 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kMode)), mode)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupIdFrom)), groupIdFrom)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneIdFrom)), sceneIdFrom)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupIdTo)), groupIdTo)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneIdTo)), sceneIdTo)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupIdentifierFrom)), groupIdentifierFrom)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneIdentifierFrom)), sceneIdentifierFrom)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupIdentifierTo)), groupIdentifierTo)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneIdentifierTo)), sceneIdentifierTo)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1572,17 +1574,17 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kMode): ReturnErrorOnFailure(DataModel::Decode(reader, mode)); break; - case to_underlying(Fields::kGroupIdFrom): - ReturnErrorOnFailure(DataModel::Decode(reader, groupIdFrom)); + case to_underlying(Fields::kGroupIdentifierFrom): + ReturnErrorOnFailure(DataModel::Decode(reader, groupIdentifierFrom)); break; - case to_underlying(Fields::kSceneIdFrom): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneIdFrom)); + case to_underlying(Fields::kSceneIdentifierFrom): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneIdentifierFrom)); break; - case to_underlying(Fields::kGroupIdTo): - ReturnErrorOnFailure(DataModel::Decode(reader, groupIdTo)); + case to_underlying(Fields::kGroupIdentifierTo): + ReturnErrorOnFailure(DataModel::Decode(reader, groupIdentifierTo)); break; - case to_underlying(Fields::kSceneIdTo): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneIdTo)); + case to_underlying(Fields::kSceneIdentifierTo): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneIdentifierTo)); break; default: break; @@ -1600,8 +1602,10 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kStatus)), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupIdFrom)), groupIdFrom)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneIdFrom)), sceneIdFrom)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kGroupIdentifierFrom)), groupIdentifierFrom)); + ReturnErrorOnFailure( + DataModel::Encode(writer, TLV::ContextTag(to_underlying(Fields::kSceneIdentifierFrom)), sceneIdentifierFrom)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -1623,11 +1627,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kStatus): ReturnErrorOnFailure(DataModel::Decode(reader, status)); break; - case to_underlying(Fields::kGroupIdFrom): - ReturnErrorOnFailure(DataModel::Decode(reader, groupIdFrom)); + case to_underlying(Fields::kGroupIdentifierFrom): + ReturnErrorOnFailure(DataModel::Decode(reader, groupIdentifierFrom)); break; - case to_underlying(Fields::kSceneIdFrom): - ReturnErrorOnFailure(DataModel::Decode(reader, sceneIdFrom)); + case to_underlying(Fields::kSceneIdentifierFrom): + ReturnErrorOnFailure(DataModel::Decode(reader, sceneIdentifierFrom)); break; default: break; 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 ee11788b87948d..f4144c83c67342 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 @@ -785,14 +785,14 @@ namespace Structs { namespace AttributeValuePair { enum class Fields { - kAttributeId = 0, + kAttributeID = 0, kAttributeValue = 1, }; struct Type { public: - Optional attributeId; + Optional attributeID; DataModel::List attributeValue; static constexpr bool kIsFabricScoped = false; @@ -803,7 +803,7 @@ struct Type struct DecodableType { public: - Optional attributeId; + Optional attributeID; DataModel::DecodableList attributeValue; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -815,14 +815,14 @@ struct DecodableType namespace ExtensionFieldSet { enum class Fields { - kClusterId = 0, + kClusterID = 0, kAttributeValueList = 1, }; struct Type { public: - chip::ClusterId clusterId = static_cast(0); + chip::ClusterId clusterID = static_cast(0); DataModel::List attributeValueList; static constexpr bool kIsFabricScoped = false; @@ -833,7 +833,7 @@ struct Type struct DecodableType { public: - chip::ClusterId clusterId = static_cast(0); + chip::ClusterId clusterID = static_cast(0); DataModel::DecodableList attributeValueList; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -948,8 +948,8 @@ namespace Commands { namespace AddScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, kTransitionTime = 2, kSceneName = 3, kExtensionFieldSets = 4, @@ -962,8 +962,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::AddScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); uint16_t transitionTime = static_cast(0); chip::CharSpan sceneName; DataModel::List extensionFieldSets; @@ -981,8 +981,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::AddScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); uint16_t transitionTime = static_cast(0); chip::CharSpan sceneName; DataModel::DecodableList extensionFieldSets; @@ -993,8 +993,8 @@ namespace AddSceneResponse { enum class Fields { kStatus = 0, - kGroupId = 1, - kSceneId = 2, + kGroupID = 1, + kSceneID = 2, }; struct Type @@ -1005,8 +1005,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1022,16 +1022,16 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace AddSceneResponse namespace ViewScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, }; struct Type @@ -1041,8 +1041,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::ViewScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1057,8 +1057,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::ViewScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ViewScene @@ -1066,8 +1066,8 @@ namespace ViewSceneResponse { enum class Fields { kStatus = 0, - kGroupId = 1, - kSceneId = 2, + kGroupID = 1, + kSceneID = 2, kTransitionTime = 3, kSceneName = 4, kExtensionFieldSets = 5, @@ -1081,8 +1081,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); Optional transitionTime; Optional sceneName; Optional> extensionFieldSets; @@ -1101,8 +1101,8 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); Optional transitionTime; Optional sceneName; Optional> extensionFieldSets; @@ -1112,8 +1112,8 @@ struct DecodableType namespace RemoveScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, }; struct Type @@ -1123,8 +1123,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::RemoveScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1139,8 +1139,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::RemoveScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace RemoveScene @@ -1148,8 +1148,8 @@ namespace RemoveSceneResponse { enum class Fields { kStatus = 0, - kGroupId = 1, - kSceneId = 2, + kGroupID = 1, + kSceneID = 2, }; struct Type @@ -1160,8 +1160,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1177,15 +1177,15 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace RemoveSceneResponse namespace RemoveAllScenes { enum class Fields { - kGroupId = 0, + kGroupID = 0, }; struct Type @@ -1195,7 +1195,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::RemoveAllScenes::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1210,7 +1210,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::RemoveAllScenes::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace RemoveAllScenes @@ -1218,7 +1218,7 @@ namespace RemoveAllScenesResponse { enum class Fields { kStatus = 0, - kGroupId = 1, + kGroupID = 1, }; struct Type @@ -1229,7 +1229,7 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1245,15 +1245,15 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace RemoveAllScenesResponse namespace StoreScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, }; struct Type @@ -1263,8 +1263,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::StoreScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1279,8 +1279,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::StoreScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace StoreScene @@ -1288,8 +1288,8 @@ namespace StoreSceneResponse { enum class Fields { kStatus = 0, - kGroupId = 1, - kSceneId = 2, + kGroupID = 1, + kSceneID = 2, }; struct Type @@ -1300,8 +1300,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1317,16 +1317,16 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace StoreSceneResponse namespace RecallScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, kTransitionTime = 2, }; @@ -1337,8 +1337,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::RecallScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); Optional> transitionTime; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1354,8 +1354,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::RecallScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); Optional> transitionTime; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -1363,7 +1363,7 @@ struct DecodableType namespace GetSceneMembership { enum class Fields { - kGroupId = 0, + kGroupID = 0, }; struct Type @@ -1373,7 +1373,7 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::GetSceneMembership::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1388,7 +1388,7 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::GetSceneMembership::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace GetSceneMembership @@ -1397,7 +1397,7 @@ enum class Fields { kStatus = 0, kCapacity = 1, - kGroupId = 2, + kGroupID = 2, kSceneList = 3, }; @@ -1410,7 +1410,7 @@ struct Type uint8_t status = static_cast(0); DataModel::Nullable capacity; - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); Optional> sceneList; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1428,7 +1428,7 @@ struct DecodableType uint8_t status = static_cast(0); DataModel::Nullable capacity; - chip::GroupId groupId = static_cast(0); + chip::GroupId groupID = static_cast(0); Optional> sceneList; CHIP_ERROR Decode(TLV::TLVReader & reader); }; @@ -1436,8 +1436,8 @@ struct DecodableType namespace EnhancedAddScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, kTransitionTime = 2, kSceneName = 3, kExtensionFieldSets = 4, @@ -1450,8 +1450,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::EnhancedAddScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); uint16_t transitionTime = static_cast(0); chip::CharSpan sceneName; DataModel::List extensionFieldSets; @@ -1469,8 +1469,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::EnhancedAddScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); uint16_t transitionTime = static_cast(0); chip::CharSpan sceneName; DataModel::DecodableList extensionFieldSets; @@ -1481,8 +1481,8 @@ namespace EnhancedAddSceneResponse { enum class Fields { kStatus = 0, - kGroupId = 1, - kSceneId = 2, + kGroupID = 1, + kSceneID = 2, }; struct Type @@ -1493,8 +1493,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1510,16 +1510,16 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace EnhancedAddSceneResponse namespace EnhancedViewScene { enum class Fields { - kGroupId = 0, - kSceneId = 1, + kGroupID = 0, + kSceneID = 1, }; struct Type @@ -1529,8 +1529,8 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::EnhancedViewScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1545,8 +1545,8 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::EnhancedViewScene::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace EnhancedViewScene @@ -1554,8 +1554,8 @@ namespace EnhancedViewSceneResponse { enum class Fields { kStatus = 0, - kGroupId = 1, - kSceneId = 2, + kGroupID = 1, + kSceneID = 2, kTransitionTime = 3, kSceneName = 4, kExtensionFieldSets = 5, @@ -1569,8 +1569,8 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); Optional transitionTime; Optional sceneName; Optional> extensionFieldSets; @@ -1589,8 +1589,8 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } uint8_t status = static_cast(0); - chip::GroupId groupId = static_cast(0); - uint8_t sceneId = static_cast(0); + chip::GroupId groupID = static_cast(0); + uint8_t sceneID = static_cast(0); Optional transitionTime; Optional sceneName; Optional> extensionFieldSets; @@ -1600,11 +1600,11 @@ struct DecodableType namespace CopyScene { enum class Fields { - kMode = 0, - kGroupIdFrom = 1, - kSceneIdFrom = 2, - kGroupIdTo = 3, - kSceneIdTo = 4, + kMode = 0, + kGroupIdentifierFrom = 1, + kSceneIdentifierFrom = 2, + kGroupIdentifierTo = 3, + kSceneIdentifierTo = 4, }; struct Type @@ -1615,10 +1615,10 @@ struct Type static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } chip::BitMask mode = static_cast>(0); - chip::GroupId groupIdFrom = static_cast(0); - uint8_t sceneIdFrom = static_cast(0); - chip::GroupId groupIdTo = static_cast(0); - uint8_t sceneIdTo = static_cast(0); + chip::GroupId groupIdentifierFrom = static_cast(0); + uint8_t sceneIdentifierFrom = static_cast(0); + chip::GroupId groupIdentifierTo = static_cast(0); + uint8_t sceneIdentifierTo = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1634,19 +1634,19 @@ struct DecodableType static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } chip::BitMask mode = static_cast>(0); - chip::GroupId groupIdFrom = static_cast(0); - uint8_t sceneIdFrom = static_cast(0); - chip::GroupId groupIdTo = static_cast(0); - uint8_t sceneIdTo = static_cast(0); + chip::GroupId groupIdentifierFrom = static_cast(0); + uint8_t sceneIdentifierFrom = static_cast(0); + chip::GroupId groupIdentifierTo = static_cast(0); + uint8_t sceneIdentifierTo = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace CopyScene namespace CopySceneResponse { enum class Fields { - kStatus = 0, - kGroupIdFrom = 1, - kSceneIdFrom = 2, + kStatus = 0, + kGroupIdentifierFrom = 1, + kSceneIdentifierFrom = 2, }; struct Type @@ -1656,9 +1656,9 @@ struct Type static constexpr CommandId GetCommandId() { return Commands::CopySceneResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - uint8_t status = static_cast(0); - chip::GroupId groupIdFrom = static_cast(0); - uint8_t sceneIdFrom = static_cast(0); + uint8_t status = static_cast(0); + chip::GroupId groupIdentifierFrom = static_cast(0); + uint8_t sceneIdentifierFrom = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -1673,9 +1673,9 @@ struct DecodableType static constexpr CommandId GetCommandId() { return Commands::CopySceneResponse::Id; } static constexpr ClusterId GetClusterId() { return Clusters::Scenes::Id; } - uint8_t status = static_cast(0); - chip::GroupId groupIdFrom = static_cast(0); - uint8_t sceneIdFrom = static_cast(0); + uint8_t status = static_cast(0); + chip::GroupId groupIdentifierFrom = static_cast(0); + uint8_t sceneIdentifierFrom = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace CopySceneResponse diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index ca80c9e90c8145..dfdbc2601f6d62 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -433,8 +433,8 @@ class ScenesAddScene : public ClusterCommand ScenesAddScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("add-scene", credsIssuerConfig), mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); AddArgument("SceneName", &mRequest.sceneName); AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets); @@ -469,8 +469,8 @@ class ScenesViewScene : public ClusterCommand public: ScenesViewScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("view-scene", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -500,8 +500,8 @@ class ScenesRemoveScene : public ClusterCommand public: ScenesRemoveScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("remove-scene", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -531,7 +531,7 @@ class ScenesRemoveAllScenes : public ClusterCommand public: ScenesRemoveAllScenes(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("remove-all-scenes", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); ClusterCommand::AddArguments(); } @@ -561,8 +561,8 @@ class ScenesStoreScene : public ClusterCommand public: ScenesStoreScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("store-scene", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -592,8 +592,8 @@ class ScenesRecallScene : public ClusterCommand public: ScenesRecallScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("recall-scene", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); ClusterCommand::AddArguments(); } @@ -625,7 +625,7 @@ class ScenesGetSceneMembership : public ClusterCommand ScenesGetSceneMembership(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("get-scene-membership", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); ClusterCommand::AddArguments(); } @@ -656,8 +656,8 @@ class ScenesEnhancedAddScene : public ClusterCommand ScenesEnhancedAddScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("enhanced-add-scene", credsIssuerConfig), mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); AddArgument("SceneName", &mRequest.sceneName); AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets); @@ -692,8 +692,8 @@ class ScenesEnhancedViewScene : public ClusterCommand public: ScenesEnhancedViewScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("enhanced-view-scene", credsIssuerConfig) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -724,10 +724,10 @@ class ScenesCopyScene : public ClusterCommand ScenesCopyScene(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("copy-scene", credsIssuerConfig) { AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode); - AddArgument("GroupIdFrom", 0, UINT16_MAX, &mRequest.groupIdFrom); - AddArgument("SceneIdFrom", 0, UINT8_MAX, &mRequest.sceneIdFrom); - AddArgument("GroupIdTo", 0, UINT16_MAX, &mRequest.groupIdTo); - AddArgument("SceneIdTo", 0, UINT8_MAX, &mRequest.sceneIdTo); + AddArgument("GroupIdentifierFrom", 0, UINT16_MAX, &mRequest.groupIdentifierFrom); + AddArgument("SceneIdentifierFrom", 0, UINT8_MAX, &mRequest.sceneIdentifierFrom); + AddArgument("GroupIdentifierTo", 0, UINT16_MAX, &mRequest.groupIdentifierTo); + AddArgument("SceneIdentifierTo", 0, UINT8_MAX, &mRequest.sceneIdentifierTo); ClusterCommand::AddArguments(); } diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 571f7c0ec3f1da..3127f85e5b9117 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -222,10 +222,10 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, value.isMember("attributeValue"))); char labelWithMember[kMaxLabelLength]; - if (value.isMember("attributeId")) + if (value.isMember("attributeID")) { - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "attributeId"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.attributeId, value["attributeId"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "attributeID"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.attributeID, value["attributeID"])); } snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "attributeValue"); @@ -236,7 +236,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, void ComplexArgumentParser::Finalize(chip::app::Clusters::Scenes::Structs::AttributeValuePair::Type & request) { - ComplexArgumentParser::Finalize(request.attributeId); + ComplexArgumentParser::Finalize(request.attributeID); ComplexArgumentParser::Finalize(request.attributeValue); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, @@ -644,13 +644,13 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("ExtensionFieldSet.clusterId", "clusterId", value.isMember("clusterId"))); + ComplexArgumentParser::EnsureMemberExist("ExtensionFieldSet.clusterID", "clusterID", value.isMember("clusterID"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ExtensionFieldSet.attributeValueList", "attributeValueList", value.isMember("attributeValueList"))); char labelWithMember[kMaxLabelLength]; - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "clusterId"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.clusterId, value["clusterId"])); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "clusterID"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.clusterID, value["clusterID"])); snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "attributeValueList"); ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.attributeValueList, value["attributeValueList"])); @@ -660,7 +660,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: void ComplexArgumentParser::Finalize(chip::app::Clusters::Scenes::Structs::ExtensionFieldSet::Type & request) { - ComplexArgumentParser::Finalize(request.clusterId); + ComplexArgumentParser::Finalize(request.clusterID); ComplexArgumentParser::Finalize(request.attributeValueList); } CHIP_ERROR 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 fd7004071e454e..b23d912a60a53e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -230,10 +230,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("AttributeId", indent + 1, value.attributeId); + CHIP_ERROR err = LogValue("AttributeID", indent + 1, value.attributeID); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'AttributeId'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'AttributeID'"); return err; } } @@ -643,10 +643,10 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); { - CHIP_ERROR err = LogValue("ClusterId", indent + 1, value.clusterId); + CHIP_ERROR err = LogValue("ClusterID", indent + 1, value.clusterID); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ClusterId'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'ClusterID'"); return err; } } @@ -3694,8 +3694,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } @@ -3704,8 +3704,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID)); ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime)); ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName)); ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets)); @@ -3717,8 +3717,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } @@ -3727,7 +3727,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } @@ -3736,8 +3736,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } @@ -3747,7 +3747,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); ReturnErrorOnFailure(DataModelLogger::LogValue("capacity", indent + 1, value.capacity)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); ReturnErrorOnFailure(DataModelLogger::LogValue("sceneList", indent + 1, value.sceneList)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -3757,8 +3757,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } @@ -3767,8 +3767,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupId", indent + 1, value.groupId)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneId", indent + 1, value.sceneId)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupID", indent + 1, value.groupID)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneID", indent + 1, value.sceneID)); ReturnErrorOnFailure(DataModelLogger::LogValue("transitionTime", indent + 1, value.transitionTime)); ReturnErrorOnFailure(DataModelLogger::LogValue("sceneName", indent + 1, value.sceneName)); ReturnErrorOnFailure(DataModelLogger::LogValue("extensionFieldSets", indent + 1, value.extensionFieldSets)); @@ -3780,8 +3780,8 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("groupIdFrom", indent + 1, value.groupIdFrom)); - ReturnErrorOnFailure(DataModelLogger::LogValue("sceneIdFrom", indent + 1, value.sceneIdFrom)); + ReturnErrorOnFailure(DataModelLogger::LogValue("groupIdentifierFrom", indent + 1, value.groupIdentifierFrom)); + ReturnErrorOnFailure(DataModelLogger::LogValue("sceneIdentifierFrom", indent + 1, value.sceneIdentifierFrom)); DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } 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 809f1bda6d0e4b..d34afdbcb5e437 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -1461,8 +1461,8 @@ class ScenesAddScene : public ClusterCommand { : ClusterCommand("add-scene") , mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); AddArgument("SceneName", &mRequest.sceneName); AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets); @@ -1478,8 +1478,8 @@ class ScenesAddScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterAddSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime]; params.sceneName = [[NSString alloc] initWithBytes:mRequest.sceneName.data() length:mRequest.sceneName.size() @@ -1489,16 +1489,16 @@ class ScenesAddScene : public ClusterCommand { for (auto & entry_0 : mRequest.extensionFieldSets) { MTRScenesClusterExtensionFieldSet * newElement_0; newElement_0 = [MTRScenesClusterExtensionFieldSet new]; - newElement_0.clusterId = [NSNumber numberWithUnsignedInt:entry_0.clusterId]; + newElement_0.clusterID = [NSNumber numberWithUnsignedInt:entry_0.clusterID]; { // Scope for our temporary variables auto * array_2 = [NSMutableArray new]; for (auto & entry_2 : entry_0.attributeValueList) { MTRScenesClusterAttributeValuePair * newElement_2; newElement_2 = [MTRScenesClusterAttributeValuePair new]; - if (entry_2.attributeId.HasValue()) { - newElement_2.attributeId = [NSNumber numberWithUnsignedInt:entry_2.attributeId.Value()]; + if (entry_2.attributeID.HasValue()) { + newElement_2.attributeID = [NSNumber numberWithUnsignedInt:entry_2.attributeID.Value()]; } else { - newElement_2.attributeId = nil; + newElement_2.attributeID = nil; } { // Scope for our temporary variables auto * array_4 = [NSMutableArray new]; @@ -1550,8 +1550,8 @@ class ScenesViewScene : public ClusterCommand { ScenesViewScene() : ClusterCommand("view-scene") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -1564,8 +1564,8 @@ class ScenesViewScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterViewSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -1597,8 +1597,8 @@ class ScenesRemoveScene : public ClusterCommand { ScenesRemoveScene() : ClusterCommand("remove-scene") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -1611,8 +1611,8 @@ class ScenesRemoveScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterRemoveSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -1645,7 +1645,7 @@ class ScenesRemoveAllScenes : public ClusterCommand { ScenesRemoveAllScenes() : ClusterCommand("remove-all-scenes") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); ClusterCommand::AddArguments(); } @@ -1658,7 +1658,7 @@ class ScenesRemoveAllScenes : public ClusterCommand { __auto_type * params = [[MTRScenesClusterRemoveAllScenesParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -1691,8 +1691,8 @@ class ScenesStoreScene : public ClusterCommand { ScenesStoreScene() : ClusterCommand("store-scene") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -1705,8 +1705,8 @@ class ScenesStoreScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterStoreSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -1739,8 +1739,8 @@ class ScenesRecallScene : public ClusterCommand { ScenesRecallScene() : ClusterCommand("recall-scene") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); ClusterCommand::AddArguments(); } @@ -1754,8 +1754,8 @@ class ScenesRecallScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterRecallSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; if (mRequest.transitionTime.HasValue()) { if (mRequest.transitionTime.Value().IsNull()) { params.transitionTime = nil; @@ -1795,7 +1795,7 @@ class ScenesGetSceneMembership : public ClusterCommand { ScenesGetSceneMembership() : ClusterCommand("get-scene-membership") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); ClusterCommand::AddArguments(); } @@ -1808,7 +1808,7 @@ class ScenesGetSceneMembership : public ClusterCommand { __auto_type * params = [[MTRScenesClusterGetSceneMembershipParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -1842,8 +1842,8 @@ class ScenesEnhancedAddScene : public ClusterCommand { : ClusterCommand("enhanced-add-scene") , mComplex_ExtensionFieldSets(&mRequest.extensionFieldSets) { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); AddArgument("TransitionTime", 0, UINT16_MAX, &mRequest.transitionTime); AddArgument("SceneName", &mRequest.sceneName); AddArgument("ExtensionFieldSets", &mComplex_ExtensionFieldSets); @@ -1859,8 +1859,8 @@ class ScenesEnhancedAddScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterEnhancedAddSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; params.transitionTime = [NSNumber numberWithUnsignedShort:mRequest.transitionTime]; params.sceneName = [[NSString alloc] initWithBytes:mRequest.sceneName.data() length:mRequest.sceneName.size() @@ -1870,16 +1870,16 @@ class ScenesEnhancedAddScene : public ClusterCommand { for (auto & entry_0 : mRequest.extensionFieldSets) { MTRScenesClusterExtensionFieldSet * newElement_0; newElement_0 = [MTRScenesClusterExtensionFieldSet new]; - newElement_0.clusterId = [NSNumber numberWithUnsignedInt:entry_0.clusterId]; + newElement_0.clusterID = [NSNumber numberWithUnsignedInt:entry_0.clusterID]; { // Scope for our temporary variables auto * array_2 = [NSMutableArray new]; for (auto & entry_2 : entry_0.attributeValueList) { MTRScenesClusterAttributeValuePair * newElement_2; newElement_2 = [MTRScenesClusterAttributeValuePair new]; - if (entry_2.attributeId.HasValue()) { - newElement_2.attributeId = [NSNumber numberWithUnsignedInt:entry_2.attributeId.Value()]; + if (entry_2.attributeID.HasValue()) { + newElement_2.attributeID = [NSNumber numberWithUnsignedInt:entry_2.attributeID.Value()]; } else { - newElement_2.attributeId = nil; + newElement_2.attributeID = nil; } { // Scope for our temporary variables auto * array_4 = [NSMutableArray new]; @@ -1932,8 +1932,8 @@ class ScenesEnhancedViewScene : public ClusterCommand { ScenesEnhancedViewScene() : ClusterCommand("enhanced-view-scene") { - AddArgument("GroupId", 0, UINT16_MAX, &mRequest.groupId); - AddArgument("SceneId", 0, UINT8_MAX, &mRequest.sceneId); + AddArgument("GroupID", 0, UINT16_MAX, &mRequest.groupID); + AddArgument("SceneID", 0, UINT8_MAX, &mRequest.sceneID); ClusterCommand::AddArguments(); } @@ -1946,8 +1946,8 @@ class ScenesEnhancedViewScene : public ClusterCommand { __auto_type * params = [[MTRScenesClusterEnhancedViewSceneParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - params.groupId = [NSNumber numberWithUnsignedShort:mRequest.groupId]; - params.sceneId = [NSNumber numberWithUnsignedChar:mRequest.sceneId]; + params.groupID = [NSNumber numberWithUnsignedShort:mRequest.groupID]; + params.sceneID = [NSNumber numberWithUnsignedChar:mRequest.sceneID]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { @@ -1981,10 +1981,10 @@ class ScenesCopyScene : public ClusterCommand { : ClusterCommand("copy-scene") { AddArgument("Mode", 0, UINT8_MAX, &mRequest.mode); - AddArgument("GroupIdFrom", 0, UINT16_MAX, &mRequest.groupIdFrom); - AddArgument("SceneIdFrom", 0, UINT8_MAX, &mRequest.sceneIdFrom); - AddArgument("GroupIdTo", 0, UINT16_MAX, &mRequest.groupIdTo); - AddArgument("SceneIdTo", 0, UINT8_MAX, &mRequest.sceneIdTo); + AddArgument("GroupIdentifierFrom", 0, UINT16_MAX, &mRequest.groupIdentifierFrom); + AddArgument("SceneIdentifierFrom", 0, UINT8_MAX, &mRequest.sceneIdentifierFrom); + AddArgument("GroupIdentifierTo", 0, UINT16_MAX, &mRequest.groupIdentifierTo); + AddArgument("SceneIdentifierTo", 0, UINT8_MAX, &mRequest.sceneIdentifierTo); ClusterCommand::AddArguments(); } @@ -1998,10 +1998,10 @@ class ScenesCopyScene : public ClusterCommand { params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.mode = [NSNumber numberWithUnsignedChar:mRequest.mode.Raw()]; - params.groupIdFrom = [NSNumber numberWithUnsignedShort:mRequest.groupIdFrom]; - params.sceneIdFrom = [NSNumber numberWithUnsignedChar:mRequest.sceneIdFrom]; - params.groupIdTo = [NSNumber numberWithUnsignedShort:mRequest.groupIdTo]; - params.sceneIdTo = [NSNumber numberWithUnsignedChar:mRequest.sceneIdTo]; + params.groupIdentifierFrom = [NSNumber numberWithUnsignedShort:mRequest.groupIdentifierFrom]; + params.sceneIdentifierFrom = [NSNumber numberWithUnsignedChar:mRequest.sceneIdentifierFrom]; + params.groupIdentifierTo = [NSNumber numberWithUnsignedShort:mRequest.groupIdentifierTo]; + params.sceneIdentifierTo = [NSNumber numberWithUnsignedChar:mRequest.sceneIdentifierTo]; uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) {