From c0295ae730372de40051fcf340bd458be08f9b8f Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 25 May 2022 21:24:25 -0400 Subject: [PATCH] Remove IdentifyQuery. (#18819) This command has been removed from Matter. See https://github.com/CHIP-Specifications/connectedhomeip-spec/pull/5240 Fixes https://github.com/project-chip/connectedhomeip/issues/17133 --- .../all-clusters-app.matter | 5 - .../all-clusters-common/all-clusters-app.zap | 154 ++----- .../bridge-app/bridge-common/bridge-app.zap | 34 +- examples/chef/devices/lighting-app.zap | 104 ++--- .../light-switch-app.matter | 5 - .../light-switch-common/light-switch-app.zap | 67 +-- .../lighting-common/lighting-app.matter | 5 - .../lighting-common/lighting-app.zap | 65 +-- examples/lock-app/lock-common/lock-app.matter | 5 - examples/lock-app/lock-common/lock-app.zap | 64 +-- .../log-source-common/log-source-app.zap | 34 +- .../ota-provider-common/ota-provider-app.zap | 34 +- .../ota-requestor-app.zap | 34 +- .../placeholder/linux/apps/app1/config.matter | 5 - .../placeholder/linux/apps/app1/config.zap | 90 ++-- .../placeholder/linux/apps/app2/config.matter | 5 - .../placeholder/linux/apps/app2/config.zap | 90 ++-- examples/pump-app/pump-common/pump-app.matter | 5 - examples/pump-app/pump-common/pump-app.zap | 54 +-- .../pump-controller-app.matter | 5 - .../pump-controller-app.zap | 37 +- .../esp32/main/temperature-measurement.zap | 40 +- .../thermostat-common/thermostat.matter | 10 - .../thermostat-common/thermostat.zap | 105 ++--- examples/tv-app/tv-common/tv-app.zap | 22 +- .../tv-casting-common/tv-casting-app.matter | 5 - .../tv-casting-common/tv-casting-app.zap | 395 ++++++++---------- examples/window-app/common/window-app.matter | 5 - examples/window-app/common/window-app.zap | 97 +---- .../identify-server/identify-server.cpp | 55 --- .../suites/certification/Test_TC_I_1_1.yaml | 4 +- .../suites/certification/Test_TC_I_2_2.yaml | 74 ---- .../suites/certification/Test_TC_I_3_2.yaml | 34 -- .../zcl/data-model/chip/identify-cluster.xml | 12 - .../data_model/controller-clusters.matter | 5 - .../data_model/controller-clusters.zap | 92 ++-- .../java/zap-generated/CHIPCallbackTypes.h | 2 - .../zap-generated/CHIPInvokeCallbacks.cpp | 59 --- .../java/zap-generated/CHIPInvokeCallbacks.h | 15 - .../chip/devicecontroller/ChipClusters.java | 20 - .../devicecontroller/ClusterInfoMapping.java | 36 -- .../python/chip/clusters/CHIPClusters.py | 6 - .../python/chip/clusters/Objects.py | 28 -- .../CHIP/zap-generated/CHIPCallbackBridge.mm | 10 - .../CHIPCallbackBridge_internal.h | 14 - .../CHIP/zap-generated/CHIPClustersObjc.h | 5 - .../CHIP/zap-generated/CHIPClustersObjc.mm | 27 -- .../zap-generated/CHIPCommandPayloadsObjc.h | 40 -- .../zap-generated/CHIPCommandPayloadsObjc.mm | 20 - .../zap-generated/MatterClusterConstants.h | 2 - .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../all-clusters-app/zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 240 +++++------ .../app-common/zap-generated/callback.h | 11 - .../zap-generated/cluster-objects.cpp | 70 ---- .../zap-generated/cluster-objects.h | 70 ---- .../app-common/zap-generated/command-id.h | 2 - .../app-common/zap-generated/ids/Commands.h | 8 - .../zap-generated/cluster/Commands.h | 44 -- .../zap-generated/test/Commands.h | 8 +- .../zap-generated/cluster/Commands.h | 31 -- .../cluster/logging/DataModelLogger.cpp | 19 - .../cluster/logging/DataModelLogger.h | 2 - .../chip-tool/zap-generated/test/Commands.h | 10 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../light-switch-app/zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 14 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../lighting-app/zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - zzz_generated/lock-app/zap-generated/access.h | 3 - .../lock-app/zap-generated/endpoint_config.h | 26 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../placeholder/app1/zap-generated/access.h | 3 - .../app1/zap-generated/endpoint_config.h | 34 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../placeholder/app2/zap-generated/access.h | 3 - .../app2/zap-generated/endpoint_config.h | 34 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - zzz_generated/pump-app/zap-generated/access.h | 3 - .../pump-app/zap-generated/endpoint_config.h | 86 ++-- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 70 ++-- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../thermostat/zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 92 ++-- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../tv-casting-app/zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 46 +- .../zap-generated/IMClusterCommandHandler.cpp | 9 - .../window-app/zap-generated/access.h | 3 - .../zap-generated/endpoint_config.h | 30 +- 94 files changed, 827 insertions(+), 2418 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 c063ae3315e437..fb6f5cb382b0c1 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 @@ -1835,12 +1835,7 @@ server cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap index 35d696265aebbe..4c34a523c26579 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap @@ -52,14 +52,6 @@ "incoming": 1, "outgoing": 1 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, { "name": "TriggerEffect", "code": 64, @@ -95,16 +87,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -483,7 +466,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -499,7 +482,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -515,11 +498,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -531,7 +514,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -547,7 +530,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -8826,14 +8809,6 @@ "incoming": 1, "outgoing": 1 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, { "name": "TriggerEffect", "code": 64, @@ -8869,16 +8844,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -9257,7 +9223,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -9273,7 +9239,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -9289,11 +9255,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9305,7 +9271,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -9321,7 +9287,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -14635,7 +14601,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -14790,22 +14756,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "FeatureMap", "code": 65532, @@ -14935,7 +14885,7 @@ ], "attributes": [ { - "name": "local temperature", + "name": "LocalTemperature", "code": 0, "mfgCode": null, "side": "server", @@ -14951,7 +14901,7 @@ "reportableChange": 0 }, { - "name": "abs min heat setpoint limit", + "name": "AbsMinHeatSetpointLimit", "code": 3, "mfgCode": null, "side": "server", @@ -14967,7 +14917,7 @@ "reportableChange": 0 }, { - "name": "abs max heat setpoint limit", + "name": "AbsMaxHeatSetpointLimit", "code": 4, "mfgCode": null, "side": "server", @@ -14983,7 +14933,7 @@ "reportableChange": 0 }, { - "name": "abs min cool setpoint limit", + "name": "AbsMinCoolSetpointLimit", "code": 5, "mfgCode": null, "side": "server", @@ -14999,7 +14949,7 @@ "reportableChange": 0 }, { - "name": "abs max cool setpoint limit", + "name": "AbsMaxCoolSetpointLimit", "code": 6, "mfgCode": null, "side": "server", @@ -15015,7 +14965,7 @@ "reportableChange": 0 }, { - "name": "pi cooling demand", + "name": "PICoolingDemand", "code": 7, "mfgCode": null, "side": "server", @@ -15031,7 +14981,7 @@ "reportableChange": 0 }, { - "name": "pi heating demand", + "name": "PIHeatingDemand", "code": 8, "mfgCode": null, "side": "server", @@ -15047,7 +14997,7 @@ "reportableChange": 0 }, { - "name": "occupied cooling setpoint", + "name": "OccupiedCoolingSetpoint", "code": 17, "mfgCode": null, "side": "server", @@ -15063,7 +15013,7 @@ "reportableChange": 0 }, { - "name": "occupied heating setpoint", + "name": "OccupiedHeatingSetpoint", "code": 18, "mfgCode": null, "side": "server", @@ -15079,7 +15029,7 @@ "reportableChange": 0 }, { - "name": "min heat setpoint limit", + "name": "MinHeatSetpointLimit", "code": 21, "mfgCode": null, "side": "server", @@ -15095,7 +15045,7 @@ "reportableChange": 0 }, { - "name": "max heat setpoint limit", + "name": "MaxHeatSetpointLimit", "code": 22, "mfgCode": null, "side": "server", @@ -15111,7 +15061,7 @@ "reportableChange": 0 }, { - "name": "min cool setpoint limit", + "name": "MinCoolSetpointLimit", "code": 23, "mfgCode": null, "side": "server", @@ -15127,7 +15077,7 @@ "reportableChange": 0 }, { - "name": "max cool setpoint limit", + "name": "MaxCoolSetpointLimit", "code": 24, "mfgCode": null, "side": "server", @@ -15143,7 +15093,7 @@ "reportableChange": 0 }, { - "name": "min setpoint dead band", + "name": "MinSetpointDeadBand", "code": 25, "mfgCode": null, "side": "server", @@ -15159,7 +15109,7 @@ "reportableChange": 0 }, { - "name": "control sequence of operation", + "name": "ControlSequenceOfOperation", "code": 27, "mfgCode": null, "side": "server", @@ -15175,7 +15125,7 @@ "reportableChange": 0 }, { - "name": "system mode", + "name": "SystemMode", "code": 28, "mfgCode": null, "side": "server", @@ -15191,7 +15141,7 @@ "reportableChange": 0 }, { - "name": "start of week", + "name": "StartOfWeek", "code": 32, "mfgCode": null, "side": "server", @@ -15207,7 +15157,7 @@ "reportableChange": 0 }, { - "name": "number of weekly transitions", + "name": "NumberOfWeeklyTransitions", "code": 33, "mfgCode": null, "side": "server", @@ -15223,7 +15173,7 @@ "reportableChange": 0 }, { - "name": "number of daily transitions", + "name": "NumberOfDailyTransitions", "code": 34, "mfgCode": null, "side": "server", @@ -15239,7 +15189,7 @@ "reportableChange": 0 }, { - "name": "temperature setpoint hold", + "name": "TemperatureSetpointHold", "code": 35, "mfgCode": null, "side": "server", @@ -21221,14 +21171,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -21257,16 +21199,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -21613,7 +21546,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -21629,7 +21562,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -21645,11 +21578,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -21661,7 +21594,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -21677,7 +21610,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -25510,6 +25443,5 @@ "endpointVersion": 1, "deviceIdentifier": 61442 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/bridge-app/bridge-common/bridge-app.zap b/examples/bridge-app/bridge-common/bridge-app.zap index 03b8f76b8cc0cb..9c4c129a17a05a 100644 --- a/examples/bridge-app/bridge-common/bridge-app.zap +++ b/examples/bridge-app/bridge-common/bridge-app.zap @@ -3990,14 +3990,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -4026,16 +4018,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -4366,7 +4349,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -4382,7 +4365,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -4398,11 +4381,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4414,7 +4397,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -4430,7 +4413,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5667,6 +5650,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/chef/devices/lighting-app.zap b/examples/chef/devices/lighting-app.zap index 13de36bedceccc..2868176f0c6b6d 100644 --- a/examples/chef/devices/lighting-app.zap +++ b/examples/chef/devices/lighting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 70, + "featureLevel": 71, "creator": "zap", "keyValuePairs": [ { @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -443,7 +426,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -459,7 +442,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -475,11 +458,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -507,7 +490,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5331,14 +5314,6 @@ "incoming": 1, "outgoing": 0 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, { "name": "TriggerEffect", "code": 64, @@ -5374,16 +5349,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -5786,7 +5752,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -5802,7 +5768,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -5818,11 +5784,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5834,7 +5800,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -5850,7 +5816,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -6200,7 +6166,7 @@ "reportableChange": 0 }, { - "name": "RemainingTime", + "name": "remaining time", "code": 1, "mfgCode": null, "side": "server", @@ -7235,7 +7201,7 @@ "reportableChange": 0 }, { - "name": "currentX", + "name": "CurrentX", "code": 3, "mfgCode": null, "side": "server", @@ -7251,7 +7217,7 @@ "reportableChange": 0 }, { - "name": "currentY", + "name": "CurrentY", "code": 4, "mfgCode": null, "side": "server", @@ -7283,7 +7249,7 @@ "reportableChange": 0 }, { - "name": "compensation text", + "name": "CompensationText", "code": 6, "mfgCode": null, "side": "server", @@ -7299,7 +7265,7 @@ "reportableChange": 0 }, { - "name": "color temperature", + "name": "ColorTemperature", "code": 7, "mfgCode": null, "side": "server", @@ -7315,7 +7281,7 @@ "reportableChange": 0 }, { - "name": "color mode", + "name": "ColorMode", "code": 8, "mfgCode": null, "side": "server", @@ -7331,7 +7297,7 @@ "reportableChange": 0 }, { - "name": "color control options", + "name": "Options", "code": 15, "mfgCode": null, "side": "server", @@ -7347,7 +7313,7 @@ "reportableChange": 0 }, { - "name": "number of primaries", + "name": "NumberOfPrimaries", "code": 16, "mfgCode": null, "side": "server", @@ -7363,7 +7329,7 @@ "reportableChange": 0 }, { - "name": "enhanced current hue", + "name": "EnhancedCurrentHue", "code": 16384, "mfgCode": null, "side": "server", @@ -7379,7 +7345,7 @@ "reportableChange": 0 }, { - "name": "enhanced color mode", + "name": "EnhancedColorMode", "code": 16385, "mfgCode": null, "side": "server", @@ -7395,7 +7361,7 @@ "reportableChange": 0 }, { - "name": "color loop active", + "name": "ColorLoopActive", "code": 16386, "mfgCode": null, "side": "server", @@ -7411,7 +7377,7 @@ "reportableChange": 0 }, { - "name": "color loop direction", + "name": "ColorLoopDirection", "code": 16387, "mfgCode": null, "side": "server", @@ -7427,7 +7393,7 @@ "reportableChange": 0 }, { - "name": "color loop time", + "name": "ColorLoopTime", "code": 16388, "mfgCode": null, "side": "server", @@ -7443,7 +7409,7 @@ "reportableChange": 0 }, { - "name": "color loop start enhanced hue", + "name": "ColorLoopStartEnhancedHue", "code": 16389, "mfgCode": null, "side": "server", @@ -7459,7 +7425,7 @@ "reportableChange": 0 }, { - "name": "color loop stored enhanced hue", + "name": "ColorLoopStoredEnhancedHue", "code": 16390, "mfgCode": null, "side": "server", @@ -7475,7 +7441,7 @@ "reportableChange": 0 }, { - "name": "color capabilities", + "name": "ColorCapabilities", "code": 16394, "mfgCode": null, "side": "server", @@ -7491,7 +7457,7 @@ "reportableChange": 0 }, { - "name": "color temp physical min", + "name": "ColorTempPhysicalMinMireds", "code": 16395, "mfgCode": null, "side": "server", @@ -7507,7 +7473,7 @@ "reportableChange": 0 }, { - "name": "color temp physical max", + "name": "ColorTempPhysicalMaxMireds", "code": 16396, "mfgCode": null, "side": "server", @@ -7523,7 +7489,7 @@ "reportableChange": 0 }, { - "name": "couple color temp to level min-mireds", + "name": "CoupleColorTempToLevelMinMireds", "code": 16397, "mfgCode": null, "side": "server", @@ -7539,7 +7505,7 @@ "reportableChange": 0 }, { - "name": "start up color temperature mireds", + "name": "StartUpColorTemperatureMireds", "code": 16400, "mfgCode": null, "side": "server", diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 1c2a563b0acbc1..1c7012fd25b73f 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 @@ -824,12 +824,7 @@ server cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.zap b/examples/light-switch-app/light-switch-common/light-switch-app.zap index 6c027a689f095d..e5b192c4b10850 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.zap +++ b/examples/light-switch-app/light-switch-common/light-switch-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -427,7 +410,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -443,7 +426,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -459,11 +442,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -475,7 +458,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5330,14 +5313,6 @@ "incoming": 1, "outgoing": 0 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, { "name": "TriggerEffect", "code": 64, @@ -5389,16 +5364,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -5897,7 +5863,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -5913,7 +5879,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -5929,11 +5895,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5945,7 +5911,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -5961,7 +5927,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5977,7 +5943,7 @@ "reportableChange": 0 }, { - "name": "last configured by", + "name": "LastConfiguredBy", "code": 5, "mfgCode": null, "side": "server", @@ -8005,6 +7971,5 @@ "endpointVersion": 1, "deviceIdentifier": 259 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 34bd21a04cc396..e9be0c6640002f 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -806,12 +806,7 @@ server cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/examples/lighting-app/lighting-common/lighting-app.zap b/examples/lighting-app/lighting-common/lighting-app.zap index f1bd32ef520e1b..1032aac7eda48b 100644 --- a/examples/lighting-app/lighting-common/lighting-app.zap +++ b/examples/lighting-app/lighting-common/lighting-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -443,7 +426,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -459,7 +442,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -475,11 +458,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -507,7 +490,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5347,14 +5330,6 @@ "incoming": 1, "outgoing": 0 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, { "name": "TriggerEffect", "code": 64, @@ -5390,16 +5365,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -5802,7 +5768,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -5818,7 +5784,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -5834,11 +5800,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -5850,7 +5816,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -5866,7 +5832,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -8256,6 +8222,5 @@ "endpointVersion": 1, "deviceIdentifier": 257 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index 3cf4d4ddc39b11..1fd3d998899224 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1026,12 +1026,7 @@ server cluster Identify = 3 { INT16U identifyTime = 0; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; } server cluster LocalizationConfiguration = 43 { diff --git a/examples/lock-app/lock-common/lock-app.zap b/examples/lock-app/lock-common/lock-app.zap index ca2383d6424f0a..04a7905e06bf85 100755 --- a/examples/lock-app/lock-common/lock-app.zap +++ b/examples/lock-app/lock-common/lock-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 70, + "featureLevel": 71, "creator": "zap", "keyValuePairs": [ { @@ -207,14 +207,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -243,16 +235,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -583,7 +566,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -599,7 +582,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -615,11 +598,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -631,7 +614,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -647,7 +630,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5552,14 +5535,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -5588,16 +5563,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -5960,7 +5926,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -5976,7 +5942,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -5992,11 +5958,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6008,7 +5974,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -6024,7 +5990,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", diff --git a/examples/log-source-app/log-source-common/log-source-app.zap b/examples/log-source-app/log-source-common/log-source-app.zap index 4b73cfbc2705c8..73399a75a46d32 100644 --- a/examples/log-source-app/log-source-common/log-source-app.zap +++ b/examples/log-source-app/log-source-common/log-source-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -427,7 +410,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -443,7 +426,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -459,11 +442,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -475,7 +458,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -3932,6 +3915,5 @@ "endpointVersion": 1, "deviceIdentifier": null } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap index 792311f5f6ce2f..ad244aaa64ecd0 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -427,7 +410,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -443,7 +426,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -459,11 +442,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -475,7 +458,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -4645,6 +4628,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap index 81be7f672473d1..7a7b58fa9f1e25 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -427,7 +410,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -443,7 +426,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -459,11 +442,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -475,7 +458,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -4842,6 +4825,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index e1bb35aedb8f5e..4025109d541cf2 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -878,12 +878,7 @@ server cluster Identify = 3 { INT16U identifyTime = 0; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; } server cluster IlluminanceMeasurement = 1024 { diff --git a/examples/placeholder/linux/apps/app1/config.zap b/examples/placeholder/linux/apps/app1/config.zap index 6272e491daae79..0239f84b9ba953 100644 --- a/examples/placeholder/linux/apps/app1/config.zap +++ b/examples/placeholder/linux/apps/app1/config.zap @@ -4501,7 +4501,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4656,22 +4656,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "FeatureMap", "code": 65532, @@ -4801,7 +4785,7 @@ ], "attributes": [ { - "name": "local temperature", + "name": "LocalTemperature", "code": 0, "mfgCode": null, "side": "server", @@ -4817,7 +4801,7 @@ "reportableChange": 0 }, { - "name": "abs min heat setpoint limit", + "name": "AbsMinHeatSetpointLimit", "code": 3, "mfgCode": null, "side": "server", @@ -4833,7 +4817,7 @@ "reportableChange": 0 }, { - "name": "abs min cool setpoint limit", + "name": "AbsMinCoolSetpointLimit", "code": 5, "mfgCode": null, "side": "server", @@ -4849,7 +4833,7 @@ "reportableChange": 0 }, { - "name": "abs max cool setpoint limit", + "name": "AbsMaxCoolSetpointLimit", "code": 6, "mfgCode": null, "side": "server", @@ -4865,7 +4849,7 @@ "reportableChange": 0 }, { - "name": "pi cooling demand", + "name": "PICoolingDemand", "code": 7, "mfgCode": null, "side": "server", @@ -4881,7 +4865,7 @@ "reportableChange": 0 }, { - "name": "pi heating demand", + "name": "PIHeatingDemand", "code": 8, "mfgCode": null, "side": "server", @@ -4897,7 +4881,7 @@ "reportableChange": 0 }, { - "name": "occupied cooling setpoint", + "name": "OccupiedCoolingSetpoint", "code": 17, "mfgCode": null, "side": "server", @@ -4913,7 +4897,7 @@ "reportableChange": 0 }, { - "name": "occupied heating setpoint", + "name": "OccupiedHeatingSetpoint", "code": 18, "mfgCode": null, "side": "server", @@ -4929,7 +4913,7 @@ "reportableChange": 0 }, { - "name": "min heat setpoint limit", + "name": "MinHeatSetpointLimit", "code": 21, "mfgCode": null, "side": "server", @@ -4945,7 +4929,7 @@ "reportableChange": 0 }, { - "name": "max heat setpoint limit", + "name": "MaxHeatSetpointLimit", "code": 22, "mfgCode": null, "side": "server", @@ -4961,7 +4945,7 @@ "reportableChange": 0 }, { - "name": "min cool setpoint limit", + "name": "MinCoolSetpointLimit", "code": 23, "mfgCode": null, "side": "server", @@ -4977,7 +4961,7 @@ "reportableChange": 0 }, { - "name": "max cool setpoint limit", + "name": "MaxCoolSetpointLimit", "code": 24, "mfgCode": null, "side": "server", @@ -4993,7 +4977,7 @@ "reportableChange": 0 }, { - "name": "min setpoint dead band", + "name": "MinSetpointDeadBand", "code": 25, "mfgCode": null, "side": "server", @@ -5009,7 +4993,7 @@ "reportableChange": 0 }, { - "name": "control sequence of operation", + "name": "ControlSequenceOfOperation", "code": 27, "mfgCode": null, "side": "server", @@ -5025,7 +5009,7 @@ "reportableChange": 0 }, { - "name": "system mode", + "name": "SystemMode", "code": 28, "mfgCode": null, "side": "server", @@ -5041,7 +5025,7 @@ "reportableChange": 0 }, { - "name": "start of week", + "name": "StartOfWeek", "code": 32, "mfgCode": null, "side": "server", @@ -5057,7 +5041,7 @@ "reportableChange": 0 }, { - "name": "number of weekly transitions", + "name": "NumberOfWeeklyTransitions", "code": 33, "mfgCode": null, "side": "server", @@ -5073,7 +5057,7 @@ "reportableChange": 0 }, { - "name": "number of daily transitions", + "name": "NumberOfDailyTransitions", "code": 34, "mfgCode": null, "side": "server", @@ -5089,7 +5073,7 @@ "reportableChange": 0 }, { - "name": "temperature setpoint hold", + "name": "TemperatureSetpointHold", "code": 35, "mfgCode": null, "side": "server", @@ -6899,14 +6883,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -6935,16 +6911,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -7323,7 +7290,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -7339,7 +7306,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -7355,11 +7322,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7371,7 +7338,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -7387,7 +7354,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -8333,6 +8300,5 @@ "endpointVersion": 1, "deviceIdentifier": 258 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index e1bb35aedb8f5e..4025109d541cf2 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -878,12 +878,7 @@ server cluster Identify = 3 { INT16U identifyTime = 0; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; } server cluster IlluminanceMeasurement = 1024 { diff --git a/examples/placeholder/linux/apps/app2/config.zap b/examples/placeholder/linux/apps/app2/config.zap index 6272e491daae79..0239f84b9ba953 100644 --- a/examples/placeholder/linux/apps/app2/config.zap +++ b/examples/placeholder/linux/apps/app2/config.zap @@ -4501,7 +4501,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -4656,22 +4656,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "FeatureMap", "code": 65532, @@ -4801,7 +4785,7 @@ ], "attributes": [ { - "name": "local temperature", + "name": "LocalTemperature", "code": 0, "mfgCode": null, "side": "server", @@ -4817,7 +4801,7 @@ "reportableChange": 0 }, { - "name": "abs min heat setpoint limit", + "name": "AbsMinHeatSetpointLimit", "code": 3, "mfgCode": null, "side": "server", @@ -4833,7 +4817,7 @@ "reportableChange": 0 }, { - "name": "abs min cool setpoint limit", + "name": "AbsMinCoolSetpointLimit", "code": 5, "mfgCode": null, "side": "server", @@ -4849,7 +4833,7 @@ "reportableChange": 0 }, { - "name": "abs max cool setpoint limit", + "name": "AbsMaxCoolSetpointLimit", "code": 6, "mfgCode": null, "side": "server", @@ -4865,7 +4849,7 @@ "reportableChange": 0 }, { - "name": "pi cooling demand", + "name": "PICoolingDemand", "code": 7, "mfgCode": null, "side": "server", @@ -4881,7 +4865,7 @@ "reportableChange": 0 }, { - "name": "pi heating demand", + "name": "PIHeatingDemand", "code": 8, "mfgCode": null, "side": "server", @@ -4897,7 +4881,7 @@ "reportableChange": 0 }, { - "name": "occupied cooling setpoint", + "name": "OccupiedCoolingSetpoint", "code": 17, "mfgCode": null, "side": "server", @@ -4913,7 +4897,7 @@ "reportableChange": 0 }, { - "name": "occupied heating setpoint", + "name": "OccupiedHeatingSetpoint", "code": 18, "mfgCode": null, "side": "server", @@ -4929,7 +4913,7 @@ "reportableChange": 0 }, { - "name": "min heat setpoint limit", + "name": "MinHeatSetpointLimit", "code": 21, "mfgCode": null, "side": "server", @@ -4945,7 +4929,7 @@ "reportableChange": 0 }, { - "name": "max heat setpoint limit", + "name": "MaxHeatSetpointLimit", "code": 22, "mfgCode": null, "side": "server", @@ -4961,7 +4945,7 @@ "reportableChange": 0 }, { - "name": "min cool setpoint limit", + "name": "MinCoolSetpointLimit", "code": 23, "mfgCode": null, "side": "server", @@ -4977,7 +4961,7 @@ "reportableChange": 0 }, { - "name": "max cool setpoint limit", + "name": "MaxCoolSetpointLimit", "code": 24, "mfgCode": null, "side": "server", @@ -4993,7 +4977,7 @@ "reportableChange": 0 }, { - "name": "min setpoint dead band", + "name": "MinSetpointDeadBand", "code": 25, "mfgCode": null, "side": "server", @@ -5009,7 +4993,7 @@ "reportableChange": 0 }, { - "name": "control sequence of operation", + "name": "ControlSequenceOfOperation", "code": 27, "mfgCode": null, "side": "server", @@ -5025,7 +5009,7 @@ "reportableChange": 0 }, { - "name": "system mode", + "name": "SystemMode", "code": 28, "mfgCode": null, "side": "server", @@ -5041,7 +5025,7 @@ "reportableChange": 0 }, { - "name": "start of week", + "name": "StartOfWeek", "code": 32, "mfgCode": null, "side": "server", @@ -5057,7 +5041,7 @@ "reportableChange": 0 }, { - "name": "number of weekly transitions", + "name": "NumberOfWeeklyTransitions", "code": 33, "mfgCode": null, "side": "server", @@ -5073,7 +5057,7 @@ "reportableChange": 0 }, { - "name": "number of daily transitions", + "name": "NumberOfDailyTransitions", "code": 34, "mfgCode": null, "side": "server", @@ -5089,7 +5073,7 @@ "reportableChange": 0 }, { - "name": "temperature setpoint hold", + "name": "TemperatureSetpointHold", "code": 35, "mfgCode": null, "side": "server", @@ -6899,14 +6883,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -6935,16 +6911,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -7323,7 +7290,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -7339,7 +7306,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -7355,11 +7322,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7371,7 +7338,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -7387,7 +7354,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -8333,6 +8300,5 @@ "endpointVersion": 1, "deviceIdentifier": 258 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index 44f7416b084145..2f223d56cc141c 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -539,12 +539,7 @@ server cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/examples/pump-app/pump-common/pump-app.zap b/examples/pump-app/pump-common/pump-app.zap index 9c2787454caf82..7116895e54a480 100644 --- a/examples/pump-app/pump-common/pump-app.zap +++ b/examples/pump-app/pump-common/pump-app.zap @@ -52,14 +52,6 @@ "incoming": 1, "outgoing": 0 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, { "name": "TriggerEffect", "code": 64, @@ -78,16 +70,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -576,7 +559,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -592,7 +575,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -608,11 +591,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -624,7 +607,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -640,7 +623,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -656,7 +639,7 @@ "reportableChange": 0 }, { - "name": "last configured by", + "name": "LastConfiguredBy", "code": 5, "mfgCode": null, "side": "server", @@ -6710,7 +6693,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6865,22 +6848,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -7712,6 +7679,5 @@ "endpointVersion": 1, "deviceIdentifier": 771 } - ], - "log": [] + ] } \ No newline at end of file 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 140b69d3a0aa54..80bd05ca663bc1 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 @@ -534,12 +534,7 @@ server cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap index 936d43f5f5dc96..ef6444dfa09193 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 70, + "featureLevel": 71, "creator": "zap", "keyValuePairs": [ { @@ -52,14 +52,6 @@ "incoming": 1, "outgoing": 1 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, { "name": "TriggerEffect", "code": 64, @@ -95,16 +87,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -531,7 +514,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -547,7 +530,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -563,11 +546,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -579,7 +562,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -595,7 +578,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -611,7 +594,7 @@ "reportableChange": 0 }, { - "name": "last configured by", + "name": "LastConfiguredBy", "code": 5, "mfgCode": null, "side": "server", @@ -5969,7 +5952,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 0, "storageOption": "RAM", "singleton": 0, diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap index c4fc760e678cb3..3a584a7f7d78df 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.zap @@ -1,5 +1,5 @@ { - "featureLevel": 70, + "featureLevel": 71, "creator": "zap", "keyValuePairs": [ { @@ -137,14 +137,6 @@ "source": "client", "incoming": 1, "outgoing": 0 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 } ], "attributes": [ @@ -173,16 +165,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -3428,14 +3411,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -3464,16 +3439,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 31181919896f5a..cc59feb3e0aea7 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -508,12 +508,7 @@ client cluster Identify = 3 { INT16U identifyTime = 0; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; } server cluster Identify = 3 { @@ -548,12 +543,7 @@ server cluster Identify = 3 { INT16U identifyTime = 0; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; } server cluster LocalizationConfiguration = 43 { diff --git a/examples/thermostat/thermostat-common/thermostat.zap b/examples/thermostat/thermostat-common/thermostat.zap index 215b0bed432f2a..d7b13ba55eb57c 100644 --- a/examples/thermostat/thermostat-common/thermostat.zap +++ b/examples/thermostat/thermostat-common/thermostat.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -443,7 +426,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -459,7 +442,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -475,11 +458,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -507,7 +490,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -7654,14 +7637,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -7690,16 +7665,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -8078,7 +8044,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -8094,7 +8060,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -8110,11 +8076,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -8126,7 +8092,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -8142,7 +8108,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -11331,7 +11297,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11519,7 +11485,7 @@ ], "attributes": [ { - "name": "local temperature", + "name": "LocalTemperature", "code": 0, "mfgCode": null, "side": "server", @@ -11535,7 +11501,7 @@ "reportableChange": 0 }, { - "name": "abs min heat setpoint limit", + "name": "AbsMinHeatSetpointLimit", "code": 3, "mfgCode": null, "side": "server", @@ -11551,7 +11517,7 @@ "reportableChange": 0 }, { - "name": "abs max heat setpoint limit", + "name": "AbsMaxHeatSetpointLimit", "code": 4, "mfgCode": null, "side": "server", @@ -11567,7 +11533,7 @@ "reportableChange": 0 }, { - "name": "abs min cool setpoint limit", + "name": "AbsMinCoolSetpointLimit", "code": 5, "mfgCode": null, "side": "server", @@ -11583,7 +11549,7 @@ "reportableChange": 0 }, { - "name": "abs max cool setpoint limit", + "name": "AbsMaxCoolSetpointLimit", "code": 6, "mfgCode": null, "side": "server", @@ -11599,7 +11565,7 @@ "reportableChange": 0 }, { - "name": "pi cooling demand", + "name": "PICoolingDemand", "code": 7, "mfgCode": null, "side": "server", @@ -11615,7 +11581,7 @@ "reportableChange": 0 }, { - "name": "pi heating demand", + "name": "PIHeatingDemand", "code": 8, "mfgCode": null, "side": "server", @@ -11631,7 +11597,7 @@ "reportableChange": 0 }, { - "name": "occupied cooling setpoint", + "name": "OccupiedCoolingSetpoint", "code": 17, "mfgCode": null, "side": "server", @@ -11647,7 +11613,7 @@ "reportableChange": 0 }, { - "name": "occupied heating setpoint", + "name": "OccupiedHeatingSetpoint", "code": 18, "mfgCode": null, "side": "server", @@ -11663,7 +11629,7 @@ "reportableChange": 0 }, { - "name": "min heat setpoint limit", + "name": "MinHeatSetpointLimit", "code": 21, "mfgCode": null, "side": "server", @@ -11679,7 +11645,7 @@ "reportableChange": 0 }, { - "name": "max heat setpoint limit", + "name": "MaxHeatSetpointLimit", "code": 22, "mfgCode": null, "side": "server", @@ -11695,7 +11661,7 @@ "reportableChange": 0 }, { - "name": "min cool setpoint limit", + "name": "MinCoolSetpointLimit", "code": 23, "mfgCode": null, "side": "server", @@ -11711,7 +11677,7 @@ "reportableChange": 0 }, { - "name": "max cool setpoint limit", + "name": "MaxCoolSetpointLimit", "code": 24, "mfgCode": null, "side": "server", @@ -11727,7 +11693,7 @@ "reportableChange": 0 }, { - "name": "min setpoint dead band", + "name": "MinSetpointDeadBand", "code": 25, "mfgCode": null, "side": "server", @@ -11743,7 +11709,7 @@ "reportableChange": 0 }, { - "name": "control sequence of operation", + "name": "ControlSequenceOfOperation", "code": 27, "mfgCode": null, "side": "server", @@ -11759,7 +11725,7 @@ "reportableChange": 0 }, { - "name": "system mode", + "name": "SystemMode", "code": 28, "mfgCode": null, "side": "server", @@ -11775,7 +11741,7 @@ "reportableChange": 0 }, { - "name": "start of week", + "name": "StartOfWeek", "code": 32, "mfgCode": null, "side": "server", @@ -11791,7 +11757,7 @@ "reportableChange": 0 }, { - "name": "number of weekly transitions", + "name": "NumberOfWeeklyTransitions", "code": 33, "mfgCode": null, "side": "server", @@ -11807,7 +11773,7 @@ "reportableChange": 0 }, { - "name": "number of daily transitions", + "name": "NumberOfDailyTransitions", "code": 34, "mfgCode": null, "side": "server", @@ -15007,6 +14973,5 @@ "endpointVersion": 1, "deviceIdentifier": 769 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/examples/tv-app/tv-common/tv-app.zap b/examples/tv-app/tv-common/tv-app.zap index 90ac752c41409a..ec34cc5fad87b8 100644 --- a/examples/tv-app/tv-common/tv-app.zap +++ b/examples/tv-app/tv-common/tv-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -12677,6 +12660,5 @@ "endpointVersion": 1, "deviceIdentifier": 36 } - ], - "log": [] + ] } \ No newline at end of file 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 cf02b431de99cd..acd364b3e8f50c 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 @@ -868,12 +868,7 @@ server cluster Identify = 3 { INT16U identifyTime = 0; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; } client cluster KeypadInput = 1289 { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap index b472f35116db62..f8d4f6162b4119 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.zap @@ -1,5 +1,5 @@ { - "featureLevel": 70, + "featureLevel": 71, "creator": "zap", "keyValuePairs": [ { @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -427,7 +410,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -443,7 +426,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -459,11 +442,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -475,7 +458,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -5873,7 +5856,7 @@ "reportableChange": 0 }, { - "name": "currentX", + "name": "CurrentX", "code": 3, "mfgCode": null, "side": "server", @@ -5889,7 +5872,7 @@ "reportableChange": 0 }, { - "name": "currentY", + "name": "CurrentY", "code": 4, "mfgCode": null, "side": "server", @@ -5921,7 +5904,7 @@ "reportableChange": 0 }, { - "name": "compensation text", + "name": "CompensationText", "code": 6, "mfgCode": null, "side": "server", @@ -5937,7 +5920,7 @@ "reportableChange": 0 }, { - "name": "color temperature", + "name": "ColorTemperature", "code": 7, "mfgCode": null, "side": "server", @@ -5953,7 +5936,7 @@ "reportableChange": 0 }, { - "name": "color mode", + "name": "ColorMode", "code": 8, "mfgCode": null, "side": "server", @@ -5969,7 +5952,7 @@ "reportableChange": 0 }, { - "name": "color control options", + "name": "Options", "code": 15, "mfgCode": null, "side": "server", @@ -5985,7 +5968,7 @@ "reportableChange": 0 }, { - "name": "number of primaries", + "name": "NumberOfPrimaries", "code": 16, "mfgCode": null, "side": "server", @@ -6001,7 +5984,7 @@ "reportableChange": 0 }, { - "name": "primary 1 x", + "name": "Primary1X", "code": 17, "mfgCode": null, "side": "server", @@ -6017,7 +6000,7 @@ "reportableChange": 0 }, { - "name": "primary 1 y", + "name": "Primary1Y", "code": 18, "mfgCode": null, "side": "server", @@ -6033,7 +6016,7 @@ "reportableChange": 0 }, { - "name": "primary 1 intensity", + "name": "Primary1Intensity", "code": 19, "mfgCode": null, "side": "server", @@ -6049,7 +6032,7 @@ "reportableChange": 0 }, { - "name": "primary 2 x", + "name": "Primary2X", "code": 21, "mfgCode": null, "side": "server", @@ -6065,7 +6048,7 @@ "reportableChange": 0 }, { - "name": "primary 2 y", + "name": "Primary2Y", "code": 22, "mfgCode": null, "side": "server", @@ -6081,7 +6064,7 @@ "reportableChange": 0 }, { - "name": "primary 2 intensity", + "name": "Primary2Intensity", "code": 23, "mfgCode": null, "side": "server", @@ -6097,7 +6080,7 @@ "reportableChange": 0 }, { - "name": "primary 3 x", + "name": "Primary3X", "code": 25, "mfgCode": null, "side": "server", @@ -6113,7 +6096,7 @@ "reportableChange": 0 }, { - "name": "primary 3 y", + "name": "Primary3Y", "code": 26, "mfgCode": null, "side": "server", @@ -6129,7 +6112,7 @@ "reportableChange": 0 }, { - "name": "primary 3 intensity", + "name": "Primary3Intensity", "code": 27, "mfgCode": null, "side": "server", @@ -6145,7 +6128,7 @@ "reportableChange": 0 }, { - "name": "primary 4 x", + "name": "Primary4X", "code": 32, "mfgCode": null, "side": "server", @@ -6161,7 +6144,7 @@ "reportableChange": 0 }, { - "name": "primary 4 y", + "name": "Primary4Y", "code": 33, "mfgCode": null, "side": "server", @@ -6177,7 +6160,7 @@ "reportableChange": 0 }, { - "name": "primary 4 intensity", + "name": "Primary4Intensity", "code": 34, "mfgCode": null, "side": "server", @@ -6193,7 +6176,7 @@ "reportableChange": 0 }, { - "name": "primary 5 x", + "name": "Primary5X", "code": 36, "mfgCode": null, "side": "server", @@ -6209,7 +6192,7 @@ "reportableChange": 0 }, { - "name": "primary 5 y", + "name": "Primary5Y", "code": 37, "mfgCode": null, "side": "server", @@ -6225,7 +6208,7 @@ "reportableChange": 0 }, { - "name": "primary 5 intensity", + "name": "Primary5Intensity", "code": 38, "mfgCode": null, "side": "server", @@ -6241,7 +6224,7 @@ "reportableChange": 0 }, { - "name": "primary 6 x", + "name": "Primary6X", "code": 40, "mfgCode": null, "side": "server", @@ -6257,7 +6240,7 @@ "reportableChange": 0 }, { - "name": "primary 6 y", + "name": "Primary6Y", "code": 41, "mfgCode": null, "side": "server", @@ -6273,7 +6256,7 @@ "reportableChange": 0 }, { - "name": "primary 6 intensity", + "name": "Primary6Intensity", "code": 42, "mfgCode": null, "side": "server", @@ -6289,7 +6272,7 @@ "reportableChange": 0 }, { - "name": "white point x", + "name": "WhitePointX", "code": 48, "mfgCode": null, "side": "server", @@ -6305,7 +6288,7 @@ "reportableChange": 0 }, { - "name": "white point y", + "name": "WhitePointY", "code": 49, "mfgCode": null, "side": "server", @@ -6321,7 +6304,7 @@ "reportableChange": 0 }, { - "name": "color point r x", + "name": "ColorPointRX", "code": 50, "mfgCode": null, "side": "server", @@ -6337,7 +6320,7 @@ "reportableChange": 0 }, { - "name": "color point r y", + "name": "ColorPointRY", "code": 51, "mfgCode": null, "side": "server", @@ -6353,7 +6336,7 @@ "reportableChange": 0 }, { - "name": "color point r intensity", + "name": "ColorPointRIntensity", "code": 52, "mfgCode": null, "side": "server", @@ -6369,7 +6352,7 @@ "reportableChange": 0 }, { - "name": "color point g x", + "name": "ColorPointGX", "code": 54, "mfgCode": null, "side": "server", @@ -6385,7 +6368,7 @@ "reportableChange": 0 }, { - "name": "color point g y", + "name": "ColorPointGY", "code": 55, "mfgCode": null, "side": "server", @@ -6401,7 +6384,7 @@ "reportableChange": 0 }, { - "name": "color point g intensity", + "name": "ColorPointGIntensity", "code": 56, "mfgCode": null, "side": "server", @@ -6417,7 +6400,7 @@ "reportableChange": 0 }, { - "name": "color point b x", + "name": "ColorPointBX", "code": 58, "mfgCode": null, "side": "server", @@ -6433,7 +6416,7 @@ "reportableChange": 0 }, { - "name": "color point b y", + "name": "ColorPointBY", "code": 59, "mfgCode": null, "side": "server", @@ -6449,7 +6432,7 @@ "reportableChange": 0 }, { - "name": "color point b intensity", + "name": "ColorPointBIntensity", "code": 60, "mfgCode": null, "side": "server", @@ -6465,7 +6448,7 @@ "reportableChange": 0 }, { - "name": "enhanced current hue", + "name": "EnhancedCurrentHue", "code": 16384, "mfgCode": null, "side": "server", @@ -6481,7 +6464,7 @@ "reportableChange": 0 }, { - "name": "enhanced color mode", + "name": "EnhancedColorMode", "code": 16385, "mfgCode": null, "side": "server", @@ -6497,7 +6480,7 @@ "reportableChange": 0 }, { - "name": "color loop active", + "name": "ColorLoopActive", "code": 16386, "mfgCode": null, "side": "server", @@ -6513,7 +6496,7 @@ "reportableChange": 0 }, { - "name": "color loop direction", + "name": "ColorLoopDirection", "code": 16387, "mfgCode": null, "side": "server", @@ -6529,7 +6512,7 @@ "reportableChange": 0 }, { - "name": "color loop time", + "name": "ColorLoopTime", "code": 16388, "mfgCode": null, "side": "server", @@ -6545,7 +6528,7 @@ "reportableChange": 0 }, { - "name": "color capabilities", + "name": "ColorCapabilities", "code": 16394, "mfgCode": null, "side": "server", @@ -6561,7 +6544,7 @@ "reportableChange": 0 }, { - "name": "color temp physical min", + "name": "ColorTempPhysicalMinMireds", "code": 16395, "mfgCode": null, "side": "server", @@ -6577,7 +6560,7 @@ "reportableChange": 0 }, { - "name": "color temp physical max", + "name": "ColorTempPhysicalMaxMireds", "code": 16396, "mfgCode": null, "side": "server", @@ -6593,7 +6576,7 @@ "reportableChange": 0 }, { - "name": "couple color temp to level min-mireds", + "name": "CoupleColorTempToLevelMinMireds", "code": 16397, "mfgCode": null, "side": "server", @@ -6609,7 +6592,7 @@ "reportableChange": 0 }, { - "name": "start up color temperature mireds", + "name": "StartUpColorTemperatureMireds", "code": 16400, "mfgCode": null, "side": "server", @@ -7453,14 +7436,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -7489,16 +7464,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -7861,7 +7827,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -7877,7 +7843,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -7893,11 +7859,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -7909,7 +7875,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -7925,7 +7891,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -8267,7 +8233,7 @@ "reportableChange": 0 }, { - "name": "RemainingTime", + "name": "remaining time", "code": 1, "mfgCode": null, "side": "server", @@ -11115,7 +11081,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 0, "storageOption": "RAM", "singleton": 0, @@ -11303,7 +11269,7 @@ ], "attributes": [ { - "name": "local temperature", + "name": "LocalTemperature", "code": 0, "mfgCode": null, "side": "server", @@ -11319,7 +11285,7 @@ "reportableChange": 0 }, { - "name": "pi cooling demand", + "name": "PICoolingDemand", "code": 7, "mfgCode": null, "side": "server", @@ -11335,7 +11301,7 @@ "reportableChange": 0 }, { - "name": "pi heating demand", + "name": "PIHeatingDemand", "code": 8, "mfgCode": null, "side": "server", @@ -11351,7 +11317,7 @@ "reportableChange": 0 }, { - "name": "occupied cooling setpoint", + "name": "OccupiedCoolingSetpoint", "code": 17, "mfgCode": null, "side": "server", @@ -11367,7 +11333,7 @@ "reportableChange": 0 }, { - "name": "occupied heating setpoint", + "name": "OccupiedHeatingSetpoint", "code": 18, "mfgCode": null, "side": "server", @@ -11383,7 +11349,7 @@ "reportableChange": 0 }, { - "name": "control sequence of operation", + "name": "ControlSequenceOfOperation", "code": 27, "mfgCode": null, "side": "server", @@ -11399,7 +11365,7 @@ "reportableChange": 0 }, { - "name": "system mode", + "name": "SystemMode", "code": 28, "mfgCode": null, "side": "server", @@ -11415,7 +11381,7 @@ "reportableChange": 0 }, { - "name": "start of week", + "name": "StartOfWeek", "code": 32, "mfgCode": null, "side": "server", @@ -11431,7 +11397,7 @@ "reportableChange": 0 }, { - "name": "number of weekly transitions", + "name": "NumberOfWeeklyTransitions", "code": 33, "mfgCode": null, "side": "server", @@ -11447,7 +11413,7 @@ "reportableChange": 0 }, { - "name": "number of daily transitions", + "name": "NumberOfDailyTransitions", "code": 34, "mfgCode": null, "side": "server", @@ -11694,7 +11660,7 @@ "reportableChange": 0 }, { - "name": "currentX", + "name": "CurrentX", "code": 3, "mfgCode": null, "side": "server", @@ -11710,7 +11676,7 @@ "reportableChange": 0 }, { - "name": "currentY", + "name": "CurrentY", "code": 4, "mfgCode": null, "side": "server", @@ -11742,7 +11708,7 @@ "reportableChange": 0 }, { - "name": "compensation text", + "name": "CompensationText", "code": 6, "mfgCode": null, "side": "server", @@ -11758,7 +11724,7 @@ "reportableChange": 0 }, { - "name": "color temperature", + "name": "ColorTemperature", "code": 7, "mfgCode": null, "side": "server", @@ -11774,7 +11740,7 @@ "reportableChange": 0 }, { - "name": "color mode", + "name": "ColorMode", "code": 8, "mfgCode": null, "side": "server", @@ -11790,7 +11756,7 @@ "reportableChange": 0 }, { - "name": "color control options", + "name": "Options", "code": 15, "mfgCode": null, "side": "server", @@ -11806,7 +11772,7 @@ "reportableChange": 0 }, { - "name": "number of primaries", + "name": "NumberOfPrimaries", "code": 16, "mfgCode": null, "side": "server", @@ -11822,7 +11788,7 @@ "reportableChange": 0 }, { - "name": "primary 1 x", + "name": "Primary1X", "code": 17, "mfgCode": null, "side": "server", @@ -11838,7 +11804,7 @@ "reportableChange": 0 }, { - "name": "primary 1 y", + "name": "Primary1Y", "code": 18, "mfgCode": null, "side": "server", @@ -11854,7 +11820,7 @@ "reportableChange": 0 }, { - "name": "primary 1 intensity", + "name": "Primary1Intensity", "code": 19, "mfgCode": null, "side": "server", @@ -11870,7 +11836,7 @@ "reportableChange": 0 }, { - "name": "primary 2 x", + "name": "Primary2X", "code": 21, "mfgCode": null, "side": "server", @@ -11886,7 +11852,7 @@ "reportableChange": 0 }, { - "name": "primary 2 y", + "name": "Primary2Y", "code": 22, "mfgCode": null, "side": "server", @@ -11902,7 +11868,7 @@ "reportableChange": 0 }, { - "name": "primary 2 intensity", + "name": "Primary2Intensity", "code": 23, "mfgCode": null, "side": "server", @@ -11918,7 +11884,7 @@ "reportableChange": 0 }, { - "name": "primary 3 x", + "name": "Primary3X", "code": 25, "mfgCode": null, "side": "server", @@ -11934,7 +11900,7 @@ "reportableChange": 0 }, { - "name": "primary 3 y", + "name": "Primary3Y", "code": 26, "mfgCode": null, "side": "server", @@ -11950,7 +11916,7 @@ "reportableChange": 0 }, { - "name": "primary 3 intensity", + "name": "Primary3Intensity", "code": 27, "mfgCode": null, "side": "server", @@ -11966,7 +11932,7 @@ "reportableChange": 0 }, { - "name": "primary 4 x", + "name": "Primary4X", "code": 32, "mfgCode": null, "side": "server", @@ -11982,7 +11948,7 @@ "reportableChange": 0 }, { - "name": "primary 4 y", + "name": "Primary4Y", "code": 33, "mfgCode": null, "side": "server", @@ -11998,7 +11964,7 @@ "reportableChange": 0 }, { - "name": "primary 4 intensity", + "name": "Primary4Intensity", "code": 34, "mfgCode": null, "side": "server", @@ -12014,7 +11980,7 @@ "reportableChange": 0 }, { - "name": "primary 5 x", + "name": "Primary5X", "code": 36, "mfgCode": null, "side": "server", @@ -12030,7 +11996,7 @@ "reportableChange": 0 }, { - "name": "primary 5 y", + "name": "Primary5Y", "code": 37, "mfgCode": null, "side": "server", @@ -12046,7 +12012,7 @@ "reportableChange": 0 }, { - "name": "primary 5 intensity", + "name": "Primary5Intensity", "code": 38, "mfgCode": null, "side": "server", @@ -12062,7 +12028,7 @@ "reportableChange": 0 }, { - "name": "primary 6 x", + "name": "Primary6X", "code": 40, "mfgCode": null, "side": "server", @@ -12078,7 +12044,7 @@ "reportableChange": 0 }, { - "name": "primary 6 y", + "name": "Primary6Y", "code": 41, "mfgCode": null, "side": "server", @@ -12094,7 +12060,7 @@ "reportableChange": 0 }, { - "name": "primary 6 intensity", + "name": "Primary6Intensity", "code": 42, "mfgCode": null, "side": "server", @@ -12110,7 +12076,7 @@ "reportableChange": 0 }, { - "name": "white point x", + "name": "WhitePointX", "code": 48, "mfgCode": null, "side": "server", @@ -12126,7 +12092,7 @@ "reportableChange": 0 }, { - "name": "white point y", + "name": "WhitePointY", "code": 49, "mfgCode": null, "side": "server", @@ -12142,7 +12108,7 @@ "reportableChange": 0 }, { - "name": "color point r x", + "name": "ColorPointRX", "code": 50, "mfgCode": null, "side": "server", @@ -12158,7 +12124,7 @@ "reportableChange": 0 }, { - "name": "color point r y", + "name": "ColorPointRY", "code": 51, "mfgCode": null, "side": "server", @@ -12174,7 +12140,7 @@ "reportableChange": 0 }, { - "name": "color point r intensity", + "name": "ColorPointRIntensity", "code": 52, "mfgCode": null, "side": "server", @@ -12190,7 +12156,7 @@ "reportableChange": 0 }, { - "name": "color point g x", + "name": "ColorPointGX", "code": 54, "mfgCode": null, "side": "server", @@ -12206,7 +12172,7 @@ "reportableChange": 0 }, { - "name": "color point g y", + "name": "ColorPointGY", "code": 55, "mfgCode": null, "side": "server", @@ -12222,7 +12188,7 @@ "reportableChange": 0 }, { - "name": "color point g intensity", + "name": "ColorPointGIntensity", "code": 56, "mfgCode": null, "side": "server", @@ -12238,7 +12204,7 @@ "reportableChange": 0 }, { - "name": "color point b x", + "name": "ColorPointBX", "code": 58, "mfgCode": null, "side": "server", @@ -12254,7 +12220,7 @@ "reportableChange": 0 }, { - "name": "color point b y", + "name": "ColorPointBY", "code": 59, "mfgCode": null, "side": "server", @@ -12270,7 +12236,7 @@ "reportableChange": 0 }, { - "name": "color point b intensity", + "name": "ColorPointBIntensity", "code": 60, "mfgCode": null, "side": "server", @@ -12286,7 +12252,7 @@ "reportableChange": 0 }, { - "name": "enhanced current hue", + "name": "EnhancedCurrentHue", "code": 16384, "mfgCode": null, "side": "server", @@ -12302,7 +12268,7 @@ "reportableChange": 0 }, { - "name": "enhanced color mode", + "name": "EnhancedColorMode", "code": 16385, "mfgCode": null, "side": "server", @@ -12318,7 +12284,7 @@ "reportableChange": 0 }, { - "name": "color loop active", + "name": "ColorLoopActive", "code": 16386, "mfgCode": null, "side": "server", @@ -12334,7 +12300,7 @@ "reportableChange": 0 }, { - "name": "color loop direction", + "name": "ColorLoopDirection", "code": 16387, "mfgCode": null, "side": "server", @@ -12350,7 +12316,7 @@ "reportableChange": 0 }, { - "name": "color loop time", + "name": "ColorLoopTime", "code": 16388, "mfgCode": null, "side": "server", @@ -12366,7 +12332,7 @@ "reportableChange": 0 }, { - "name": "color capabilities", + "name": "ColorCapabilities", "code": 16394, "mfgCode": null, "side": "server", @@ -12382,7 +12348,7 @@ "reportableChange": 0 }, { - "name": "color temp physical min", + "name": "ColorTempPhysicalMinMireds", "code": 16395, "mfgCode": null, "side": "server", @@ -12398,7 +12364,7 @@ "reportableChange": 0 }, { - "name": "color temp physical max", + "name": "ColorTempPhysicalMaxMireds", "code": 16396, "mfgCode": null, "side": "server", @@ -12414,7 +12380,7 @@ "reportableChange": 0 }, { - "name": "couple color temp to level min-mireds", + "name": "CoupleColorTempToLevelMinMireds", "code": 16397, "mfgCode": null, "side": "server", @@ -12430,7 +12396,7 @@ "reportableChange": 0 }, { - "name": "start up color temperature mireds", + "name": "StartUpColorTemperatureMireds", "code": 16400, "mfgCode": null, "side": "server", @@ -14841,14 +14807,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -14877,16 +14835,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -15217,7 +15166,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -15233,7 +15182,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -15249,11 +15198,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -15265,7 +15214,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -15281,7 +15230,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -16904,7 +16853,7 @@ "reportableChange": 0 }, { - "name": "currentX", + "name": "CurrentX", "code": 3, "mfgCode": null, "side": "server", @@ -16920,7 +16869,7 @@ "reportableChange": 0 }, { - "name": "currentY", + "name": "CurrentY", "code": 4, "mfgCode": null, "side": "server", @@ -16952,7 +16901,7 @@ "reportableChange": 0 }, { - "name": "compensation text", + "name": "CompensationText", "code": 6, "mfgCode": null, "side": "server", @@ -16968,7 +16917,7 @@ "reportableChange": 0 }, { - "name": "color temperature", + "name": "ColorTemperature", "code": 7, "mfgCode": null, "side": "server", @@ -16984,7 +16933,7 @@ "reportableChange": 0 }, { - "name": "color mode", + "name": "ColorMode", "code": 8, "mfgCode": null, "side": "server", @@ -17000,7 +16949,7 @@ "reportableChange": 0 }, { - "name": "color control options", + "name": "Options", "code": 15, "mfgCode": null, "side": "server", @@ -17016,7 +16965,7 @@ "reportableChange": 0 }, { - "name": "number of primaries", + "name": "NumberOfPrimaries", "code": 16, "mfgCode": null, "side": "server", @@ -17032,7 +16981,7 @@ "reportableChange": 0 }, { - "name": "primary 1 x", + "name": "Primary1X", "code": 17, "mfgCode": null, "side": "server", @@ -17048,7 +16997,7 @@ "reportableChange": 0 }, { - "name": "primary 1 y", + "name": "Primary1Y", "code": 18, "mfgCode": null, "side": "server", @@ -17064,7 +17013,7 @@ "reportableChange": 0 }, { - "name": "primary 1 intensity", + "name": "Primary1Intensity", "code": 19, "mfgCode": null, "side": "server", @@ -17080,7 +17029,7 @@ "reportableChange": 0 }, { - "name": "primary 2 x", + "name": "Primary2X", "code": 21, "mfgCode": null, "side": "server", @@ -17096,7 +17045,7 @@ "reportableChange": 0 }, { - "name": "primary 2 y", + "name": "Primary2Y", "code": 22, "mfgCode": null, "side": "server", @@ -17112,7 +17061,7 @@ "reportableChange": 0 }, { - "name": "primary 2 intensity", + "name": "Primary2Intensity", "code": 23, "mfgCode": null, "side": "server", @@ -17128,7 +17077,7 @@ "reportableChange": 0 }, { - "name": "primary 3 x", + "name": "Primary3X", "code": 25, "mfgCode": null, "side": "server", @@ -17144,7 +17093,7 @@ "reportableChange": 0 }, { - "name": "primary 3 y", + "name": "Primary3Y", "code": 26, "mfgCode": null, "side": "server", @@ -17160,7 +17109,7 @@ "reportableChange": 0 }, { - "name": "primary 3 intensity", + "name": "Primary3Intensity", "code": 27, "mfgCode": null, "side": "server", @@ -17176,7 +17125,7 @@ "reportableChange": 0 }, { - "name": "primary 4 x", + "name": "Primary4X", "code": 32, "mfgCode": null, "side": "server", @@ -17192,7 +17141,7 @@ "reportableChange": 0 }, { - "name": "primary 4 y", + "name": "Primary4Y", "code": 33, "mfgCode": null, "side": "server", @@ -17208,7 +17157,7 @@ "reportableChange": 0 }, { - "name": "primary 4 intensity", + "name": "Primary4Intensity", "code": 34, "mfgCode": null, "side": "server", @@ -17224,7 +17173,7 @@ "reportableChange": 0 }, { - "name": "primary 5 x", + "name": "Primary5X", "code": 36, "mfgCode": null, "side": "server", @@ -17240,7 +17189,7 @@ "reportableChange": 0 }, { - "name": "primary 5 y", + "name": "Primary5Y", "code": 37, "mfgCode": null, "side": "server", @@ -17256,7 +17205,7 @@ "reportableChange": 0 }, { - "name": "primary 5 intensity", + "name": "Primary5Intensity", "code": 38, "mfgCode": null, "side": "server", @@ -17272,7 +17221,7 @@ "reportableChange": 0 }, { - "name": "primary 6 x", + "name": "Primary6X", "code": 40, "mfgCode": null, "side": "server", @@ -17288,7 +17237,7 @@ "reportableChange": 0 }, { - "name": "primary 6 y", + "name": "Primary6Y", "code": 41, "mfgCode": null, "side": "server", @@ -17304,7 +17253,7 @@ "reportableChange": 0 }, { - "name": "primary 6 intensity", + "name": "Primary6Intensity", "code": 42, "mfgCode": null, "side": "server", @@ -17320,7 +17269,7 @@ "reportableChange": 0 }, { - "name": "white point x", + "name": "WhitePointX", "code": 48, "mfgCode": null, "side": "server", @@ -17336,7 +17285,7 @@ "reportableChange": 0 }, { - "name": "white point y", + "name": "WhitePointY", "code": 49, "mfgCode": null, "side": "server", @@ -17352,7 +17301,7 @@ "reportableChange": 0 }, { - "name": "color point r x", + "name": "ColorPointRX", "code": 50, "mfgCode": null, "side": "server", @@ -17368,7 +17317,7 @@ "reportableChange": 0 }, { - "name": "color point r y", + "name": "ColorPointRY", "code": 51, "mfgCode": null, "side": "server", @@ -17384,7 +17333,7 @@ "reportableChange": 0 }, { - "name": "color point r intensity", + "name": "ColorPointRIntensity", "code": 52, "mfgCode": null, "side": "server", @@ -17400,7 +17349,7 @@ "reportableChange": 0 }, { - "name": "color point g x", + "name": "ColorPointGX", "code": 54, "mfgCode": null, "side": "server", @@ -17416,7 +17365,7 @@ "reportableChange": 0 }, { - "name": "color point g y", + "name": "ColorPointGY", "code": 55, "mfgCode": null, "side": "server", @@ -17432,7 +17381,7 @@ "reportableChange": 0 }, { - "name": "color point g intensity", + "name": "ColorPointGIntensity", "code": 56, "mfgCode": null, "side": "server", @@ -17448,7 +17397,7 @@ "reportableChange": 0 }, { - "name": "color point b x", + "name": "ColorPointBX", "code": 58, "mfgCode": null, "side": "server", @@ -17464,7 +17413,7 @@ "reportableChange": 0 }, { - "name": "color point b y", + "name": "ColorPointBY", "code": 59, "mfgCode": null, "side": "server", @@ -17480,7 +17429,7 @@ "reportableChange": 0 }, { - "name": "color point b intensity", + "name": "ColorPointBIntensity", "code": 60, "mfgCode": null, "side": "server", @@ -17496,7 +17445,7 @@ "reportableChange": 0 }, { - "name": "enhanced current hue", + "name": "EnhancedCurrentHue", "code": 16384, "mfgCode": null, "side": "server", @@ -17512,7 +17461,7 @@ "reportableChange": 0 }, { - "name": "enhanced color mode", + "name": "EnhancedColorMode", "code": 16385, "mfgCode": null, "side": "server", @@ -17528,7 +17477,7 @@ "reportableChange": 0 }, { - "name": "color loop active", + "name": "ColorLoopActive", "code": 16386, "mfgCode": null, "side": "server", @@ -17544,7 +17493,7 @@ "reportableChange": 0 }, { - "name": "color loop direction", + "name": "ColorLoopDirection", "code": 16387, "mfgCode": null, "side": "server", @@ -17560,7 +17509,7 @@ "reportableChange": 0 }, { - "name": "color loop time", + "name": "ColorLoopTime", "code": 16388, "mfgCode": null, "side": "server", @@ -17576,7 +17525,7 @@ "reportableChange": 0 }, { - "name": "color capabilities", + "name": "ColorCapabilities", "code": 16394, "mfgCode": null, "side": "server", @@ -17592,7 +17541,7 @@ "reportableChange": 0 }, { - "name": "color temp physical min", + "name": "ColorTempPhysicalMinMireds", "code": 16395, "mfgCode": null, "side": "server", @@ -17608,7 +17557,7 @@ "reportableChange": 0 }, { - "name": "color temp physical max", + "name": "ColorTempPhysicalMaxMireds", "code": 16396, "mfgCode": null, "side": "server", @@ -17624,7 +17573,7 @@ "reportableChange": 0 }, { - "name": "couple color temp to level min-mireds", + "name": "CoupleColorTempToLevelMinMireds", "code": 16397, "mfgCode": null, "side": "server", @@ -17640,7 +17589,7 @@ "reportableChange": 0 }, { - "name": "start up color temperature mireds", + "name": "StartUpColorTemperatureMireds", "code": 16400, "mfgCode": null, "side": "server", diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 5a960e8f7c94aa..28166b8d99580e 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -528,12 +528,7 @@ server cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/examples/window-app/common/window-app.zap b/examples/window-app/common/window-app.zap index 1d597e1252e969..5a13ecd1eb7706 100644 --- a/examples/window-app/common/window-app.zap +++ b/examples/window-app/common/window-app.zap @@ -51,14 +51,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -87,16 +79,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -427,7 +410,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -443,7 +426,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -459,11 +442,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -475,7 +458,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -491,7 +474,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -6131,14 +6114,6 @@ "incoming": 1, "outgoing": 0 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 0 - }, { "name": "TriggerEffect", "code": 64, @@ -6174,16 +6149,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 1, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 0, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -6666,7 +6632,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -6682,7 +6648,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -6698,11 +6664,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -6714,7 +6680,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -6730,7 +6696,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -6746,7 +6712,7 @@ "reportableChange": 0 }, { - "name": "last configured by", + "name": "LastConfiguredBy", "code": 5, "mfgCode": null, "side": "server", @@ -8923,14 +8889,6 @@ "source": "client", "incoming": 1, "outgoing": 1 - }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 } ], "attributes": [ @@ -8959,16 +8917,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -9419,7 +9368,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -9435,7 +9384,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -9451,11 +9400,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -9467,7 +9416,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -9483,7 +9432,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -9499,7 +9448,7 @@ "reportableChange": 0 }, { - "name": "last configured by", + "name": "LastConfiguredBy", "code": 5, "mfgCode": null, "side": "server", diff --git a/src/app/clusters/identify-server/identify-server.cpp b/src/app/clusters/identify-server/identify-server.cpp index 73d723f6b0ca5f..a9294aea5bbab5 100644 --- a/src/app/clusters/identify-server/identify-server.cpp +++ b/src/app/clusters/identify-server/identify-server.cpp @@ -230,61 +230,6 @@ bool emberAfIdentifyClusterIdentifyCallback(CommandHandler * commandObj, const a Clusters::Identify::Attributes::IdentifyTime::Set(commandPath.mEndpointId, identifyTime)); } -bool emberAfIdentifyClusterIdentifyQueryCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, - const Commands::IdentifyQuery::DecodableType & commandData) -{ - EndpointId endpoint = commandPath.mEndpointId; - - // cmd IdentifyQuery - uint16_t identifyTime = 0; - EmberAfStatus status = EMBER_ZCL_STATUS_SUCCESS; - EmberStatus sendStatus = EMBER_SUCCESS; - CHIP_ERROR err = CHIP_NO_ERROR; - - status = Clusters::Identify::Attributes::IdentifyTime::Get(endpoint, &identifyTime); - - if (status != EMBER_ZCL_STATUS_SUCCESS || 0 == identifyTime) - { - if (status != EMBER_ZCL_STATUS_SUCCESS) - { - emberAfIdentifyClusterPrintln("Error reading identify time"); - } - else - { - emberAfIdentifyClusterPrintln("identifyTime is at 0"); - } - emberAfIdentifyClusterPrintln("Sending back default response"); - sendStatus = emberAfSendImmediateDefaultResponse(status); - if (EMBER_SUCCESS != sendStatus) - { - emberAfIdentifyClusterPrintln("Identify: failed to send %s response: " - "0x%x", - "default", sendStatus); - } - return true; - } - - emberAfIdentifyClusterPrintln("Identifying for %u more seconds", identifyTime); - { - app::ConcreteCommandPath path = { endpoint, Clusters::Identify::Id, ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID }; - TLV::TLVWriter * writer = nullptr; - - VerifyOrExit(commandObj != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - - SuccessOrExit(err = commandObj->PrepareCommand(path)); - VerifyOrExit((writer = commandObj->GetCommandDataIBTLVWriter()) != nullptr, err = CHIP_ERROR_INCORRECT_STATE); - SuccessOrExit(err = writer->Put(TLV::ContextTag(0), identifyTime)); - SuccessOrExit(err = commandObj->FinishCommand()); - } - -exit: - if (err != CHIP_NO_ERROR) - { - emberAfIdentifyClusterPrintln("Failed to encode response command."); - } - return true; -} - bool emberAfIdentifyClusterTriggerEffectCallback(CommandHandler * commandObj, const app::ConcreteCommandPath & commandPath, const Commands::TriggerEffect::DecodableType & commandData) { diff --git a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml index a0cf06aa2fdf6a..dfe9367b901a9e 100644 --- a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml @@ -53,7 +53,7 @@ tests: command: "readAttribute" attribute: "AcceptedCommandList" response: - value: [0, 1, 64] + value: [0, 64] constraints: type: list @@ -61,7 +61,7 @@ tests: command: "readAttribute" attribute: "GeneratedCommandList" response: - value: [0] + value: [] constraints: type: list diff --git a/src/app/tests/suites/certification/Test_TC_I_2_2.yaml b/src/app/tests/suites/certification/Test_TC_I_2_2.yaml index 606361f6f1082e..2b9da5cc1b6a9e 100644 --- a/src/app/tests/suites/certification/Test_TC_I_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_2_2.yaml @@ -108,43 +108,6 @@ tests: [1635609851.061388][3612:3617] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 44727i disabled: true - - label: "TH sends IdentifyQuery command to DUT" - verification: | - ./chip-tool identify identify-query 1 0 - - CHIP:EM: Flushed pending ack for MessageCounter:1227491741 on exchange 37715i - [1635610089.026755][3630:3635] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:1 on exchange 37716i - [1635610089.026818][3630:3635] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 37716i - [1635610089.026856][3630:3635] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 37716i - [1635610089.026907][3630:3635] CHIP:DMG: InvokeCommand = - [1635610089.026945][3630:3635] CHIP:DMG: { - [1635610089.026977][3630:3635] CHIP:DMG: CommandList = - [1635610089.027015][3630:3635] CHIP:DMG: [ - [1635610089.027051][3630:3635] CHIP:DMG: CommandDataIB = - [1635610089.027271][3630:3635] CHIP:DMG: { - [1635610089.027382][3630:3635] CHIP:DMG: CommandPathIB = - [1635610089.027433][3630:3635] CHIP:DMG: { - [1635610089.027480][3630:3635] CHIP:DMG: EndpointId = 0x1, - [1635610089.027534][3630:3635] CHIP:DMG: ClusterId = 0x0, - [1635610089.027616][3630:3635] CHIP:DMG: CommandId = 0x1, - [1635610089.027666][3630:3635] CHIP:DMG: }, - [1635610089.027756][3630:3635] CHIP:DMG: - [1635610089.027836][3630:3635] CHIP:DMG: StatusIB = - [1635610089.027917][3630:3635] CHIP:DMG: { - [1635610089.027964][3630:3635] CHIP:DMG: status = 0x85, - [1635610089.028045][3630:3635] CHIP:DMG: }, - [1635610089.028148][3630:3635] CHIP:DMG: - [1635610089.028190][3630:3635] CHIP:DMG: }, - [1635610089.028267][3630:3635] CHIP:DMG: - [1635610089.028342][3630:3635] CHIP:DMG: ], - [1635610089.028387][3630:3635] CHIP:DMG: - [1635610089.028420][3630:3635] CHIP:DMG: } - [1635610089.028482][3630:3635] CHIP:DMG: Received Command Response Status for Endpoint=1 Cluster=0x0000_0000 Command=0x0000_0001 Status=0x85 - [1635610089.028560][3630:3635] CHIP:TOO: Default Failure Response: 0x85 - [1635610089.028676][3630:3635] CHIP:DMG: ICR moving to [AwaitingDe] - [1635610089.028771][3630:3635] CHIP:EM: Sending Standalone Ack for MessageCounter:1 on exchange 37716i - disabled: true - - label: "TH sends Identify command to DUT, with the identify time field set to 0x0000 (stop identifying)." @@ -222,43 +185,6 @@ tests: [1635610358.364380][3651:3656] CHIP:EM: Piggybacking Ack for MessageCounter:1 on exchange: 43956i disabled: true - - label: "TH sends IdentifyQuery command to DUT" - verification: | - ./chip-tool identify identify-query 1 0 - - CHIP:EM: Flushed pending ack for MessageCounter:1227491747 on exchange 13705i - [1635610396.344537][3658:3663] CHIP:EM: Received message of type 0x9 with protocolId (0, 1) and MessageCounter:1 on exchange 13706i - [1635610396.344592][3658:3663] CHIP:EM: Rxd Ack; Removing MessageCounter:0 from Retrans Table on exchange 13706i - [1635610396.344626][3658:3663] CHIP:EM: Removed CHIP MessageCounter:0 from RetransTable on exchange 13706i - [1635610396.344673][3658:3663] CHIP:DMG: InvokeCommand = - [1635610396.344707][3658:3663] CHIP:DMG: { - [1635610396.344751][3658:3663] CHIP:DMG: CommandList = - [1635610396.344786][3658:3663] CHIP:DMG: [ - [1635610396.344831][3658:3663] CHIP:DMG: CommandDataIB = - [1635610396.344872][3658:3663] CHIP:DMG: { - [1635610396.344919][3658:3663] CHIP:DMG: CommandPathIB = - [1635610396.344966][3658:3663] CHIP:DMG: { - [1635610396.345023][3658:3663] CHIP:DMG: EndpointId = 0x0, - [1635610396.345075][3658:3663] CHIP:DMG: ClusterId = 0x0, - [1635610396.345118][3658:3663] CHIP:DMG: CommandId = 0x1, - [1635610396.345172][3658:3663] CHIP:DMG: }, - [1635610396.345219][3658:3663] CHIP:DMG: - [1635610396.345268][3658:3663] CHIP:DMG: StatusIB = - [1635610396.345310][3658:3663] CHIP:DMG: { - [1635610396.345363][3658:3663] CHIP:DMG: status = 0x85, - [1635610396.345416][3658:3663] CHIP:DMG: }, - [1635610396.345463][3658:3663] CHIP:DMG: - [1635610396.345511][3658:3663] CHIP:DMG: }, - [1635610396.345552][3658:3663] CHIP:DMG: - [1635610396.345595][3658:3663] CHIP:DMG: ], - [1635610396.345634][3658:3663] CHIP:DMG: - [1635610396.345676][3658:3663] CHIP:DMG: } - [1635610396.345732][3658:3663] CHIP:DMG: Received Command Response Status for Endpoint=0 Cluster=0x0000_0000 Command=0x0000_0001 Status=0x85 - [1635610396.345783][3658:3663] CHIP:TOO: Default Failure Response: 0x85 - [1635610396.345857][3658:3663] CHIP:DMG: ICR moving to [AwaitingDe] - [1635610396.345897][3658:3663] CHIP:EM: Sending Standalone Ack for MessageCounter:1 on exchange 13706i - disabled: true - - label: "TH writes a value of 0x000f (15s) to IdentifyTime attribute of DUT" verification: | diff --git a/src/app/tests/suites/certification/Test_TC_I_3_2.yaml b/src/app/tests/suites/certification/Test_TC_I_3_2.yaml index 7706afeb33a6f0..dbbaf49d21efd0 100644 --- a/src/app/tests/suites/certification/Test_TC_I_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_3_2.yaml @@ -59,40 +59,6 @@ tests: [1646010972.584474][33190:33190] CHIP:DMG: Endpoint 1, Cluster 0x0000_0003 update version to d4fdf424 disabled: true - - label: "DUT issues an IdentifyQuery command to the Test Harness." - verification: | - On TestHarnes (all-cluster-app) a received IdentifyQuery command looks like this: - - [1646011933.240584][33190:33190] CHIP:EM: Received message of type 0x8 with protocolId (0, 1) and MessageCounter:11711341 on exchange 17409r - [1646011933.240642][33190:33190] CHIP:EM: Handling via exchange: 17409r, Delegate: 0xaaaace1730c8 - [1646011933.240779][33190:33190] CHIP:DMG: InvokeRequestMessage = - [1646011933.240832][33190:33190] CHIP:DMG: { - [1646011933.240865][33190:33190] CHIP:DMG: suppressResponse = false, - [1646011933.240918][33190:33190] CHIP:DMG: timedRequest = false, - [1646011933.240954][33190:33190] CHIP:DMG: InvokeRequests = - [1646011933.240996][33190:33190] CHIP:DMG: [ - [1646011933.241041][33190:33190] CHIP:DMG: CommandDataIB = - [1646011933.241085][33190:33190] CHIP:DMG: { - [1646011933.241131][33190:33190] CHIP:DMG: CommandPathIB = - [1646011933.241173][33190:33190] CHIP:DMG: { - [1646011933.241228][33190:33190] CHIP:DMG: EndpointId = 0x1, - [1646011933.241291][33190:33190] CHIP:DMG: ClusterId = 0x3, - [1646011933.241338][33190:33190] CHIP:DMG: CommandId = 0x1, - [1646011933.241392][33190:33190] CHIP:DMG: }, - [1646011933.241451][33190:33190] CHIP:DMG: - [1646011933.241489][33190:33190] CHIP:DMG: CommandData = - [1646011933.241543][33190:33190] CHIP:DMG: { - [1646011933.241584][33190:33190] CHIP:DMG: }, - [1646011933.241634][33190:33190] CHIP:DMG: }, - [1646011933.241676][33190:33190] CHIP:DMG: - [1646011933.241720][33190:33190] CHIP:DMG: ], - [1646011933.241759][33190:33190] CHIP:DMG: - [1646011933.241803][33190:33190] CHIP:DMG: InteractionModelRevision = 1 - [1646011933.241835][33190:33190] CHIP:DMG: }, - [1646011933.241914][33190:33190] CHIP:DMG: AccessControl: checking f=1 a=c s=0x000000000001B669 t= c=0x0000_0003 e=1 p=o - [1646011933.241979][33190:33190] CHIP:DMG: Received command for Endpoint=1 Cluster=0x0000_0003 Command=0x0000_0001 - disabled: true - - label: "DUT issues an Identify command to the Test Harness, with the IdentifyTime argument set to 0x0000 (Stop)." diff --git a/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml index 7b04346a150a6e..f088af73d06263 100644 --- a/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml @@ -60,12 +60,6 @@ limitations under the License. - - - Command description for IdentifyQuery - - - Command description for TriggerEffect @@ -74,11 +68,5 @@ limitations under the License. - - - Command description for IdentifyQueryResponse - - - diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index c934293050c8f6..82e21bf6b093be 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2134,12 +2134,7 @@ client cluster Identify = 3 { IdentifyEffectVariant effectVariant = 1; } - response struct IdentifyQueryResponse = 0 { - INT16U timeout = 0; - } - command access(invoke: manage) Identify(IdentifyRequest): DefaultSuccess = 0; - command access(invoke: manage) IdentifyQuery(): IdentifyQueryResponse = 1; command access(invoke: manage) TriggerEffect(TriggerEffectRequest): DefaultSuccess = 64; } diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index a8bf69532f75d5..8e6ea8db55c2b1 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -52,14 +52,6 @@ "incoming": 1, "outgoing": 1 }, - { - "name": "IdentifyQuery", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 1, - "outgoing": 1 - }, { "name": "TriggerEffect", "code": 64, @@ -95,16 +87,7 @@ "define": "IDENTIFY_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "IdentifyQueryResponse", - "code": 0, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 1 - } - ], + "commands": [], "attributes": [ { "name": "identify time", @@ -595,7 +578,7 @@ ], "attributes": [ { - "name": "scene count", + "name": "SceneCount", "code": 0, "mfgCode": null, "side": "server", @@ -611,7 +594,7 @@ "reportableChange": 0 }, { - "name": "current scene", + "name": "CurrentScene", "code": 1, "mfgCode": null, "side": "server", @@ -627,11 +610,11 @@ "reportableChange": 0 }, { - "name": "current group", + "name": "CurrentGroup", "code": 2, "mfgCode": null, "side": "server", - "type": "int16u", + "type": "group_id", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -643,7 +626,7 @@ "reportableChange": 0 }, { - "name": "scene valid", + "name": "SceneValid", "code": 3, "mfgCode": null, "side": "server", @@ -659,7 +642,7 @@ "reportableChange": 0 }, { - "name": "name support", + "name": "NameSupport", "code": 4, "mfgCode": null, "side": "server", @@ -675,7 +658,7 @@ "reportableChange": 0 }, { - "name": "last configured by", + "name": "LastConfiguredBy", "code": 5, "mfgCode": null, "side": "server", @@ -11546,7 +11529,7 @@ "code": 16, "mfgCode": null, "side": "server", - "type": "bitmap16", + "type": "PumpStatus", "included": 1, "storageOption": "RAM", "singleton": 0, @@ -11701,22 +11684,6 @@ "maxInterval": 65534, "reportableChange": 0 }, - { - "name": "AlarmMask", - "code": 34, - "mfgCode": null, - "side": "server", - "type": "bitmap16", - "included": 1, - "storageOption": "RAM", - "singleton": 0, - "bounded": 0, - "defaultValue": "", - "reportable": 1, - "minInterval": 1, - "maxInterval": 65534, - "reportableChange": 0 - }, { "name": "GeneratedCommandList", "code": 65528, @@ -11894,7 +11861,7 @@ ], "attributes": [ { - "name": "local temperature", + "name": "LocalTemperature", "code": 0, "mfgCode": null, "side": "server", @@ -11910,7 +11877,7 @@ "reportableChange": 0 }, { - "name": "abs min heat setpoint limit", + "name": "AbsMinHeatSetpointLimit", "code": 3, "mfgCode": null, "side": "server", @@ -11926,7 +11893,7 @@ "reportableChange": 0 }, { - "name": "abs max heat setpoint limit", + "name": "AbsMaxHeatSetpointLimit", "code": 4, "mfgCode": null, "side": "server", @@ -11942,7 +11909,7 @@ "reportableChange": 0 }, { - "name": "abs min cool setpoint limit", + "name": "AbsMinCoolSetpointLimit", "code": 5, "mfgCode": null, "side": "server", @@ -11958,7 +11925,7 @@ "reportableChange": 0 }, { - "name": "abs max cool setpoint limit", + "name": "AbsMaxCoolSetpointLimit", "code": 6, "mfgCode": null, "side": "server", @@ -11974,7 +11941,7 @@ "reportableChange": 0 }, { - "name": "pi cooling demand", + "name": "PICoolingDemand", "code": 7, "mfgCode": null, "side": "server", @@ -11990,7 +11957,7 @@ "reportableChange": 0 }, { - "name": "pi heating demand", + "name": "PIHeatingDemand", "code": 8, "mfgCode": null, "side": "server", @@ -12006,7 +11973,7 @@ "reportableChange": 0 }, { - "name": "occupied cooling setpoint", + "name": "OccupiedCoolingSetpoint", "code": 17, "mfgCode": null, "side": "server", @@ -12022,7 +11989,7 @@ "reportableChange": 0 }, { - "name": "occupied heating setpoint", + "name": "OccupiedHeatingSetpoint", "code": 18, "mfgCode": null, "side": "server", @@ -12038,7 +12005,7 @@ "reportableChange": 0 }, { - "name": "min heat setpoint limit", + "name": "MinHeatSetpointLimit", "code": 21, "mfgCode": null, "side": "server", @@ -12054,7 +12021,7 @@ "reportableChange": 0 }, { - "name": "max heat setpoint limit", + "name": "MaxHeatSetpointLimit", "code": 22, "mfgCode": null, "side": "server", @@ -12070,7 +12037,7 @@ "reportableChange": 0 }, { - "name": "min cool setpoint limit", + "name": "MinCoolSetpointLimit", "code": 23, "mfgCode": null, "side": "server", @@ -12086,7 +12053,7 @@ "reportableChange": 0 }, { - "name": "max cool setpoint limit", + "name": "MaxCoolSetpointLimit", "code": 24, "mfgCode": null, "side": "server", @@ -12102,7 +12069,7 @@ "reportableChange": 0 }, { - "name": "min setpoint dead band", + "name": "MinSetpointDeadBand", "code": 25, "mfgCode": null, "side": "server", @@ -12118,7 +12085,7 @@ "reportableChange": 0 }, { - "name": "control sequence of operation", + "name": "ControlSequenceOfOperation", "code": 27, "mfgCode": null, "side": "server", @@ -12134,7 +12101,7 @@ "reportableChange": 0 }, { - "name": "system mode", + "name": "SystemMode", "code": 28, "mfgCode": null, "side": "server", @@ -12150,7 +12117,7 @@ "reportableChange": 0 }, { - "name": "start of week", + "name": "StartOfWeek", "code": 32, "mfgCode": null, "side": "server", @@ -12166,7 +12133,7 @@ "reportableChange": 0 }, { - "name": "number of weekly transitions", + "name": "NumberOfWeeklyTransitions", "code": 33, "mfgCode": null, "side": "server", @@ -12182,7 +12149,7 @@ "reportableChange": 0 }, { - "name": "number of daily transitions", + "name": "NumberOfDailyTransitions", "code": 34, "mfgCode": null, "side": "server", @@ -19545,6 +19512,5 @@ "endpointVersion": 1, "deviceIdentifier": 22 } - ], - "log": [] + ] } \ No newline at end of file diff --git a/src/controller/java/zap-generated/CHIPCallbackTypes.h b/src/controller/java/zap-generated/CHIPCallbackTypes.h index f243c959269df2..abe2ebf9f7089b 100644 --- a/src/controller/java/zap-generated/CHIPCallbackTypes.h +++ b/src/controller/java/zap-generated/CHIPCallbackTypes.h @@ -784,8 +784,6 @@ typedef void (*CHIPGroupsClusterFeatureMapAttributeCallbackType)( void *, chip::app::Clusters::Groups::Attributes::FeatureMap::TypeInfo::DecodableArgType); typedef void (*CHIPGroupsClusterClusterRevisionAttributeCallbackType)( void *, chip::app::Clusters::Groups::Attributes::ClusterRevision::TypeInfo::DecodableArgType); -typedef void (*CHIPIdentifyClusterIdentifyQueryResponseCallbackType)( - void *, const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType &); typedef void (*CHIPIdentifyClusterIdentifyTimeAttributeCallbackType)( void *, chip::app::Clusters::Identify::Attributes::IdentifyTime::TypeInfo::DecodableArgType); diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index d6cb0356af0ffe..16182bd8adad60 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -1868,65 +1868,6 @@ void CHIPGroupsClusterViewGroupResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, status, groupId, groupName); } -CHIPIdentifyClusterIdentifyQueryResponseCallback::CHIPIdentifyClusterIdentifyQueryResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPIdentifyClusterIdentifyQueryResponseCallback::~CHIPIdentifyClusterIdentifyQueryResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPIdentifyClusterIdentifyQueryResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject timeout; - std::string timeoutClassName = "java/lang/Integer"; - std::string timeoutCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(timeoutClassName.c_str(), timeoutCtorSignature.c_str(), - dataResponse.timeout, timeout); - - env->CallVoidMethod(javaCallbackRef, javaMethod, timeout); -} CHIPKeypadInputClusterSendKeyResponseCallback::CHIPKeypadInputClusterSendKeyResponseCallback(jobject javaCallback) : Callback::Callback(CallbackFn, this) { diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index f52a28f0600407..7d7178e0b21747 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -319,21 +319,6 @@ class CHIPGroupsClusterViewGroupResponseCallback : public Callback::Callback -{ -public: - CHIPIdentifyClusterIdentifyQueryResponseCallback(jobject javaCallback); - - ~CHIPIdentifyClusterIdentifyQueryResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - class CHIPKeypadInputClusterSendKeyResponseCallback : public Callback::Callback { public: diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index cee1e4255a012d..0d3ebffc4b15ee 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -9902,15 +9902,6 @@ public void identify( identify(chipClusterPtr, callback, identifyTime, timedInvokeTimeoutMs); } - public void identifyQuery(IdentifyQueryResponseCallback callback) { - identifyQuery(chipClusterPtr, callback, null); - } - - public void identifyQuery(IdentifyQueryResponseCallback callback, int timedInvokeTimeoutMs) { - - identifyQuery(chipClusterPtr, callback, timedInvokeTimeoutMs); - } - public void triggerEffect( DefaultClusterCallback callback, Integer effectIdentifier, Integer effectVariant) { triggerEffect(chipClusterPtr, callback, effectIdentifier, effectVariant, null); @@ -9931,11 +9922,6 @@ private native void identify( Integer identifyTime, @Nullable Integer timedInvokeTimeoutMs); - private native void identifyQuery( - long chipClusterPtr, - IdentifyQueryResponseCallback Callback, - @Nullable Integer timedInvokeTimeoutMs); - private native void triggerEffect( long chipClusterPtr, DefaultClusterCallback Callback, @@ -9943,12 +9929,6 @@ private native void triggerEffect( Integer effectVariant, @Nullable Integer timedInvokeTimeoutMs); - public interface IdentifyQueryResponseCallback { - void onSuccess(Integer timeout); - - void onError(Exception error); - } - public interface GeneratedCommandListAttributeCallback { void onSuccess(List valueList); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 29a7f3902864bb..c9156547351ef2 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -3396,30 +3396,6 @@ public void onError(Exception ex) { } } - public static class DelegatedIdentifyQueryResponseCallback - implements ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback, - DelegatedClusterCallback { - private ClusterCommandCallback callback; - - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer timeout) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo timeoutResponseValue = new CommandResponseInfo("timeout", "Integer"); - responseValues.put(timeoutResponseValue, timeout); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - public static class DelegatedIdentifyClusterGeneratedCommandListAttributeCallback implements ChipClusters.IdentifyCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { @@ -10005,18 +9981,6 @@ public Map> getCommandMap() { () -> new DelegatedDefaultClusterCallback(), identifyidentifyCommandParams); identifyClusterInteractionInfoMap.put("identify", identifyidentifyInteractionInfo); - Map identifyidentifyQueryCommandParams = - new LinkedHashMap(); - InteractionInfo identifyidentifyQueryInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.IdentifyCluster) cluster) - .identifyQuery( - (ChipClusters.IdentifyCluster.IdentifyQueryResponseCallback) callback); - }, - () -> new DelegatedIdentifyQueryResponseCallback(), - identifyidentifyQueryCommandParams); - identifyClusterInteractionInfoMap.put("identifyQuery", identifyidentifyQueryInteractionInfo); Map identifytriggerEffectCommandParams = new LinkedHashMap(); CommandParameterInfo identifytriggerEffecteffectIdentifierCommandParameterInfo = diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index d13f889796e7ff..92c0485043dd01 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -3108,12 +3108,6 @@ class ChipClusters: "identifyTime": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "IdentifyQuery", - "args": { - }, - }, 0x00000040: { "commandId": 0x00000040, "commandName": "TriggerEffect", diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 706f194ae0b808..599b1382c11195 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -1497,34 +1497,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: identifyTime: 'uint' = 0 - @dataclass - class IdentifyQueryResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0003 - command_id: typing.ClassVar[int] = 0x0000 - is_client: typing.ClassVar[bool] = False - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ClusterObjectFieldDescriptor(Label="timeout", Tag=0, Type=uint), - ]) - - timeout: 'uint' = 0 - - @dataclass - class IdentifyQuery(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0003 - command_id: typing.ClassVar[int] = 0x0001 - is_client: typing.ClassVar[bool] = True - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields = [ - ]) - - @dataclass class TriggerEffect(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0003 diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm index a3436ed15a58ae..0efb5dda0a4f4f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge.mm @@ -12266,16 +12266,6 @@ DispatchSuccess(context, response); }; -void CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & data) -{ - auto * response = [CHIPIdentifyClusterIdentifyQueryResponseParams new]; - { - response.timeout = [NSNumber numberWithUnsignedShort:data.timeout]; - } - DispatchSuccess(context, response); -}; - void CHIPKeypadInputClusterSendKeyResponseCallbackBridge::OnSuccessFn( void * context, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & data) { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h index 98771afc40e31b..589aaf0d6220d0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCallbackBridge_internal.h @@ -81,8 +81,6 @@ typedef void (*CHIPGroupsClusterGetGroupMembershipResponseCallbackType)( void *, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType &); typedef void (*CHIPGroupsClusterRemoveGroupResponseCallbackType)( void *, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType &); -typedef void (*CHIPIdentifyClusterIdentifyQueryResponseCallbackType)( - void *, const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType &); typedef void (*CHIPKeypadInputClusterSendKeyResponseCallbackType)( void *, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType &); typedef void (*CHIPMediaPlaybackClusterPlaybackResponseCallbackType)( @@ -9985,18 +9983,6 @@ class CHIPGroupsClusterRemoveGroupResponseCallbackBridge static void OnSuccessFn(void * context, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & data); }; -class CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge - : public CHIPCallbackBridge -{ -public: - CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, CHIPActionBlock action, - bool keepAlive = false) : - CHIPCallbackBridge(queue, handler, action, OnSuccessFn, keepAlive){}; - - static void OnSuccessFn(void * context, - const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & data); -}; - class CHIPKeypadInputClusterSendKeyResponseCallbackBridge : public CHIPCallbackBridge { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h index bb94e9a4641589..d44eb3a6de6952 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.h @@ -9800,11 +9800,6 @@ NS_ASSUME_NONNULL_BEGIN @interface CHIPIdentify : CHIPCluster - (void)identifyWithParams:(CHIPIdentifyClusterIdentifyParams *)params completionHandler:(StatusCompletion)completionHandler; -- (void)identifyQueryWithParams:(CHIPIdentifyClusterIdentifyQueryParams * _Nullable)params - completionHandler:(void (^)(CHIPIdentifyClusterIdentifyQueryResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; -- (void)identifyQueryWithCompletionHandler:(void (^)(CHIPIdentifyClusterIdentifyQueryResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler; - (void)triggerEffectWithParams:(CHIPIdentifyClusterTriggerEffectParams *)params completionHandler:(StatusCompletion)completionHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm index 3e02cba7ca2617..0703c595770dd1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPClustersObjc.mm @@ -37194,33 +37194,6 @@ new CHIPCommandSuccessCallbackBridge( }); } -- (void)identifyQueryWithCompletionHandler:(void (^)(CHIPIdentifyClusterIdentifyQueryResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler -{ - [self identifyQueryWithParams:nil completionHandler:completionHandler]; -} -- (void)identifyQueryWithParams:(CHIPIdentifyClusterIdentifyQueryParams * _Nullable)params - completionHandler:(void (^)(CHIPIdentifyClusterIdentifyQueryResponseParams * _Nullable data, - NSError * _Nullable error))completionHandler -{ - chip::Optional timedInvokeTimeoutMs; - ListFreer listFreer; - Identify::Commands::IdentifyQuery::Type request; - if (params != nil) { - if (params.timedInvokeTimeoutMs != nil) { - timedInvokeTimeoutMs.SetValue(params.timedInvokeTimeoutMs.unsignedShortValue); - } - } - - new CHIPIdentifyClusterIdentifyQueryResponseCallbackBridge( - self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { - auto successFn = Callback::FromCancelable(success); - auto failureFn = Callback::FromCancelable(failure); - return self.cppCluster.InvokeCommand( - request, successFn->mContext, successFn->mCall, failureFn->mCall, timedInvokeTimeoutMs); - }); -} - - (void)triggerEffectWithParams:(CHIPIdentifyClusterTriggerEffectParams *)params completionHandler:(StatusCompletion)completionHandler { diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h index 88ea6471c7363a..b3d1b264a9653e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.h @@ -44,46 +44,6 @@ NS_ASSUME_NONNULL_BEGIN */ @property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; -- (instancetype)init; -@end -@interface CHIPIdentifyClusterIdentifyQueryResponseParams : NSObject - -@property (strong, nonatomic) NSNumber * _Nonnull timeout; -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - -- (instancetype)init; -@end -@interface CHIPIdentifyClusterIdentifyQueryParams : NSObject -/** - * Controls whether the command is a timed command (using Timed Invoke). - * - * If nil (the default value), a regular invoke is done for commands that do - * not require a timed invoke and a timed invoke with some default timed request - * timeout is done for commands that require a timed invoke. - * - * If not nil, a timed invoke is done, with the provided value used as the timed - * request timeout. The value should be chosen small enough to provide the - * desired security properties but large enough that it will allow a round-trip - * from the sever to the client (for the status response and actual invoke - * request) within the timeout window. - * - */ -@property (strong, nonatomic, nullable) NSNumber * timedInvokeTimeoutMs; - - (instancetype)init; @end @interface CHIPIdentifyClusterTriggerEffectParams : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm index 8129f6a2d08840..12259c86a1440a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/CHIPCommandPayloadsObjc.mm @@ -32,26 +32,6 @@ - (instancetype)init return self; } @end -@implementation CHIPIdentifyClusterIdentifyQueryResponseParams -- (instancetype)init -{ - if (self = [super init]) { - - _timeout = @(0); - _timedInvokeTimeoutMs = nil; - } - return self; -} -@end -@implementation CHIPIdentifyClusterIdentifyQueryParams -- (instancetype)init -{ - if (self = [super init]) { - _timedInvokeTimeoutMs = nil; - } - return self; -} -@end @implementation CHIPIdentifyClusterTriggerEffectParams - (instancetype)init { diff --git a/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h index adeeb9a2e8b840..dac1bd94f25dac 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MatterClusterConstants.h @@ -2084,8 +2084,6 @@ typedef NS_ENUM(uint32_t, MatterClusterAttributeIDType) { typedef NS_ENUM(uint32_t, MatterClusterCommandIDType) { // Cluster Identify commands kMatterClusterIdentifyCommandIdentifyID = 0x00000000, - kMatterClusterIdentifyCommandIdentifyQueryResponseID = 0x00000000, - kMatterClusterIdentifyCommandIdentifyQueryID = 0x00000001, kMatterClusterIdentifyCommandTriggerEffectID = 0x00000040, // Cluster Groups commands diff --git a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp index b3f1779b588ea7..c9ab49649e15d2 100644 --- a/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/all-clusters-app/zap-generated/IMClusterCommandHandler.cpp @@ -830,15 +830,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::TriggerEffect::Id: { Commands::TriggerEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); diff --git a/zzz_generated/all-clusters-app/zap-generated/access.h b/zzz_generated/all-clusters-app/zap-generated/access.h index e288fbbecd9bcc..a34b98bc39e255 100644 --- a/zzz_generated/all-clusters-app/zap-generated/access.h +++ b/zzz_generated/all-clusters-app/zap-generated/access.h @@ -410,7 +410,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -461,7 +460,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -512,7 +510,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index 65c11ea90221e2..e0a8d7773b57ca 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -1575,14 +1575,10 @@ /* Endpoint: 0, Cluster: Identify (server) */\ /* AcceptedCommandList (index=0) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=4)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=6) */ \ + /* AcceptedCommandList (index=3) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -1590,29 +1586,29 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=13)*/ \ + /* GeneratedCommandList (index=10)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ - /* AcceptedCommandList (index=18) */ \ + /* AcceptedCommandList (index=15) */ \ 0x00000000 /* AnnounceOtaProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ - /* AcceptedCommandList (index=20) */ \ + /* AcceptedCommandList (index=17) */ \ 0x00000000 /* ArmFailSafe */, \ 0x00000002 /* SetRegulatoryConfig */, \ 0x00000004 /* CommissioningComplete */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=24)*/ \ + /* GeneratedCommandList (index=21)*/ \ 0x00000001 /* ArmFailSafeResponse */, \ 0x00000003 /* SetRegulatoryConfigResponse */, \ 0x00000005 /* CommissioningCompleteResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=28) */ \ + /* AcceptedCommandList (index=25) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -1620,42 +1616,42 @@ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=35)*/ \ + /* GeneratedCommandList (index=32)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\ - /* AcceptedCommandList (index=39) */ \ + /* AcceptedCommandList (index=36) */ \ 0x00000000 /* RetrieveLogsRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=41)*/ \ + /* GeneratedCommandList (index=38)*/ \ 0x00000001 /* RetrieveLogsResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\ - /* AcceptedCommandList (index=43) */ \ + /* AcceptedCommandList (index=40) */ \ 0x00000000 /* ResetWatermarks */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\ - /* AcceptedCommandList (index=45) */ \ + /* AcceptedCommandList (index=42) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: WiFi Network Diagnostics (server) */\ - /* AcceptedCommandList (index=47) */ \ + /* AcceptedCommandList (index=44) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\ - /* AcceptedCommandList (index=49) */ \ + /* AcceptedCommandList (index=46) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\ - /* AcceptedCommandList (index=51) */ \ + /* AcceptedCommandList (index=48) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ 0x00000002 /* RevokeCommissioning */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Operational Credentials (server) */\ - /* AcceptedCommandList (index=55) */ \ + /* AcceptedCommandList (index=52) */ \ 0x00000000 /* AttestationRequest */, \ 0x00000002 /* CertificateChainRequest */, \ 0x00000004 /* CSRRequest */, \ @@ -1666,34 +1662,30 @@ 0x0000000B /* AddTrustedRootCertificate */, \ 0x0000000C /* RemoveTrustedRootCertificate */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=65)*/ \ + /* GeneratedCommandList (index=62)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=70) */ \ + /* AcceptedCommandList (index=67) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=75)*/ \ + /* GeneratedCommandList (index=72)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=78) */ \ + /* AcceptedCommandList (index=75) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=82)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=84) */ \ + /* AcceptedCommandList (index=78) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -1701,14 +1693,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=91)*/ \ + /* GeneratedCommandList (index=85)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=96) */ \ + /* AcceptedCommandList (index=90) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -1717,7 +1709,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=104)*/ \ + /* GeneratedCommandList (index=98)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -1726,7 +1718,7 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=111) */ \ + /* AcceptedCommandList (index=105) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -1735,7 +1727,7 @@ 0x00000042 /* OnWithTimedOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=118) */ \ + /* AcceptedCommandList (index=112) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -1746,11 +1738,11 @@ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Mode Select (server) */\ - /* AcceptedCommandList (index=127) */ \ + /* AcceptedCommandList (index=121) */ \ 0x00000000 /* ChangeToMode */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ - /* AcceptedCommandList (index=129) */ \ + /* AcceptedCommandList (index=123) */ \ 0x00000000 /* LockDoor */, \ 0x00000001 /* UnlockDoor */, \ 0x00000003 /* UnlockWithTimeout */, \ @@ -1766,7 +1758,7 @@ 0x00000024 /* GetCredentialStatus */, \ 0x00000026 /* ClearCredential */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=144)*/ \ + /* GeneratedCommandList (index=138)*/ \ 0x0000000C /* GetWeekDayScheduleResponse */, \ 0x0000000F /* GetYearDayScheduleResponse */, \ 0x0000001C /* GetUserResponse */, \ @@ -1774,7 +1766,7 @@ 0x00000025 /* GetCredentialStatusResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Window Covering (server) */\ - /* AcceptedCommandList (index=150) */ \ + /* AcceptedCommandList (index=144) */ \ 0x00000000 /* UpOrOpen */, \ 0x00000001 /* DownOrClose */, \ 0x00000002 /* StopMotion */, \ @@ -1784,16 +1776,16 @@ 0x00000008 /* GoToTiltPercentage */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Barrier Control (server) */\ - /* AcceptedCommandList (index=158) */ \ + /* AcceptedCommandList (index=152) */ \ 0x00000000 /* BarrierControlGoToPercent */, \ 0x00000001 /* BarrierControlStop */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Thermostat (server) */\ - /* AcceptedCommandList (index=161) */ \ + /* AcceptedCommandList (index=155) */ \ 0x00000000 /* SetpointRaiseLower */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Color Control (server) */\ - /* AcceptedCommandList (index=163) */ \ + /* AcceptedCommandList (index=157) */ \ 0x00000000 /* MoveToHue */, \ 0x00000001 /* MoveHue */, \ 0x00000002 /* StepHue */, \ @@ -1815,80 +1807,80 @@ 0x0000004C /* StepColorTemperature */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: IAS Zone (server) */\ - /* AcceptedCommandList (index=183) */ \ + /* AcceptedCommandList (index=177) */ \ 0x00000000 /* ZoneEnrollResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Channel (server) */\ - /* AcceptedCommandList (index=185) */ \ + /* AcceptedCommandList (index=179) */ \ 0x00000000 /* ChangeChannel */, \ 0x00000002 /* ChangeChannelByNumber */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=188)*/ \ + /* GeneratedCommandList (index=182)*/ \ 0x00000001 /* ChangeChannelResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Target Navigator (server) */\ - /* AcceptedCommandList (index=190) */ \ + /* AcceptedCommandList (index=184) */ \ 0x00000000 /* NavigateTarget */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=192)*/ \ + /* GeneratedCommandList (index=186)*/ \ 0x00000001 /* NavigateTargetResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Media Playback (server) */\ - /* AcceptedCommandList (index=194) */ \ + /* AcceptedCommandList (index=188) */ \ 0x00000000 /* Play */, \ 0x00000001 /* Pause */, \ 0x00000002 /* StopPlayback */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=198)*/ \ + /* GeneratedCommandList (index=192)*/ \ 0x0000000A /* PlaybackResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Media Input (server) */\ - /* AcceptedCommandList (index=200) */ \ + /* AcceptedCommandList (index=194) */ \ 0x00000000 /* SelectInput */, \ 0x00000001 /* ShowInputStatus */, \ 0x00000002 /* HideInputStatus */, \ 0x00000003 /* RenameInput */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Low Power (server) */\ - /* AcceptedCommandList (index=205) */ \ + /* AcceptedCommandList (index=199) */ \ 0x00000000 /* Sleep */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Keypad Input (server) */\ - /* AcceptedCommandList (index=207) */ \ + /* AcceptedCommandList (index=201) */ \ 0x00000000 /* SendKey */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=209)*/ \ + /* GeneratedCommandList (index=203)*/ \ 0x00000001 /* SendKeyResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Content Launcher (server) */\ - /* AcceptedCommandList (index=211) */ \ + /* AcceptedCommandList (index=205) */ \ 0x00000000 /* LaunchContent */, \ 0x00000001 /* LaunchURL */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=214)*/ \ + /* GeneratedCommandList (index=208)*/ \ 0x00000002 /* LaunchResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Audio Output (server) */\ - /* AcceptedCommandList (index=216) */ \ + /* AcceptedCommandList (index=210) */ \ 0x00000000 /* SelectOutput */, \ 0x00000001 /* RenameOutput */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Application Launcher (server) */\ - /* AcceptedCommandList (index=219) */ \ + /* AcceptedCommandList (index=213) */ \ 0x00000000 /* LaunchApp */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=221)*/ \ + /* GeneratedCommandList (index=215)*/ \ 0x00000003 /* LauncherResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Account Login (server) */\ - /* AcceptedCommandList (index=223) */ \ + /* AcceptedCommandList (index=217) */ \ 0x00000000 /* GetSetupPIN */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=225)*/ \ + /* GeneratedCommandList (index=219)*/ \ 0x00000001 /* GetSetupPINResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Test Cluster (server) */\ - /* AcceptedCommandList (index=227) */ \ + /* AcceptedCommandList (index=221) */ \ 0x00000000 /* Test */, \ 0x00000001 /* TestNotHandled */, \ 0x00000002 /* TestSpecific */, \ @@ -1908,7 +1900,7 @@ 0x00000014 /* TestEmitTestEventRequest */, \ 0x00000015 /* TestEmitTestFabricScopedEventRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=246)*/ \ + /* GeneratedCommandList (index=240)*/ \ 0x00000000 /* TestSpecificResponse */, \ 0x00000001 /* TestAddArgumentsResponse */, \ 0x00000004 /* TestListInt8UReverseResponse */, \ @@ -1920,7 +1912,7 @@ 0x0000000B /* TestEmitTestFabricScopedEventResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=256) */ \ + /* AcceptedCommandList (index=250) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -1928,20 +1920,20 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=263)*/ \ + /* GeneratedCommandList (index=257)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=268) */ \ + /* AcceptedCommandList (index=262) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 65534, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=272) */ \ + /* AcceptedCommandList (index=266) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -1949,7 +1941,7 @@ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=279)*/ \ + /* GeneratedCommandList (index=273)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ @@ -1972,7 +1964,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 4 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 0, Cluster: Groups (server) */ \ @@ -1982,8 +1974,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 6 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 13 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -2048,7 +2040,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2114,8 +2106,8 @@ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 20 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ @@ -2125,8 +2117,8 @@ .clusterSize = 48, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ @@ -2136,8 +2128,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ @@ -2158,7 +2150,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2169,7 +2161,7 @@ .clusterSize = 247, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2180,7 +2172,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2191,7 +2183,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 49 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 46 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2202,7 +2194,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2213,8 +2205,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -2224,8 +2216,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ @@ -2268,8 +2260,8 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -2279,8 +2271,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 91 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ @@ -2290,8 +2282,8 @@ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 96 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 104 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ @@ -2301,7 +2293,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 111 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2323,7 +2315,7 @@ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 118 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 112 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2433,7 +2425,7 @@ .clusterSize = 44, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayModeSelectServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 127 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 121 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2444,8 +2436,8 @@ .clusterSize = 55, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayDoorLockServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 129 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 123 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 138 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ @@ -2455,7 +2447,7 @@ .clusterSize = 35, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayWindowCoveringServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 150 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 144 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2466,7 +2458,7 @@ .clusterSize = 11, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 158 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 152 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2488,7 +2480,7 @@ .clusterSize = 34, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayThermostatServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 161 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 155 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2521,7 +2513,7 @@ .clusterSize = 345, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayColorControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 163 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 157 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2598,7 +2590,7 @@ .clusterSize = 20, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ .functions = chipFuncArrayIasZoneServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 183 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 177 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2620,8 +2612,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 185 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 188 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 179 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 182 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ @@ -2631,8 +2623,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 190 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 184 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 186 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ @@ -2642,8 +2634,8 @@ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 198 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 188 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 192 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Media Input (server) */ \ @@ -2653,7 +2645,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 200 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 194 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2664,7 +2656,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 205 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 199 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2675,8 +2667,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 207 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 209 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 201 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 203 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ @@ -2686,8 +2678,8 @@ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 211 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 214 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 205 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 208 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Audio Output (server) */ \ @@ -2697,7 +2689,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 216 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 210 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2708,8 +2700,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 219 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 221 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 213 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 215 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ @@ -2730,8 +2722,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 223 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 225 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 217 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 219 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Test Cluster (server) */ \ @@ -2741,8 +2733,8 @@ .clusterSize = 2289, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 227 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 246 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 221 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 240 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ @@ -2763,8 +2755,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 256 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 263 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 250 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 257 ) ,\ },\ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ @@ -2774,7 +2766,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 268 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 262 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -2818,8 +2810,8 @@ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 272 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 279 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 266 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 273 ) ,\ },\ } 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 b82604017a5ce5..a1a264bec3df9b 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -12295,17 +12295,6 @@ void emberAfElectricalMeasurementClusterClientTickCallback(chip::EndpointId endp bool emberAfIdentifyClusterIdentifyCallback(chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::Identify::Commands::Identify::DecodableType & commandData); -/** - * @brief Identify Cluster IdentifyQueryResponse Command callback (from server) - */ -bool emberAfIdentifyClusterIdentifyQueryResponseCallback(chip::EndpointId endpoint, chip::app::CommandSender * commandObj, - uint16_t timeout); -/** - * @brief Identify Cluster IdentifyQuery Command callback (from client) - */ -bool emberAfIdentifyClusterIdentifyQueryCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::Identify::Commands::IdentifyQuery::DecodableType & commandData); /** * @brief Identify Cluster TriggerEffect Command callback (from client) */ 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 6133e43c0051fe..95515c24504e34 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 @@ -385,76 +385,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace Identify. -namespace IdentifyQueryResponse { -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::kTimeout)), timeout)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kTimeout): - ReturnErrorOnFailure(DataModel::Decode(reader, timeout)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace IdentifyQueryResponse. -namespace IdentifyQuery { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace IdentifyQuery. namespace TriggerEffect { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { 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 e107edb13595df..14c302815afb27 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 @@ -1106,16 +1106,6 @@ struct Type; struct DecodableType; } // namespace Identify -namespace IdentifyQueryResponse { -struct Type; -struct DecodableType; -} // namespace IdentifyQueryResponse - -namespace IdentifyQuery { -struct Type; -struct DecodableType; -} // namespace IdentifyQuery - namespace TriggerEffect { struct Type; struct DecodableType; @@ -1156,66 +1146,6 @@ struct DecodableType CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace Identify -namespace IdentifyQueryResponse { -enum class Fields -{ - kTimeout = 0, -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::IdentifyQueryResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; } - - uint16_t timeout = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = DataModel::NullObjectType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::IdentifyQueryResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; } - - uint16_t timeout = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace IdentifyQueryResponse -namespace IdentifyQuery { -enum class Fields -{ -}; - -struct Type -{ -public: - // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::IdentifyQuery::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; } - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::IdentifyQuery::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::Identify::Id; } - - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace IdentifyQuery namespace TriggerEffect { enum class Fields { diff --git a/zzz_generated/app-common/app-common/zap-generated/command-id.h b/zzz_generated/app-common/app-common/zap-generated/command-id.h index cec0fa7a545b96..004f8a61d62162 100644 --- a/zzz_generated/app-common/app-common/zap-generated/command-id.h +++ b/zzz_generated/app-common/app-common/zap-generated/command-id.h @@ -34,8 +34,6 @@ // Commands for cluster: Identify #define ZCL_IDENTIFY_COMMAND_ID (0x00) -#define ZCL_IDENTIFY_QUERY_RESPONSE_COMMAND_ID (0x00) -#define ZCL_IDENTIFY_QUERY_COMMAND_ID (0x01) #define ZCL_TRIGGER_EFFECT_COMMAND_ID (0x40) // Commands for cluster: Groups diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h index 525740d29f0179..042e1717dd1670 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Commands.h @@ -34,14 +34,6 @@ namespace Identify { static constexpr CommandId Id = 0x00000000; } // namespace Identify -namespace IdentifyQueryResponse { -static constexpr CommandId Id = 0x00000000; -} // namespace IdentifyQueryResponse - -namespace IdentifyQuery { -static constexpr CommandId Id = 0x00000001; -} // namespace IdentifyQuery - namespace TriggerEffect { static constexpr CommandId Id = 0x00000040; } // namespace TriggerEffect diff --git a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h index 943af11b1b89f9..d9dcdccd5a4fba 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/cluster/Commands.h @@ -44131,7 +44131,6 @@ class SubscribeAttributeGroupsClusterRevision : public SubscribeAttribute { |------------------------------------------------------------------------------| | Commands: | | | * Identify | 0x00 | -| * IdentifyQuery | 0x01 | | * TriggerEffect | 0x40 | |------------------------------------------------------------------------------| | Attributes: | | @@ -44190,48 +44189,6 @@ class IdentifyIdentify : public ClusterCommand { chip::app::Clusters::Identify::Commands::Identify::Type mRequest; }; -/* - * Command IdentifyQuery - */ -class IdentifyIdentifyQuery : public ClusterCommand { -public: - IdentifyIdentifyQuery() - : ClusterCommand("identify-query") - { - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(CHIPDevice * device, chip::EndpointId endpointId) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000001) on endpoint %u", endpointId); - - dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - CHIPIdentify * cluster = [[CHIPIdentify alloc] initWithDevice:device endpoint:endpointId queue:callbackQueue]; - __auto_type * params = [[CHIPIdentifyClusterIdentifyQueryParams alloc] init]; - params.timedInvokeTimeoutMs - = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; - uint16_t repeatCount = mRepeatCount.ValueOr(1); - uint16_t __block responsesNeeded = repeatCount; - while (repeatCount--) { - [cluster identifyQueryWithCompletionHandler:^( - CHIPIdentifyClusterIdentifyQueryResponseParams * _Nullable values, NSError * _Nullable error) { - NSLog(@"Values: %@", values); - responsesNeeded--; - if (error != nil) { - mError = error; - LogNSError("Error", error); - } - if (responsesNeeded == 0) { - SetCommandExitStatus(mError); - } - }]; - } - return CHIP_NO_ERROR; - } - -private: -}; - /* * Command TriggerEffect */ @@ -98547,7 +98504,6 @@ void registerClusterIdentify(Commands & commands) commands_list clusterCommands = { make_unique(Id), // make_unique(), // - make_unique(), // make_unique(), // make_unique(Id), // make_unique(), // diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h index 937be987c6011a..c51367252f4f47 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h @@ -23744,10 +23744,9 @@ class Test_TC_I_1_1 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(3))); + VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(2))); VerifyOrReturn(CheckValue("", actualValue[0], 0UL)); - VerifyOrReturn(CheckValue("", actualValue[1], 1UL)); - VerifyOrReturn(CheckValue("", actualValue[2], 64UL)); + VerifyOrReturn(CheckValue("", actualValue[1], 64UL)); } VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); @@ -23770,8 +23769,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(1))); - VerifyOrReturn(CheckValue("", actualValue[0], 0UL)); + VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index cd85d11deb0979..94e23a5844166c 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -1630,7 +1630,6 @@ class WriteDeviceTemperatureConfigurationHighTempDwellTripPoint : public WriteAt |------------------------------------------------------------------------------| | Commands: | | | * Identify | 0x00 | -| * IdentifyQuery | 0x01 | | * TriggerEffect | 0x40 | |------------------------------------------------------------------------------| | Attributes: | | @@ -1675,35 +1674,6 @@ class IdentifyIdentify : public ClusterCommand chip::app::Clusters::Identify::Commands::Identify::Type mRequest; }; -/* - * Command IdentifyQuery - */ -class IdentifyIdentifyQuery : public ClusterCommand -{ -public: - IdentifyIdentifyQuery(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("identify-query", credsIssuerConfig) - { - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000003, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000003) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000003, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::Identify::Commands::IdentifyQuery::Type mRequest; -}; - /* * Command TriggerEffect */ @@ -19570,7 +19540,6 @@ void registerClusterIdentify(Commands & commands, CredentialIssuerCommands * cre // make_unique(Id, credsIssuerConfig), // make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // make_unique(credsIssuerConfig), // // // Attributes 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 a33d89f854aaa7..130c71a49aacd5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -3930,14 +3930,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const Identify::Commands::IdentifyQueryResponse::DecodableType & value) -{ - DataModelLogger::LogString(label, indent, "{"); - ReturnErrorOnFailure(DataModelLogger::LogValue("timeout", indent + 1, value.timeout)); - DataModelLogger::LogString(indent, "}"); - return CHIP_NO_ERROR; -} CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const KeypadInput::Commands::SendKeyResponse::DecodableType & value) { @@ -10334,17 +10326,6 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa } break; } - case Identify::Id: { - switch (path.mCommandId) - { - case Identify::Commands::IdentifyQueryResponse::Id: { - Identify::Commands::IdentifyQueryResponse::DecodableType value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("IdentifyQueryResponse", 1, value); - } - } - break; - } case KeypadInput::Id: { switch (path.mCommandId) { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h index 222f7b45276329..bfd45f3c7ec56e 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -329,8 +329,6 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType & value); -static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::Identify::Commands::IdentifyQueryResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::KeypadInput::Commands::SendKeyResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index e07116f18d5d55..bff137ed1a47f9 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -13646,10 +13646,8 @@ class Test_TC_I_1_1Suite : public TestCommand VerifyOrReturn(CheckNextListItemDecodes("acceptedCommandList", iter_0, 0)); VerifyOrReturn(CheckValue("acceptedCommandList[0]", iter_0.GetValue(), 0UL)); VerifyOrReturn(CheckNextListItemDecodes("acceptedCommandList", iter_0, 1)); - VerifyOrReturn(CheckValue("acceptedCommandList[1]", iter_0.GetValue(), 1UL)); - VerifyOrReturn(CheckNextListItemDecodes("acceptedCommandList", iter_0, 2)); - VerifyOrReturn(CheckValue("acceptedCommandList[2]", iter_0.GetValue(), 64UL)); - VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 3)); + VerifyOrReturn(CheckValue("acceptedCommandList[1]", iter_0.GetValue(), 64UL)); + VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 2)); } VerifyOrReturn(CheckConstraintType("value", "", "list")); } @@ -13661,9 +13659,7 @@ class Test_TC_I_1_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); { auto iter_0 = value.begin(); - VerifyOrReturn(CheckNextListItemDecodes("generatedCommandList", iter_0, 0)); - VerifyOrReturn(CheckValue("generatedCommandList[0]", iter_0.GetValue(), 0UL)); - VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 1)); + VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } VerifyOrReturn(CheckConstraintType("value", "", "list")); } diff --git a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp index 795401ad195231..587ab0dd64d22f 100644 --- a/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/light-switch-app/zap-generated/IMClusterCommandHandler.cpp @@ -393,15 +393,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::TriggerEffect::Id: { Commands::TriggerEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); diff --git a/zzz_generated/light-switch-app/zap-generated/access.h b/zzz_generated/light-switch-app/zap-generated/access.h index 558efee1b290ef..7be6ab062f370a 100644 --- a/zzz_generated/light-switch-app/zap-generated/access.h +++ b/zzz_generated/light-switch-app/zap-generated/access.h @@ -153,7 +153,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -189,7 +188,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -225,7 +223,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index 9057f0e446f2c6..5cc015058c1a99 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -577,14 +577,10 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=60) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=64)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=66) */ \ + /* AcceptedCommandList (index=63) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -592,7 +588,7 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=73)*/ \ + /* GeneratedCommandList (index=70)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ @@ -869,7 +865,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -879,8 +875,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (client) */ \ diff --git a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp index 616fa6db37d561..7fb7a6d52d8f47 100644 --- a/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lighting-app/zap-generated/IMClusterCommandHandler.cpp @@ -593,15 +593,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::TriggerEffect::Id: { Commands::TriggerEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); diff --git a/zzz_generated/lighting-app/zap-generated/access.h b/zzz_generated/lighting-app/zap-generated/access.h index 460ea0d8a9091d..a3d3005357c0f0 100644 --- a/zzz_generated/lighting-app/zap-generated/access.h +++ b/zzz_generated/lighting-app/zap-generated/access.h @@ -171,7 +171,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -207,7 +206,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -243,7 +241,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index 2194db6b82d630..60db0d8b8483a6 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -689,14 +689,10 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=72) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=76)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=78) */ \ + /* AcceptedCommandList (index=75) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -704,14 +700,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=85)*/ \ + /* GeneratedCommandList (index=82)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=90) */ \ + /* AcceptedCommandList (index=87) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -720,7 +716,7 @@ 0x00000042 /* OnWithTimedOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=97) */ \ + /* AcceptedCommandList (index=94) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -731,7 +727,7 @@ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Color Control (server) */\ - /* AcceptedCommandList (index=106) */ \ + /* AcceptedCommandList (index=103) */ \ 0x00000000 /* MoveToHue */, \ 0x00000001 /* MoveHue */, \ 0x00000002 /* StepHue */, \ @@ -1012,7 +1008,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -1022,8 +1018,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ @@ -1033,7 +1029,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1044,7 +1040,7 @@ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 97 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 94 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1066,7 +1062,7 @@ .clusterSize = 40, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayColorControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 106 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ diff --git a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp index df6e20c7b712be..d87cf2cbae535a 100644 --- a/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/lock-app/zap-generated/IMClusterCommandHandler.cpp @@ -492,15 +492,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); diff --git a/zzz_generated/lock-app/zap-generated/access.h b/zzz_generated/lock-app/zap-generated/access.h index 15851d1a390ef2..7e0b45dae4cf7b 100644 --- a/zzz_generated/lock-app/zap-generated/access.h +++ b/zzz_generated/lock-app/zap-generated/access.h @@ -215,7 +215,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -258,7 +257,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -301,7 +299,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index cdabad28fbe065..454f94063c05a4 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -668,13 +668,9 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=52) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=55)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=57) */ \ + /* AcceptedCommandList (index=54) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -682,20 +678,20 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=64)*/ \ + /* GeneratedCommandList (index=61)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=69) */ \ + /* AcceptedCommandList (index=66) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Door Lock (server) */\ - /* AcceptedCommandList (index=73) */ \ + /* AcceptedCommandList (index=70) */ \ 0x00000000 /* LockDoor */, \ 0x00000001 /* UnlockDoor */, \ 0x00000003 /* UnlockWithTimeout */, \ @@ -712,7 +708,7 @@ 0x00000024 /* GetCredentialStatus */, \ 0x00000026 /* ClearCredential */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=89)*/ \ + /* GeneratedCommandList (index=86)*/ \ 0x0000000C /* GetWeekDayScheduleResponse */, \ 0x0000000F /* GetYearDayScheduleResponse */, \ 0x0000001C /* GetUserResponse */, \ @@ -968,7 +964,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 52 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -978,8 +974,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\ },\ { \ /* Endpoint: 1, Cluster: On/Off (server) */ \ @@ -989,7 +985,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1022,8 +1018,8 @@ .clusterSize = 41, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayDoorLockServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\ },\ } diff --git a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp index f760b2714e36fe..8cc17487d0bf64 100644 --- a/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/placeholder/app1/zap-generated/IMClusterCommandHandler.cpp @@ -393,15 +393,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); diff --git a/zzz_generated/placeholder/app1/zap-generated/access.h b/zzz_generated/placeholder/app1/zap-generated/access.h index 59a4a55c31155a..6c3a4036a133cb 100644 --- a/zzz_generated/placeholder/app1/zap-generated/access.h +++ b/zzz_generated/placeholder/app1/zap-generated/access.h @@ -209,7 +209,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -244,7 +243,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -279,7 +277,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index a0745ad332f7d2..a27a5144c5c2cd 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -787,13 +787,9 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=76) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=79)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=81) */ \ + /* AcceptedCommandList (index=78) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -801,14 +797,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=88)*/ \ + /* GeneratedCommandList (index=85)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=93) */ \ + /* AcceptedCommandList (index=90) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -817,7 +813,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=101)*/ \ + /* GeneratedCommandList (index=98)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -826,13 +822,13 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=108) */ \ + /* AcceptedCommandList (index=105) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=112) */ \ + /* AcceptedCommandList (index=109) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -843,7 +839,7 @@ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Color Control (server) */\ - /* AcceptedCommandList (index=121) */ \ + /* AcceptedCommandList (index=118) */ \ 0x00000007 /* MoveToColor */, \ 0x00000008 /* MoveColor */, \ 0x00000009 /* StepColor */, \ @@ -1328,7 +1324,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -1338,8 +1334,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ @@ -1349,8 +1345,8 @@ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 93 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 101 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\ },\ { \ /* Endpoint: 1, Cluster: On/Off (client) */ \ @@ -1371,7 +1367,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1382,7 +1378,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 112 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1404,7 +1400,7 @@ .clusterSize = 15, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayColorControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 121 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 118 ) ,\ .generatedCommandList = nullptr ,\ },\ } diff --git a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp index f760b2714e36fe..8cc17487d0bf64 100644 --- a/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/placeholder/app2/zap-generated/IMClusterCommandHandler.cpp @@ -393,15 +393,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); diff --git a/zzz_generated/placeholder/app2/zap-generated/access.h b/zzz_generated/placeholder/app2/zap-generated/access.h index 59a4a55c31155a..6c3a4036a133cb 100644 --- a/zzz_generated/placeholder/app2/zap-generated/access.h +++ b/zzz_generated/placeholder/app2/zap-generated/access.h @@ -209,7 +209,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -244,7 +243,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -279,7 +277,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index a0745ad332f7d2..a27a5144c5c2cd 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -787,13 +787,9 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=76) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=79)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=81) */ \ + /* AcceptedCommandList (index=78) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -801,14 +797,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=88)*/ \ + /* GeneratedCommandList (index=85)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=93) */ \ + /* AcceptedCommandList (index=90) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -817,7 +813,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=101)*/ \ + /* GeneratedCommandList (index=98)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -826,13 +822,13 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=108) */ \ + /* AcceptedCommandList (index=105) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=112) */ \ + /* AcceptedCommandList (index=109) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -843,7 +839,7 @@ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Color Control (server) */\ - /* AcceptedCommandList (index=121) */ \ + /* AcceptedCommandList (index=118) */ \ 0x00000007 /* MoveToColor */, \ 0x00000008 /* MoveColor */, \ 0x00000009 /* StepColor */, \ @@ -1328,7 +1324,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 79 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -1338,8 +1334,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 88 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ @@ -1349,8 +1345,8 @@ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 93 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 101 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\ },\ { \ /* Endpoint: 1, Cluster: On/Off (client) */ \ @@ -1371,7 +1367,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 108 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 105 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1382,7 +1378,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 112 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 109 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1404,7 +1400,7 @@ .clusterSize = 15, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayColorControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 121 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 118 ) ,\ .generatedCommandList = nullptr ,\ },\ } diff --git a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp index 39501ee8827bc2..c780d5f08e1a4b 100644 --- a/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-app/zap-generated/IMClusterCommandHandler.cpp @@ -356,15 +356,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::TriggerEffect::Id: { Commands::TriggerEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); diff --git a/zzz_generated/pump-app/zap-generated/access.h b/zzz_generated/pump-app/zap-generated/access.h index d9d3086d106c71..3d45ccc23bbc34 100644 --- a/zzz_generated/pump-app/zap-generated/access.h +++ b/zzz_generated/pump-app/zap-generated/access.h @@ -189,7 +189,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -229,7 +228,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -269,7 +267,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index ad766ce1a18871..0bb60d2dea8819 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -577,14 +577,10 @@ /* Endpoint: 0, Cluster: Identify (server) */\ /* AcceptedCommandList (index=0) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=4)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=6) */ \ + /* AcceptedCommandList (index=3) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -592,14 +588,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=13)*/ \ + /* GeneratedCommandList (index=10)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=18) */ \ + /* AcceptedCommandList (index=15) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -608,7 +604,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=26)*/ \ + /* GeneratedCommandList (index=23)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -617,22 +613,22 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ - /* AcceptedCommandList (index=33) */ \ + /* AcceptedCommandList (index=30) */ \ 0x00000000 /* AnnounceOtaProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ - /* AcceptedCommandList (index=35) */ \ + /* AcceptedCommandList (index=32) */ \ 0x00000000 /* ArmFailSafe */, \ 0x00000002 /* SetRegulatoryConfig */, \ 0x00000004 /* CommissioningComplete */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=39)*/ \ + /* GeneratedCommandList (index=36)*/ \ 0x00000001 /* ArmFailSafeResponse */, \ 0x00000003 /* SetRegulatoryConfigResponse */, \ 0x00000005 /* CommissioningCompleteResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=43) */ \ + /* AcceptedCommandList (index=40) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -640,34 +636,34 @@ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=50)*/ \ + /* GeneratedCommandList (index=47)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\ - /* AcceptedCommandList (index=54) */ \ + /* AcceptedCommandList (index=51) */ \ 0x00000000 /* RetrieveLogsRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=56)*/ \ + /* GeneratedCommandList (index=53)*/ \ 0x00000001 /* RetrieveLogsResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=55) */ \ 0x00000000 /* ResetWatermarks */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\ - /* AcceptedCommandList (index=60) */ \ + /* AcceptedCommandList (index=57) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\ - /* AcceptedCommandList (index=62) */ \ + /* AcceptedCommandList (index=59) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ 0x00000002 /* RevokeCommissioning */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Operational Credentials (server) */\ - /* AcceptedCommandList (index=66) */ \ + /* AcceptedCommandList (index=63) */ \ 0x00000000 /* AttestationRequest */, \ 0x00000002 /* CertificateChainRequest */, \ 0x00000004 /* CSRRequest */, \ @@ -678,25 +674,25 @@ 0x0000000B /* AddTrustedRootCertificate */, \ 0x0000000C /* RemoveTrustedRootCertificate */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=76)*/ \ + /* GeneratedCommandList (index=73)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=81) */ \ + /* AcceptedCommandList (index=78) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=86)*/ \ + /* GeneratedCommandList (index=83)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=89) */ \ + /* AcceptedCommandList (index=86) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -705,7 +701,7 @@ 0x00000042 /* OnWithTimedOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=96) */ \ + /* AcceptedCommandList (index=93) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -733,7 +729,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 4 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 0, Cluster: Groups (server) */ \ @@ -743,8 +739,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 6 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 13 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Scenes (server) */ \ @@ -754,8 +750,8 @@ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 26 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 23 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -809,7 +805,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -853,8 +849,8 @@ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ @@ -864,8 +860,8 @@ .clusterSize = 48, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ @@ -875,8 +871,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ @@ -897,7 +893,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -908,7 +904,7 @@ .clusterSize = 247, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -919,7 +915,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 59 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -930,8 +926,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 76 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 73 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -941,8 +937,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 81 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ @@ -974,7 +970,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -985,7 +981,7 @@ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 96 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 93 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ diff --git a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp index 82dce5bce34992..1fbaac613c6dcd 100644 --- a/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/pump-controller-app/zap-generated/IMClusterCommandHandler.cpp @@ -356,15 +356,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::TriggerEffect::Id: { Commands::TriggerEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); diff --git a/zzz_generated/pump-controller-app/zap-generated/access.h b/zzz_generated/pump-controller-app/zap-generated/access.h index 558efee1b290ef..7be6ab062f370a 100644 --- a/zzz_generated/pump-controller-app/zap-generated/access.h +++ b/zzz_generated/pump-controller-app/zap-generated/access.h @@ -153,7 +153,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -189,7 +188,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -225,7 +223,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index c7a89d02239e67..cf152754a4a3d8 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -448,14 +448,10 @@ /* Endpoint: 0, Cluster: Identify (server) */\ /* AcceptedCommandList (index=0) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=4)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=6) */ \ + /* AcceptedCommandList (index=3) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -463,29 +459,29 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=13)*/ \ + /* GeneratedCommandList (index=10)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Requestor (server) */\ - /* AcceptedCommandList (index=18) */ \ + /* AcceptedCommandList (index=15) */ \ 0x00000000 /* AnnounceOtaProvider */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ - /* AcceptedCommandList (index=20) */ \ + /* AcceptedCommandList (index=17) */ \ 0x00000000 /* ArmFailSafe */, \ 0x00000002 /* SetRegulatoryConfig */, \ 0x00000004 /* CommissioningComplete */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=24)*/ \ + /* GeneratedCommandList (index=21)*/ \ 0x00000001 /* ArmFailSafeResponse */, \ 0x00000003 /* SetRegulatoryConfigResponse */, \ 0x00000005 /* CommissioningCompleteResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=28) */ \ + /* AcceptedCommandList (index=25) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -493,34 +489,34 @@ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=35)*/ \ + /* GeneratedCommandList (index=32)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\ - /* AcceptedCommandList (index=39) */ \ + /* AcceptedCommandList (index=36) */ \ 0x00000000 /* RetrieveLogsRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=41)*/ \ + /* GeneratedCommandList (index=38)*/ \ 0x00000001 /* RetrieveLogsResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\ - /* AcceptedCommandList (index=43) */ \ + /* AcceptedCommandList (index=40) */ \ 0x00000000 /* ResetWatermarks */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Thread Network Diagnostics (server) */\ - /* AcceptedCommandList (index=45) */ \ + /* AcceptedCommandList (index=42) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\ - /* AcceptedCommandList (index=47) */ \ + /* AcceptedCommandList (index=44) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ 0x00000002 /* RevokeCommissioning */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Operational Credentials (server) */\ - /* AcceptedCommandList (index=51) */ \ + /* AcceptedCommandList (index=48) */ \ 0x00000000 /* AttestationRequest */, \ 0x00000002 /* CertificateChainRequest */, \ 0x00000004 /* CSRRequest */, \ @@ -531,20 +527,20 @@ 0x0000000B /* AddTrustedRootCertificate */, \ 0x0000000C /* RemoveTrustedRootCertificate */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=61)*/ \ + /* GeneratedCommandList (index=58)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Group Key Management (server) */\ - /* AcceptedCommandList (index=66) */ \ + /* AcceptedCommandList (index=63) */ \ 0x00000000 /* KeySetWrite */, \ 0x00000001 /* KeySetRead */, \ 0x00000003 /* KeySetRemove */, \ 0x00000004 /* KeySetReadAllIndices */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=71)*/ \ + /* GeneratedCommandList (index=68)*/ \ 0x00000002 /* KeySetReadResponse */, \ 0x00000005 /* KeySetReadAllIndicesResponse */, \ chip::kInvalidCommandId /* end of list */, \ @@ -566,7 +562,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 4 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 0, Cluster: Groups (server) */ \ @@ -576,8 +572,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 6 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 13 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 10 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -631,7 +627,7 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 18 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 15 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -675,8 +671,8 @@ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 20 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 21 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ @@ -686,8 +682,8 @@ .clusterSize = 48, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 25 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ @@ -697,8 +693,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 41 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 38 ) ,\ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ @@ -719,7 +715,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -730,7 +726,7 @@ .clusterSize = 247, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 45 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 42 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -741,7 +737,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 47 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 44 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -752,8 +748,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 51 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 48 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -763,8 +759,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 66 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 71 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 68 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Fixed Label (server) */ \ diff --git a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp index 8046d4c147ff23..09257ab10bc845 100644 --- a/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/thermostat/zap-generated/IMClusterCommandHandler.cpp @@ -292,15 +292,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); diff --git a/zzz_generated/thermostat/zap-generated/access.h b/zzz_generated/thermostat/zap-generated/access.h index 5f0fc44c5755fd..0431ddfe496e8e 100644 --- a/zzz_generated/thermostat/zap-generated/access.h +++ b/zzz_generated/thermostat/zap-generated/access.h @@ -191,7 +191,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -228,7 +227,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -265,7 +263,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 361b11b7492a11..87daa98af585d8 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -587,34 +587,30 @@ /* Endpoint: 0, Cluster: Identify (server) */\ /* AcceptedCommandList (index=0) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=3)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: OTA Software Update Provider (server) */\ - /* AcceptedCommandList (index=5) */ \ + /* AcceptedCommandList (index=2) */ \ 0x00000000 /* QueryImage */, \ 0x00000002 /* ApplyUpdateRequest */, \ 0x00000004 /* NotifyUpdateApplied */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=9)*/ \ + /* GeneratedCommandList (index=6)*/ \ 0x00000001 /* QueryImageResponse */, \ 0x00000003 /* ApplyUpdateResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: General Commissioning (server) */\ - /* AcceptedCommandList (index=12) */ \ + /* AcceptedCommandList (index=9) */ \ 0x00000000 /* ArmFailSafe */, \ 0x00000002 /* SetRegulatoryConfig */, \ 0x00000004 /* CommissioningComplete */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=16)*/ \ + /* GeneratedCommandList (index=13)*/ \ 0x00000001 /* ArmFailSafeResponse */, \ 0x00000003 /* SetRegulatoryConfigResponse */, \ 0x00000005 /* CommissioningCompleteResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Network Commissioning (server) */\ - /* AcceptedCommandList (index=20) */ \ + /* AcceptedCommandList (index=17) */ \ 0x00000000 /* ScanNetworks */, \ 0x00000002 /* AddOrUpdateWiFiNetwork */, \ 0x00000003 /* AddOrUpdateThreadNetwork */, \ @@ -622,34 +618,34 @@ 0x00000006 /* ConnectNetwork */, \ 0x00000008 /* ReorderNetwork */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=27)*/ \ + /* GeneratedCommandList (index=24)*/ \ 0x00000001 /* ScanNetworksResponse */, \ 0x00000005 /* NetworkConfigResponse */, \ 0x00000007 /* ConnectNetworkResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */\ - /* AcceptedCommandList (index=31) */ \ + /* AcceptedCommandList (index=28) */ \ 0x00000000 /* RetrieveLogsRequest */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=33)*/ \ + /* GeneratedCommandList (index=30)*/ \ 0x00000001 /* RetrieveLogsResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Software Diagnostics (server) */\ - /* AcceptedCommandList (index=35) */ \ + /* AcceptedCommandList (index=32) */ \ 0x00000000 /* ResetWatermarks */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Ethernet Network Diagnostics (server) */\ - /* AcceptedCommandList (index=37) */ \ + /* AcceptedCommandList (index=34) */ \ 0x00000000 /* ResetCounts */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: AdministratorCommissioning (server) */\ - /* AcceptedCommandList (index=39) */ \ + /* AcceptedCommandList (index=36) */ \ 0x00000000 /* OpenCommissioningWindow */, \ 0x00000001 /* OpenBasicCommissioningWindow */, \ 0x00000002 /* RevokeCommissioning */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 0, Cluster: Operational Credentials (server) */\ - /* AcceptedCommandList (index=43) */ \ + /* AcceptedCommandList (index=40) */ \ 0x00000000 /* AttestationRequest */, \ 0x00000002 /* CertificateChainRequest */, \ 0x00000004 /* CSRRequest */, \ @@ -660,22 +656,18 @@ 0x0000000B /* AddTrustedRootCertificate */, \ 0x0000000C /* RemoveTrustedRootCertificate */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=53)*/ \ + /* GeneratedCommandList (index=50)*/ \ 0x00000001 /* AttestationResponse */, \ 0x00000003 /* CertificateChainResponse */, \ 0x00000005 /* CSRResponse */, \ 0x00000008 /* NOCResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Identify (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=55) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=61)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=63) */ \ + /* AcceptedCommandList (index=57) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -683,14 +675,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=70)*/ \ + /* GeneratedCommandList (index=64)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=75) */ \ + /* AcceptedCommandList (index=69) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -699,7 +691,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=83)*/ \ + /* GeneratedCommandList (index=77)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -708,14 +700,14 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Thermostat (server) */\ - /* AcceptedCommandList (index=90) */ \ + /* AcceptedCommandList (index=84) */ \ 0x00000000 /* SetpointRaiseLower */, \ 0x00000001 /* SetWeeklySchedule */, \ 0x00000002 /* GetWeeklySchedule */, \ 0x00000003 /* ClearWeeklySchedule */, \ 0x00000004 /* GetRelayStatusLog */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=96)*/ \ + /* GeneratedCommandList (index=90)*/ \ 0x00000000 /* GetWeeklyScheduleResponse */, \ 0x00000001 /* GetRelayStatusLogResponse */, \ chip::kInvalidCommandId /* end of list */, \ @@ -737,7 +729,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 0 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 3 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 0, Cluster: Descriptor (server) */ \ @@ -791,8 +783,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 5 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 9 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 2 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 6 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Localization Configuration (server) */ \ @@ -835,8 +827,8 @@ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 12 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 16 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 9 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 13 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Network Commissioning (server) */ \ @@ -846,8 +838,8 @@ .clusterSize = 48, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 20 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 27 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 17 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 24 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Diagnostic Logs (server) */ \ @@ -857,8 +849,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 31 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 33 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 28 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 30 ) ,\ },\ { \ /* Endpoint: 0, Cluster: General Diagnostics (server) */ \ @@ -879,7 +871,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 35 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 32 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -912,7 +904,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 37 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 34 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -923,7 +915,7 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 39 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 36 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -934,8 +926,8 @@ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 43 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 40 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 50 ) ,\ },\ { \ /* Endpoint: 0, Cluster: Group Key Management (server) */ \ @@ -989,8 +981,8 @@ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 61 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -1000,8 +992,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 63 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ @@ -1011,8 +1003,8 @@ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 83 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Basic (server) */ \ @@ -1033,8 +1025,8 @@ .clusterSize = 34, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayThermostatServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 96 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 90 ) ,\ },\ } diff --git a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp index da463b537e2799..ea3a668b5ad6cf 100644 --- a/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/tv-casting-app/zap-generated/IMClusterCommandHandler.cpp @@ -375,15 +375,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } default: { // Unrecognized command ID, error status will apply. apCommandObj->AddStatus(aCommandPath, Protocols::InteractionModel::Status::UnsupportedCommand); diff --git a/zzz_generated/tv-casting-app/zap-generated/access.h b/zzz_generated/tv-casting-app/zap-generated/access.h index 5d5e78e9f12034..3bf555a57f971a 100644 --- a/zzz_generated/tv-casting-app/zap-generated/access.h +++ b/zzz_generated/tv-casting-app/zap-generated/access.h @@ -161,7 +161,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -196,7 +195,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ 3, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ @@ -231,7 +229,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateThreadNetwork, Privilege: administer */ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 8f184fce08244a..e56f06e8226161 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -751,13 +751,9 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=53) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ - chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=56)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=58) */ \ + /* AcceptedCommandList (index=55) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -765,14 +761,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=65)*/ \ + /* GeneratedCommandList (index=62)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Scenes (server) */\ - /* AcceptedCommandList (index=70) */ \ + /* AcceptedCommandList (index=67) */ \ 0x00000000 /* AddScene */, \ 0x00000001 /* ViewScene */, \ 0x00000002 /* RemoveScene */, \ @@ -781,7 +777,7 @@ 0x00000005 /* RecallScene */, \ 0x00000006 /* GetSceneMembership */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=78)*/ \ + /* GeneratedCommandList (index=75)*/ \ 0x00000000 /* AddSceneResponse */, \ 0x00000001 /* ViewSceneResponse */, \ 0x00000002 /* RemoveSceneResponse */, \ @@ -790,13 +786,13 @@ 0x00000006 /* GetSceneMembershipResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=85) */ \ + /* AcceptedCommandList (index=82) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Level Control (server) */\ - /* AcceptedCommandList (index=89) */ \ + /* AcceptedCommandList (index=86) */ \ 0x00000000 /* MoveToLevel */, \ 0x00000001 /* Move */, \ 0x00000002 /* Step */, \ @@ -807,21 +803,21 @@ 0x00000007 /* StopWithOnOff */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Barrier Control (server) */\ - /* AcceptedCommandList (index=98) */ \ + /* AcceptedCommandList (index=95) */ \ 0x00000000 /* BarrierControlGoToPercent */, \ 0x00000001 /* BarrierControlStop */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: IAS Zone (server) */\ - /* AcceptedCommandList (index=101) */ \ + /* AcceptedCommandList (index=98) */ \ 0x00000000 /* ZoneEnrollResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Test Cluster (server) */\ - /* AcceptedCommandList (index=103) */ \ + /* AcceptedCommandList (index=100) */ \ 0x00000000 /* Test */, \ 0x00000001 /* TestNotHandled */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: On/Off (server) */\ - /* AcceptedCommandList (index=106) */ \ + /* AcceptedCommandList (index=103) */ \ 0x00000000 /* Off */, \ 0x00000001 /* On */, \ 0x00000002 /* Toggle */, \ @@ -1075,7 +1071,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 53 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 56 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -1085,8 +1081,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 65 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 55 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 62 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (server) */ \ @@ -1096,8 +1092,8 @@ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayScenesServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 70 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 78 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 75 ) ,\ },\ { \ /* Endpoint: 1, Cluster: On/Off (client) */ \ @@ -1118,7 +1114,7 @@ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 85 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 82 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1140,7 +1136,7 @@ .clusterSize = 27, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayLevelControlServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 86 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1217,7 +1213,7 @@ .clusterSize = 11, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 95 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1228,7 +1224,7 @@ .clusterSize = 20, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(MESSAGE_SENT_FUNCTION), \ .functions = chipFuncArrayIasZoneServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 101 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 98 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1360,7 +1356,7 @@ .clusterSize = 1068, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ .functions = NULL, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 100 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1371,7 +1367,7 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayOnOffServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 106 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 103 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ diff --git a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp index 713653ffc1858b..984b84b6f4d1ff 100644 --- a/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp +++ b/zzz_generated/window-app/zap-generated/IMClusterCommandHandler.cpp @@ -319,15 +319,6 @@ void DispatchServerCommand(CommandHandler * apCommandObj, const ConcreteCommandP } break; } - case Commands::IdentifyQuery::Id: { - Commands::IdentifyQuery::DecodableType commandData; - TLVError = DataModel::Decode(aDataTlv, commandData); - if (TLVError == CHIP_NO_ERROR) - { - wasHandled = emberAfIdentifyClusterIdentifyQueryCallback(apCommandObj, aCommandPath, commandData); - } - break; - } case Commands::TriggerEffect::Id: { Commands::TriggerEffect::DecodableType commandData; TLVError = DataModel::Decode(aDataTlv, commandData); diff --git a/zzz_generated/window-app/zap-generated/access.h b/zzz_generated/window-app/zap-generated/access.h index 7acdd2a764f453..c7b995602bfef6 100644 --- a/zzz_generated/window-app/zap-generated/access.h +++ b/zzz_generated/window-app/zap-generated/access.h @@ -159,7 +159,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 4, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 3, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 3, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 3, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 49, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 49, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -195,7 +194,6 @@ 4, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ 5, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ 0, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - 1, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ 64, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ 0, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ 2, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ @@ -231,7 +229,6 @@ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: RemoveAllGroups, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Groups, Command: AddGroupIfIdentifying, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: Identify, Privilege: manage */ \ - kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: IdentifyQuery, Privilege: manage */ \ kMatterAccessPrivilegeManage, /* Cluster: Identify, Command: TriggerEffect, Privilege: manage */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: ScanNetworks, Privilege: administer */ \ kMatterAccessPrivilegeAdminister, /* Cluster: Network Commissioning, Command: AddOrUpdateWiFiNetwork, Privilege: administer */ \ diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index d618469061bcb1..a0b476e051bc00 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -665,14 +665,10 @@ /* Endpoint: 1, Cluster: Identify (server) */\ /* AcceptedCommandList (index=54) */ \ 0x00000000 /* Identify */, \ - 0x00000001 /* IdentifyQuery */, \ 0x00000040 /* TriggerEffect */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=58)*/ \ - 0x00000000 /* IdentifyQueryResponse */, \ - chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=60) */ \ + /* AcceptedCommandList (index=57) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -680,14 +676,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=67)*/ \ + /* GeneratedCommandList (index=64)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 1, Cluster: Window Covering (server) */\ - /* AcceptedCommandList (index=72) */ \ + /* AcceptedCommandList (index=69) */ \ 0x00000000 /* UpOrOpen */, \ 0x00000001 /* DownOrClose */, \ 0x00000002 /* StopMotion */, \ @@ -697,7 +693,7 @@ 0x00000008 /* GoToTiltPercentage */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Groups (server) */\ - /* AcceptedCommandList (index=80) */ \ + /* AcceptedCommandList (index=77) */ \ 0x00000000 /* AddGroup */, \ 0x00000001 /* ViewGroup */, \ 0x00000002 /* GetGroupMembership */, \ @@ -705,14 +701,14 @@ 0x00000004 /* RemoveAllGroups */, \ 0x00000005 /* AddGroupIfIdentifying */, \ chip::kInvalidCommandId /* end of list */, \ - /* GeneratedCommandList (index=87)*/ \ + /* GeneratedCommandList (index=84)*/ \ 0x00000000 /* AddGroupResponse */, \ 0x00000001 /* ViewGroupResponse */, \ 0x00000002 /* GetGroupMembershipResponse */, \ 0x00000003 /* RemoveGroupResponse */, \ chip::kInvalidCommandId /* end of list */, \ /* Endpoint: 2, Cluster: Window Covering (server) */\ - /* AcceptedCommandList (index=92) */ \ + /* AcceptedCommandList (index=89) */ \ 0x00000000 /* UpOrOpen */, \ 0x00000001 /* DownOrClose */, \ 0x00000002 /* StopMotion */, \ @@ -970,7 +966,7 @@ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayIdentifyServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 54 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 58 ) ,\ + .generatedCommandList = nullptr ,\ },\ { \ /* Endpoint: 1, Cluster: Groups (server) */ \ @@ -980,8 +976,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 60 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 67 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 57 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 64 ) ,\ },\ { \ /* Endpoint: 1, Cluster: Scenes (client) */ \ @@ -1013,7 +1009,7 @@ .clusterSize = 35, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayWindowCoveringServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 72 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 69 ) ,\ .generatedCommandList = nullptr ,\ },\ { \ @@ -1024,8 +1020,8 @@ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ .functions = chipFuncArrayGroupsServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 80 ) ,\ - .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 87 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 77 ) ,\ + .generatedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 84 ) ,\ },\ { \ /* Endpoint: 2, Cluster: Scenes (client) */ \ @@ -1057,7 +1053,7 @@ .clusterSize = 35, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayWindowCoveringServer, \ - .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 92 ) ,\ + .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 89 ) ,\ .generatedCommandList = nullptr ,\ },\ }