From 8cf5c7bacf69815d0a92d8c4921477ee3e70f32d Mon Sep 17 00:00:00 2001 From: Mark Trayer Date: Tue, 22 Oct 2024 14:33:39 -0500 Subject: [PATCH 01/23] Initial push of camera user settings cluster --- .github/workflows/tests.yaml | 1 + scripts/rules.matterlint | 1 + ...settings-user-level-management-cluster.xml | 87 +++++++++++++++++++ .../zcl/zcl-with-test-extensions.json | 1 + src/app/zap-templates/zcl/zcl.json | 1 + src/app/zap_cluster_list.json | 1 + 6 files changed, 92 insertions(+) create mode 100644 src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 63957b64d8f00d..732d09d16fe85c 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -111,6 +111,7 @@ jobs: src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml \ + src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/chip-ota.xml \ src/app/zap-templates/zcl/data-model/chip/chip-types.xml \ diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint index 4f61d26be73b5e..4be932fffa2ccd 100644 --- a/scripts/rules.matterlint +++ b/scripts/rules.matterlint @@ -14,6 +14,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/binding-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/boolean-state-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/actions-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/bridged-device-basic-information.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/camera-av-stream-management-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/channel-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/chime-cluster.xml"; diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml new file mode 100644 index 00000000000000..3556cb650d4d01 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + Camera AV Settings User Level Management + 0x0552 + CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER + This cluster provides an interface into controls associated with the operation of a device that provides pan, tilt, and zoom functions, either mechanically, or against a digital image. + true + + + + + + + + + true + + Mptz + MaxPresets + PresetMptzTable + MptzRelativeMove + DptzRelativeMove + + This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. + + + + + + This command SHALL move the device by the values for pan, tilt, and zoom relative to the currently defined position. + + + + + + + This command SHALL set the next available index in the PresetMptzTable to the current, known, values of pan, tilt, and zoom on the camera. + + + + This command SHALL set the viewport in the digital PTZ for a specific Video Stream. + + + + + + This command SHALL change the viewports location by the amount specified in a relative fashion. + + + + + + + + diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 3ad401afb3e47a..27bc350e111105 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -27,6 +27,7 @@ "boolean-state-configuration-cluster.xml", "actions-cluster.xml", "bridged-device-basic-information.xml", + "camera-av-settings-user-level-management-cluster.xml", "camera-av-stream-management-cluster.xml", "chime-cluster.xml", "chip-ota.xml", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index c291fc651f6aa0..9492ce238271bd 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -22,6 +22,7 @@ "boolean-state-configuration-cluster.xml", "actions-cluster.xml", "bridged-device-basic-information.xml", + "camera-av-settings-user-level-management-cluster.xml", "camera-av-stream-management-cluster.xml", "chime-cluster.xml", "chip-ota.xml", diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index e38e8809616f45..311415956e9664 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -163,6 +163,7 @@ "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [ "bridged-device-basic-information-server" ], + "CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER": [], "CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [], "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" From b4d54b1a6fd40d2f21c76004a4d6aa5a00af0894 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Tue, 19 Nov 2024 15:22:48 -0600 Subject: [PATCH 02/23] Initial commit for AV User Settings cluster .xml and zap regen --- docs/zap_clusters.md | 1 + ...settings-user-level-management-cluster.xml | 96 +- .../zcl/zcl-with-test-extensions.json | 126 +- src/app/zap-templates/zcl/zcl.json | 132 +- src/app/zap_cluster_list.json | 339 +++- .../data_model/controller-clusters.matter | 100 + .../chip/devicecontroller/ChipClusters.java | 624 ++++++ .../chip/devicecontroller/ChipStructs.java | 243 +++ .../devicecontroller/ClusterIDMapping.java | 238 +++ .../devicecontroller/ClusterInfoMapping.java | 318 +++ .../devicecontroller/ClusterReadMapping.java | 159 ++ .../devicecontroller/ClusterWriteMapping.java | 2 + .../chip/devicecontroller/cluster/files.gni | 3 + ...rLevelManagementClusterMPTZPresetStruct.kt | 71 + ...ngsUserLevelManagementClusterMPTZStruct.kt | 92 + ...serLevelManagementClusterViewportStruct.kt | 72 + ...eraAvSettingsUserLevelManagementCluster.kt | 1725 ++++++++++++++++ .../java/matter/controller/cluster/files.gni | 4 + ...rLevelManagementClusterMPTZPresetStruct.kt | 71 + ...ngsUserLevelManagementClusterMPTZStruct.kt | 92 + ...serLevelManagementClusterViewportStruct.kt | 72 + .../CHIPAttributeTLVValueDecoder.cpp | 462 +++++ .../CHIPEventTLVValueDecoder.cpp | 10 + .../python/chip/clusters/CHIPClusters.py | 152 ++ .../python/chip/clusters/Objects.py | 453 +++++ .../MTRAttributeSpecifiedCheck.mm | 54 + .../MTRAttributeTLVValueDecoder.mm | 182 ++ .../CHIP/zap-generated/MTRBaseClusters.h | 164 ++ .../CHIP/zap-generated/MTRBaseClusters.mm | 685 +++++++ .../CHIP/zap-generated/MTRClusterConstants.h | 26 + .../CHIP/zap-generated/MTRClusterNames.mm | 128 ++ .../CHIP/zap-generated/MTRClusters.h | 64 + .../CHIP/zap-generated/MTRClusters.mm | 271 +++ .../zap-generated/MTRCommandPayloadsObjc.h | 228 +++ .../zap-generated/MTRCommandPayloadsObjc.mm | 640 ++++++ .../MTRCommandPayloads_Internal.h | 42 + .../zap-generated/MTRCommandTimedCheck.mm | 12 + .../zap-generated/MTREventTLVValueDecoder.mm | 15 + .../CHIP/zap-generated/MTRStructsObjc.h | 22 + .../CHIP/zap-generated/MTRStructsObjc.mm | 102 + .../zap-generated/attributes/Accessors.cpp | 390 ++++ .../zap-generated/attributes/Accessors.h | 54 + .../app-common/zap-generated/callback.h | 86 + .../app-common/zap-generated/cluster-enums.h | 13 + .../zap-generated/cluster-objects.cpp | 431 ++++ .../zap-generated/cluster-objects.h | 519 +++++ .../app-common/zap-generated/ids/Attributes.h | 62 + .../app-common/zap-generated/ids/Clusters.h | 3 + .../app-common/zap-generated/ids/Commands.h | 34 + .../zap-generated/cluster/Commands.h | 414 ++++ .../cluster/ComplexArgumentParser.cpp | 81 + .../cluster/ComplexArgumentParser.h | 12 + .../cluster/logging/DataModelLogger.cpp | 147 ++ .../cluster/logging/DataModelLogger.h | 8 + .../cluster/logging/EntryToText.cpp | 58 + .../zap-generated/cluster/Commands.h | 1791 +++++++++++++++++ 56 files changed, 12232 insertions(+), 163 deletions(-) create mode 100644 src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt create mode 100644 src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt create mode 100644 src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt create mode 100644 src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt create mode 100644 src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt create mode 100644 src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt create mode 100644 src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt diff --git a/docs/zap_clusters.md b/docs/zap_clusters.md index b37e8b2b8b7781..a805a9436c29dd 100644 --- a/docs/zap_clusters.md +++ b/docs/zap_clusters.md @@ -131,6 +131,7 @@ Generally regenerate using one of: | 1296 | 0x510 | ContentAppObserver | | 1360 | 0x550 | ZoneManagement | | 1361 | 0x551 | CameraAvStreamManagement | +| 1362 | 0x552 | CameraAvSettingsUserLevelManagement | | 1363 | 0x553 | WebRTCTransportProvider | | 1364 | 0x554 | WebRTCTransportRequestor | | 1366 | 0x556 | Chime | diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index 3556cb650d4d01..7cce725bc79ccb 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -18,69 +18,107 @@ limitations under the License. XML generated by Alchemy; DO NOT EDIT. Source: src/app_clusters/CameraAVSettingsUserLevelManagement.adoc Parameters: in-progress -Git: 0.7-fall2024-ncr-1155-g78ec59e8a-dirty +Git: 1.4-267-gc3d95b5c9 --> - + + + + + + + + - - - + + + - + Cameras Camera AV Settings User Level Management 0x0552 CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER This cluster provides an interface into controls associated with the operation of a device that provides pan, tilt, and zoom functions, either mechanically, or against a digital image. true - + + + + + + + - + + + + + + + + + + true - Mptz - MaxPresets - PresetMptzTable - MptzRelativeMove - DptzRelativeMove - + MptzPosition + MaxPresets + MptzPresets + DptzRelativeMove + ZoomMax + TiltMin + TiltMax + PanMin + PanMax + This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. - - + + + - This command SHALL move the device by the values for pan, tilt, and zoom relative to the currently defined position. - - - + This command SHALL move the device by the delta values relative to the currently defined position. + + + + + + + This command SHALL move the camera to the positions specified by the Preset passed. + + + + + This command allows creating a new preset or updating the values of an existing one. + + - - This command SHALL set the next available index in the PresetMptzTable to the current, known, values of pan, tilt, and zoom on the camera. + + This command SHALL remove a preset entry from the PresetMptzTable. + - - This command SHALL set the viewport in the digital PTZ for a specific Video Stream. + + This command allows for setting the digital viewport for a specific Video Stream. - + This command SHALL change the viewports location by the amount specified in a relative fashion. - - - + + + diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 27bc350e111105..08a0c10cb77835 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -148,9 +148,15 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": ["Always", "Conditional", "Never"] + "defaultResponsePolicy": [ + "Always", + "Conditional", + "Never" + ] }, - "bool": ["commandDiscovery"] + "bool": [ + "commandDiscovery" + ] }, "defaults": { "text": { @@ -196,8 +202,13 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": ["ProductAppearance"], - "Descriptor": ["ClusterRevision", "FeatureMap"], + "Bridged Device Basic Information": [ + "ProductAppearance" + ], + "Descriptor": [ + "ClusterRevision", + "FeatureMap" + ], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -249,7 +260,11 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Energy EVSE Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -293,7 +308,11 @@ "ICDCounter", "ClientsSupportedPerFabric" ], - "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"], + "Occupancy Sensing": [ + "HoldTimeLimits", + "HoldTime", + "FeatureMap" + ], "Operational Credentials": [ "SupportedFabrics", "CommissionedFabrics", @@ -400,14 +419,21 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": ["Lineup", "CurrentChannel"], + "Channel": [ + "Lineup", + "CurrentChannel" + ], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": ["CurrentApp"], - "Application Basic": ["Application"], + "Application Launcher": [ + "CurrentApp" + ], + "Application Basic": [ + "Application" + ], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -419,9 +445,19 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": ["SupportedTemperatureLevels"], - "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Temperature Control": [ + "SupportedTemperatureLevels" + ], + "Dishwasher Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Microwave Oven Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -434,14 +470,26 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Laundry Washer Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Clean Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "RVC Run Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Operational State": [ "OperationalState", "OperationalError", @@ -618,7 +666,10 @@ "LevelValue", "FeatureMap" ], - "Air Quality": ["AirQuality", "FeatureMap"], + "Air Quality": [ + "AirQuality", + "FeatureMap" + ], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -650,9 +701,15 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": ["FeatureMap"], - "Valve Configuration and Control": ["RemainingDuration"], - "Boolean State Configuration": ["CurrentSensitivityLevel"], + "Power Topology": [ + "FeatureMap" + ], + "Valve Configuration and Control": [ + "RemainingDuration" + ], + "Boolean State Configuration": [ + "CurrentSensitivityLevel" + ], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -663,14 +720,25 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], + "Water Heater Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Wi-Fi Network Management": [ + "SSID", + "PassphraseSurrogate" + ], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], + "Service Area": [ + "CurrentArea", + "EstimatedEndTime", + "FeatureMap" + ], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -678,11 +746,21 @@ "SpeakerCapabilities", "CurrentSnapshotConfig", "Viewport" + ], + "Camera AV Settings User Level Management": [ + "MptzPosition" ] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], + "ZCLDataTypes": [ + "ARRAY", + "BITMAP", + "ENUM", + "NUMBER", + "STRING", + "STRUCT" + ], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, @@ -692,4 +770,4 @@ "uiOptions": { "showProfileId": false } -} +} \ No newline at end of file diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 9492ce238271bd..e9eca030511fde 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -3,7 +3,11 @@ "category": "matter", "version": 1, "requiredFeatureLevel": 102, - "xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"], + "xmlRoot": [ + ".", + "./data-model/chip/", + "./data-model/silabs/" + ], "_comment": "Ensure access-control-definitions.xml is first in xmlFile array", "xmlFile": [ "access-control-definitions.xml", @@ -142,9 +146,15 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": ["Always", "Conditional", "Never"] + "defaultResponsePolicy": [ + "Always", + "Conditional", + "Never" + ] }, - "bool": ["commandDiscovery"] + "bool": [ + "commandDiscovery" + ] }, "defaults": { "text": { @@ -190,8 +200,13 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": ["ProductAppearance"], - "Descriptor": ["ClusterRevision", "FeatureMap"], + "Bridged Device Basic Information": [ + "ProductAppearance" + ], + "Descriptor": [ + "ClusterRevision", + "FeatureMap" + ], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -243,7 +258,11 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Energy EVSE Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -287,7 +306,11 @@ "ICDCounter", "ClientsSupportedPerFabric" ], - "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"], + "Occupancy Sensing": [ + "HoldTimeLimits", + "HoldTime", + "FeatureMap" + ], "Operational Credentials": [ "SupportedFabrics", "CommissionedFabrics", @@ -394,14 +417,21 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": ["Lineup", "CurrentChannel"], + "Channel": [ + "Lineup", + "CurrentChannel" + ], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": ["CurrentApp"], - "Application Basic": ["Application"], + "Application Launcher": [ + "CurrentApp" + ], + "Application Basic": [ + "Application" + ], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -413,9 +443,19 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": ["SupportedTemperatureLevels"], - "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Temperature Control": [ + "SupportedTemperatureLevels" + ], + "Dishwasher Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Microwave Oven Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -428,14 +468,26 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Laundry Washer Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Clean Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "RVC Run Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Operational State": [ "OperationalState", "OperationalError", @@ -612,7 +664,10 @@ "LevelValue", "FeatureMap" ], - "Air Quality": ["AirQuality", "FeatureMap"], + "Air Quality": [ + "AirQuality", + "FeatureMap" + ], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -644,9 +699,15 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": ["FeatureMap"], - "Valve Configuration and Control": ["RemainingDuration"], - "Boolean State Configuration": ["CurrentSensitivityLevel"], + "Power Topology": [ + "FeatureMap" + ], + "Valve Configuration and Control": [ + "RemainingDuration" + ], + "Boolean State Configuration": [ + "CurrentSensitivityLevel" + ], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -657,14 +718,25 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], + "Water Heater Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Wi-Fi Network Management": [ + "SSID", + "PassphraseSurrogate" + ], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], + "Service Area": [ + "CurrentArea", + "EstimatedEndTime", + "FeatureMap" + ], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -672,11 +744,21 @@ "SpeakerCapabilities", "CurrentSnapshotConfig", "Viewport" + ], + "Camera AV Settings User Level Management": [ + "MptzPosition" ] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], + "ZCLDataTypes": [ + "ARRAY", + "BITMAP", + "ENUM", + "NUMBER", + "STRING", + "STRUCT" + ], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, @@ -686,4 +768,4 @@ "uiOptions": { "showProfileId": false } -} +} \ No newline at end of file diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index 311415956e9664..55d6b0a8b300cc 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -16,6 +16,7 @@ "BOOLEAN_STATE_CLUSTER": [], "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [], "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [], + "CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER": [], "CAMERA_AV_STREAM_MANAGEMENT_CLUSTER": [], "CARBON_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [], "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [], @@ -112,7 +113,9 @@ "TARGET_NAVIGATOR_CLUSTER": [], "TEMPERATURE_CONTROL_CLUSTER": [], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": ["thermostat-client"], + "THERMOSTAT_CLUSTER": [ + "thermostat-client" + ], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [], "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [], "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [], @@ -139,8 +142,12 @@ "ZONE_MANAGEMENT_CLUSTER": [] }, "ServerDirectories": { - "ACCESS_CONTROL_CLUSTER": ["access-control-server"], - "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"], + "ACCESS_CONTROL_CLUSTER": [ + "access-control-server" + ], + "ACCOUNT_LOGIN_CLUSTER": [ + "account-login-server" + ], "ACTIONS_CLUSTER": [], "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [ "resource-monitoring-server" @@ -148,14 +155,26 @@ "ADMINISTRATOR_COMMISSIONING_CLUSTER": [ "administrator-commissioning-server" ], - "AIR_QUALITY_CLUSTER": ["air-quality-server"], + "AIR_QUALITY_CLUSTER": [ + "air-quality-server" + ], "ALARM_CLUSTER": [], - "APPLICATION_BASIC_CLUSTER": ["application-basic-server"], - "APPLICATION_LAUNCHER_CLUSTER": ["application-launcher-server"], - "AUDIO_OUTPUT_CLUSTER": ["audio-output-server"], + "APPLICATION_BASIC_CLUSTER": [ + "application-basic-server" + ], + "APPLICATION_LAUNCHER_CLUSTER": [ + "application-launcher-server" + ], + "AUDIO_OUTPUT_CLUSTER": [ + "audio-output-server" + ], "BALLAST_CONFIGURATION_CLUSTER": [], - "BASIC_INFORMATION_CLUSTER": ["basic-information"], - "BINDING_CLUSTER": ["bindings"], + "BASIC_INFORMATION_CLUSTER": [ + "basic-information" + ], + "BINDING_CLUSTER": [ + "bindings" + ], "BOOLEAN_STATE_CLUSTER": [], "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [ "boolean-state-configuration-server" @@ -171,79 +190,177 @@ "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "CHANNEL_CLUSTER": ["channel-server"], + "CHANNEL_CLUSTER": [ + "channel-server" + ], "CHIME_CLUSTER": [], - "COLOR_CONTROL_CLUSTER": ["color-control-server"], - "COMMISSIONER_CONTROL_CLUSTER": ["commissioner-control-server"], + "COLOR_CONTROL_CLUSTER": [ + "color-control-server" + ], + "COMMISSIONER_CONTROL_CLUSTER": [ + "commissioner-control-server" + ], "COMMISSIONING_CLUSTER": [], - "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"], - "CONTENT_CONTROL_CLUSTER": ["content-control-server"], - "CONTENT_APP_OBSERVER_CLUSTER": ["content-app-observer"], - "DESCRIPTOR_CLUSTER": ["descriptor"], - "DEVICE_ENERGY_MANAGEMENT_CLUSTER": ["device-energy-management-server"], - "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": ["mode-base-server"], + "CONTENT_LAUNCHER_CLUSTER": [ + "content-launch-server" + ], + "CONTENT_CONTROL_CLUSTER": [ + "content-control-server" + ], + "CONTENT_APP_OBSERVER_CLUSTER": [ + "content-app-observer" + ], + "DESCRIPTOR_CLUSTER": [ + "descriptor" + ], + "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [ + "device-energy-management-server" + ], + "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [ + "mode-base-server" + ], "DEVICE_TEMP_CLUSTER": [], - "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"], - "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"], - "DISHWASHER_MODE_CLUSTER": ["mode-base-server"], - "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"], - "DOOR_LOCK_CLUSTER": ["door-lock-server"], - "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"], + "DIAGNOSTIC_LOGS_CLUSTER": [ + "diagnostic-logs-server" + ], + "DISHWASHER_ALARM_CLUSTER": [ + "dishwasher-alarm-server" + ], + "DISHWASHER_MODE_CLUSTER": [ + "mode-base-server" + ], + "MICROWAVE_OVEN_MODE_CLUSTER": [ + "mode-base-server" + ], + "DOOR_LOCK_CLUSTER": [ + "door-lock-server" + ], + "ECOSYSTEM_INFORMATION_CLUSTER": [ + "ecosystem-information-server" + ], "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [ "electrical-energy-measurement-server" ], "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [ "electrical-power-measurement-server" ], - "ENERGY_EVSE_CLUSTER": ["energy-evse-server"], - "ENERGY_EVSE_MODE_CLUSTER": ["mode-base-server"], + "ENERGY_EVSE_CLUSTER": [ + "energy-evse-server" + ], + "ENERGY_EVSE_MODE_CLUSTER": [ + "mode-base-server" + ], "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [ "ethernet-network-diagnostics-server" ], - "ENERGY_PREFERENCE_CLUSTER": ["energy-preference-server"], - "FAN_CONTROL_CLUSTER": ["fan-control-server"], - "FAULT_INJECTION_CLUSTER": ["fault-injection-server"], - "FIXED_LABEL_CLUSTER": ["fixed-label-server"], + "ENERGY_PREFERENCE_CLUSTER": [ + "energy-preference-server" + ], + "FAN_CONTROL_CLUSTER": [ + "fan-control-server" + ], + "FAULT_INJECTION_CLUSTER": [ + "fault-injection-server" + ], + "FIXED_LABEL_CLUSTER": [ + "fixed-label-server" + ], "FLOW_MEASUREMENT_CLUSTER": [], "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"], - "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"], - "GROUPS_CLUSTER": ["groups-server"], - "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"], - "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"], - "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"], - "IDENTIFY_CLUSTER": ["identify-server"], + "GENERAL_COMMISSIONING_CLUSTER": [ + "general-commissioning-server" + ], + "GENERAL_DIAGNOSTICS_CLUSTER": [ + "general-diagnostics-server" + ], + "GROUPS_CLUSTER": [ + "groups-server" + ], + "HEPA_FILTER_MONITORING_CLUSTER": [ + "resource-monitoring-server" + ], + "GROUP_KEY_MANAGEMENT_CLUSTER": [ + "group-key-mgmt-server" + ], + "ICD_MANAGEMENT_CLUSTER": [ + "icd-management-server" + ], + "IDENTIFY_CLUSTER": [ + "identify-server" + ], "ILLUMINANCE_MEASUREMENT_CLUSTER": [], - "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"], - "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-base-server"], - "LEVEL_CONTROL_CLUSTER": ["level-control"], + "KEYPAD_INPUT_CLUSTER": [ + "keypad-input-server" + ], + "LAUNDRY_WASHER_MODE_CLUSTER": [ + "mode-base-server" + ], + "LEVEL_CONTROL_CLUSTER": [ + "level-control" + ], "LOCALIZATION_CONFIGURATION_CLUSTER": [ "localization-configuration-server" ], - "LOW_POWER_CLUSTER": ["low-power-server"], - "MEDIA_INPUT_CLUSTER": ["media-input-server"], - "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"], - "MICROWAVE_OVEN_CONTROL_CLUSTER": ["microwave-oven-control-server"], - "MESSAGES_CLUSTER": ["messages-server"], - "MODE_SELECT_CLUSTER": ["mode-select-server"], - "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"], + "LOW_POWER_CLUSTER": [ + "low-power-server" + ], + "MEDIA_INPUT_CLUSTER": [ + "media-input-server" + ], + "MEDIA_PLAYBACK_CLUSTER": [ + "media-playback-server" + ], + "MICROWAVE_OVEN_CONTROL_CLUSTER": [ + "microwave-oven-control-server" + ], + "MESSAGES_CLUSTER": [ + "messages-server" + ], + "MODE_SELECT_CLUSTER": [ + "mode-select-server" + ], + "NETWORK_COMMISSIONING_CLUSTER": [ + "network-commissioning" + ], "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "SAMPLE_MEI_CLUSTER": ["sample-mei-server"], - "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"], - "ON_OFF_CLUSTER": ["on-off-server"], - "POWER_TOPOLOGY_CLUSTER": ["power-topology-server"], - "OPERATIONAL_CREDENTIALS_CLUSTER": ["operational-credentials-server"], - "OPERATIONAL_STATE_CLUSTER": ["operational-state-server"], - "OPERATIONAL_STATE_OVEN_CLUSTER": ["operational-state-server"], - "OPERATIONAL_STATE_RVC_CLUSTER": ["operational-state-server"], + "SAMPLE_MEI_CLUSTER": [ + "sample-mei-server" + ], + "OCCUPANCY_SENSING_CLUSTER": [ + "occupancy-sensor-server" + ], + "ON_OFF_CLUSTER": [ + "on-off-server" + ], + "POWER_TOPOLOGY_CLUSTER": [ + "power-topology-server" + ], + "OPERATIONAL_CREDENTIALS_CLUSTER": [ + "operational-credentials-server" + ], + "OPERATIONAL_STATE_CLUSTER": [ + "operational-state-server" + ], + "OPERATIONAL_STATE_OVEN_CLUSTER": [ + "operational-state-server" + ], + "OPERATIONAL_STATE_RVC_CLUSTER": [ + "operational-state-server" + ], "OTA_BOOTLOAD_CLUSTER": [], - "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"], - "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"], - "OVEN_MODE_CLUSTER": ["mode-base-server"], + "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [ + "ota-provider" + ], + "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [ + "ota-requestor" + ], + "OVEN_MODE_CLUSTER": [ + "mode-base-server" + ], "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], @@ -259,7 +376,9 @@ "POLL_CONTROL_CLUSTER": [], "POWER_CONFIG_CLUSTER": [], "POWER_PROFILE_CLUSTER": [], - "POWER_SOURCE_CLUSTER": ["power-source-server"], + "POWER_SOURCE_CLUSTER": [ + "power-source-server" + ], "POWER_SOURCE_CONFIGURATION_CLUSTER": [ "power-source-configuration-server" ], @@ -274,22 +393,44 @@ "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"], + "REFRIGERATOR_ALARM_CLUSTER": [ + "refrigerator-alarm-server" + ], "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [ "mode-base-server" ], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_MODE_CLUSTER": ["mode-base-server"], - "RVC_RUN_MODE_CLUSTER": ["mode-base-server"], - "SCENES_CLUSTER": ["scenes-server"], - "SERVICE_AREA_CLUSTER": ["service-area-server"], - "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"], - "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"], - "SWITCH_CLUSTER": ["switch-server"], - "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"], - "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"], + "RVC_CLEAN_MODE_CLUSTER": [ + "mode-base-server" + ], + "RVC_RUN_MODE_CLUSTER": [ + "mode-base-server" + ], + "SCENES_CLUSTER": [ + "scenes-server" + ], + "SERVICE_AREA_CLUSTER": [ + "service-area-server" + ], + "SMOKE_CO_ALARM_CLUSTER": [ + "smoke-co-alarm-server" + ], + "SOFTWARE_DIAGNOSTICS_CLUSTER": [ + "software-diagnostics-server" + ], + "SWITCH_CLUSTER": [ + "switch-server" + ], + "TARGET_NAVIGATOR_CLUSTER": [ + "target-navigator-server" + ], + "TEMPERATURE_CONTROL_CLUSTER": [ + "temperature-control-server" + ], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": ["thermostat-server"], + "THERMOSTAT_CLUSTER": [ + "thermostat-server" + ], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [ "thermostat-user-interface-configuration-server" ], @@ -299,30 +440,58 @@ "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [ "thread-network-diagnostics-server" ], - "THREAD_NETWORK_DIRECTORY_CLUSTER": ["thread-network-directory-server"], + "THREAD_NETWORK_DIRECTORY_CLUSTER": [ + "thread-network-directory-server" + ], "TIME_CLUSTER": [], - "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"], - "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"], - "TIMER_CLUSTER": ["timer-server"], + "TIME_FORMAT_LOCALIZATION_CLUSTER": [ + "time-format-localization-server" + ], + "TIME_SYNCHRONIZATION_CLUSTER": [ + "time-synchronization-server" + ], + "TIMER_CLUSTER": [ + "timer-server" + ], "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], "UNIT_LOCALIZATION_CLUSTER": [], - "UNIT_TESTING_CLUSTER": ["test-cluster-server"], - "USER_LABEL_CLUSTER": ["user-label-server"], + "UNIT_TESTING_CLUSTER": [ + "test-cluster-server" + ], + "USER_LABEL_CLUSTER": [ + "user-label-server" + ], "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [ "valve-configuration-and-control-server" ], - "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"], - "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"], - "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"], + "WAKE_ON_LAN_CLUSTER": [ + "wake-on-lan-server" + ], + "LAUNDRY_WASHER_CONTROLS_CLUSTER": [ + "laundry-washer-controls-server" + ], + "LAUNDRY_DRYER_CONTROLS_CLUSTER": [ + "laundry-dryer-controls-server" + ], "WEB_RTC_PROVIDER_CLUSTER": [], "WEBRTC_REQUESTOR_CLUSTER": [], - "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"], - "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"], - "WINDOW_COVERING_CLUSTER": ["window-covering-server"], - "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"], - "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"], + "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [ + "wifi-network-diagnostics-server" + ], + "WIFI_NETWORK_MANAGEMENT_CLUSTER": [ + "wifi-network-management-server" + ], + "WINDOW_COVERING_CLUSTER": [ + "window-covering-server" + ], + "WATER_HEATER_MANAGEMENT_CLUSTER": [ + "water-heater-management-server" + ], + "WATER_HEATER_MODE_CLUSTER": [ + "mode-base-server" + ], "ZONE_MANAGEMENT_CLUSTER": [] } -} +} \ No newline at end of file diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index d663a5f018a217..5baa58a5865b12 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9866,6 +9866,106 @@ cluster CameraAvStreamManagement = 1361 { command access(invoke: manage) SetImageFlipVertical(SetImageFlipVerticalRequest): DefaultSuccess = 16; } +/** This cluster provides an interface into controls associated with the operation of a device that provides pan, tilt, and zoom functions, either mechanically, or against a digital image. */ +provisional cluster CameraAvSettingsUserLevelManagement = 1362 { + revision 1; + + bitmap Feature : bitmap32 { + kDigitalPTZ = 0x1; + kMechanicalPan = 0x2; + kMechanicalTilt = 0x4; + kMechanicalZoom = 0x8; + kMechanicalPresets = 0x10; + } + + struct MPTZStruct { + optional int16s pan = 2; + optional int16s tilt = 3; + optional int8u zoom = 4; + } + + struct MPTZPresetStruct { + int8u presetID = 0; + char_string<32> name = 1; + MPTZStruct values = 2; + } + + struct ViewportStruct { + int16u x1 = 0; + int16u y1 = 1; + int16u x2 = 2; + int16u y2 = 3; + } + + readonly attribute optional MPTZStruct mptzPosition = 0; + readonly attribute optional int8u maxPresets = 1; + readonly attribute optional MPTZPresetStruct mptzPresets[] = 2; + readonly attribute optional int16u dptzRelativeMove[] = 3; + readonly attribute optional int8u zoomMax = 4; + readonly attribute optional int16s tiltMin = 5; + readonly attribute optional int16s tiltMax = 6; + readonly attribute optional int16s panMin = 7; + readonly attribute optional int16s panMax = 8; + readonly attribute command_id generatedCommandList[] = 65528; + readonly attribute command_id acceptedCommandList[] = 65529; + readonly attribute event_id eventList[] = 65530; + readonly attribute attrib_id attributeList[] = 65531; + readonly attribute bitmap32 featureMap = 65532; + readonly attribute int16u clusterRevision = 65533; + + request struct MptzSetPositionRequest { + optional int16s pan = 0; + optional int16s tilt = 1; + optional int8u zoom = 2; + } + + request struct MptzRelativeMoveRequest { + optional int16s panDelta = 0; + optional int16s tiltDelta = 1; + optional int8s zoomDelta = 2; + } + + request struct MptzMoveToPresetRequest { + int8u presetID = 0; + } + + request struct MptzSavePresetRequest { + optional int8u presetID = 0; + char_string<32> name = 1; + } + + request struct MptzRemovePresetRequest { + int8u presetID = 0; + } + + request struct DptzSetViewportRequest { + int16u videoStreamID = 0; + ViewportStruct viewport = 1; + } + + request struct DptzRelativeMoveRequest { + int16u videoStreamID = 0; + optional int16s deltaX = 1; + optional int16s deltaY = 2; + optional int8s zoomDelta = 3; + } + + /** This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. */ + command MptzSetPosition(MptzSetPositionRequest): DefaultSuccess = 0; + /** This command SHALL move the device by the delta values relative to the currently defined position. */ + command MptzRelativeMove(MptzRelativeMoveRequest): DefaultSuccess = 1; + /** This command SHALL move the camera to the positions specified by the Preset passed. */ + command MptzMoveToPreset(MptzMoveToPresetRequest): DefaultSuccess = 2; + /** This command allows creating a new preset or updating the values of an existing one. */ + command MptzSavePreset(MptzSavePresetRequest): DefaultSuccess = 3; + /** This command SHALL remove a preset entry from the PresetMptzTable. */ + command MptzRemovePreset(MptzRemovePresetRequest): DefaultSuccess = 4; + /** This command allows for setting the digital viewport for a specific Video Stream. */ + command DptzSetViewport(DptzSetViewportRequest): DefaultSuccess = 5; + /** This command SHALL change the viewports location by the amount specified in a relative fashion. */ + command DptzRelativeMove(DptzRelativeMoveRequest): DefaultSuccess = 6; +} + /** The WebRTC transport provider cluster provides a way for stream providers (e.g. Cameras) to stream or receive their data through WebRTC. */ provisional cluster WebRTCTransportProvider = 1363 { revision 1; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index dff134bddd1a18..fa79b7f070494b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -61848,6 +61848,630 @@ public void onSuccess(byte[] tlv) { } } + public static class CameraAvSettingsUserLevelManagementCluster extends BaseChipCluster { + public static final long CLUSTER_ID = 1362L; + + private static final long MPTZ_POSITION_ATTRIBUTE_ID = 0L; + private static final long MAX_PRESETS_ATTRIBUTE_ID = 1L; + private static final long MPTZ_PRESETS_ATTRIBUTE_ID = 2L; + private static final long DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID = 3L; + private static final long ZOOM_MAX_ATTRIBUTE_ID = 4L; + private static final long TILT_MIN_ATTRIBUTE_ID = 5L; + private static final long TILT_MAX_ATTRIBUTE_ID = 6L; + private static final long PAN_MIN_ATTRIBUTE_ID = 7L; + private static final long PAN_MAX_ATTRIBUTE_ID = 8L; + private static final long GENERATED_COMMAND_LIST_ATTRIBUTE_ID = 65528L; + private static final long ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID = 65529L; + private static final long EVENT_LIST_ATTRIBUTE_ID = 65530L; + private static final long ATTRIBUTE_LIST_ATTRIBUTE_ID = 65531L; + private static final long FEATURE_MAP_ATTRIBUTE_ID = 65532L; + private static final long CLUSTER_REVISION_ATTRIBUTE_ID = 65533L; + + public CameraAvSettingsUserLevelManagementCluster(long devicePtr, int endpointId) { + super(devicePtr, endpointId, CLUSTER_ID); + } + + @Override + @Deprecated + public long initWithDevice(long devicePtr, int endpointId) { + return 0L; + } + + public void mptzSetPosition(DefaultClusterCallback callback, Optional pan, Optional tilt, Optional zoom) { + mptzSetPosition(callback, pan, tilt, zoom, 0); + } + + public void mptzSetPosition(DefaultClusterCallback callback, Optional pan, Optional tilt, Optional zoom, int timedInvokeTimeoutMs) { + final long commandId = 0L; + + ArrayList elements = new ArrayList<>(); + final long panFieldID = 0L; + BaseTLVType pantlvValue = pan.map((nonOptionalpan) -> new IntType(nonOptionalpan)).orElse(new EmptyType()); + elements.add(new StructElement(panFieldID, pantlvValue)); + + final long tiltFieldID = 1L; + BaseTLVType tilttlvValue = tilt.map((nonOptionaltilt) -> new IntType(nonOptionaltilt)).orElse(new EmptyType()); + elements.add(new StructElement(tiltFieldID, tilttlvValue)); + + final long zoomFieldID = 2L; + BaseTLVType zoomtlvValue = zoom.map((nonOptionalzoom) -> new UIntType(nonOptionalzoom)).orElse(new EmptyType()); + elements.add(new StructElement(zoomFieldID, zoomtlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public void mptzRelativeMove(DefaultClusterCallback callback, Optional panDelta, Optional tiltDelta, Optional zoomDelta) { + mptzRelativeMove(callback, panDelta, tiltDelta, zoomDelta, 0); + } + + public void mptzRelativeMove(DefaultClusterCallback callback, Optional panDelta, Optional tiltDelta, Optional zoomDelta, int timedInvokeTimeoutMs) { + final long commandId = 1L; + + ArrayList elements = new ArrayList<>(); + final long panDeltaFieldID = 0L; + BaseTLVType panDeltatlvValue = panDelta.map((nonOptionalpanDelta) -> new IntType(nonOptionalpanDelta)).orElse(new EmptyType()); + elements.add(new StructElement(panDeltaFieldID, panDeltatlvValue)); + + final long tiltDeltaFieldID = 1L; + BaseTLVType tiltDeltatlvValue = tiltDelta.map((nonOptionaltiltDelta) -> new IntType(nonOptionaltiltDelta)).orElse(new EmptyType()); + elements.add(new StructElement(tiltDeltaFieldID, tiltDeltatlvValue)); + + final long zoomDeltaFieldID = 2L; + BaseTLVType zoomDeltatlvValue = zoomDelta.map((nonOptionalzoomDelta) -> new IntType(nonOptionalzoomDelta)).orElse(new EmptyType()); + elements.add(new StructElement(zoomDeltaFieldID, zoomDeltatlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public void mptzMoveToPreset(DefaultClusterCallback callback, Integer presetID) { + mptzMoveToPreset(callback, presetID, 0); + } + + public void mptzMoveToPreset(DefaultClusterCallback callback, Integer presetID, int timedInvokeTimeoutMs) { + final long commandId = 2L; + + ArrayList elements = new ArrayList<>(); + final long presetIDFieldID = 0L; + BaseTLVType presetIDtlvValue = new UIntType(presetID); + elements.add(new StructElement(presetIDFieldID, presetIDtlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public void mptzSavePreset(DefaultClusterCallback callback, Optional presetID, String name) { + mptzSavePreset(callback, presetID, name, 0); + } + + public void mptzSavePreset(DefaultClusterCallback callback, Optional presetID, String name, int timedInvokeTimeoutMs) { + final long commandId = 3L; + + ArrayList elements = new ArrayList<>(); + final long presetIDFieldID = 0L; + BaseTLVType presetIDtlvValue = presetID.map((nonOptionalpresetID) -> new UIntType(nonOptionalpresetID)).orElse(new EmptyType()); + elements.add(new StructElement(presetIDFieldID, presetIDtlvValue)); + + final long nameFieldID = 1L; + BaseTLVType nametlvValue = new StringType(name); + elements.add(new StructElement(nameFieldID, nametlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public void mptzRemovePreset(DefaultClusterCallback callback, Integer presetID) { + mptzRemovePreset(callback, presetID, 0); + } + + public void mptzRemovePreset(DefaultClusterCallback callback, Integer presetID, int timedInvokeTimeoutMs) { + final long commandId = 4L; + + ArrayList elements = new ArrayList<>(); + final long presetIDFieldID = 0L; + BaseTLVType presetIDtlvValue = new UIntType(presetID); + elements.add(new StructElement(presetIDFieldID, presetIDtlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public void dptzSetViewport(DefaultClusterCallback callback, Integer videoStreamID, ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct viewport) { + dptzSetViewport(callback, videoStreamID, viewport, 0); + } + + public void dptzSetViewport(DefaultClusterCallback callback, Integer videoStreamID, ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct viewport, int timedInvokeTimeoutMs) { + final long commandId = 5L; + + ArrayList elements = new ArrayList<>(); + final long videoStreamIDFieldID = 0L; + BaseTLVType videoStreamIDtlvValue = new UIntType(videoStreamID); + elements.add(new StructElement(videoStreamIDFieldID, videoStreamIDtlvValue)); + + final long viewportFieldID = 1L; + BaseTLVType viewporttlvValue = viewport.encodeTlv(); + elements.add(new StructElement(viewportFieldID, viewporttlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public void dptzRelativeMove(DefaultClusterCallback callback, Integer videoStreamID, Optional deltaX, Optional deltaY, Optional zoomDelta) { + dptzRelativeMove(callback, videoStreamID, deltaX, deltaY, zoomDelta, 0); + } + + public void dptzRelativeMove(DefaultClusterCallback callback, Integer videoStreamID, Optional deltaX, Optional deltaY, Optional zoomDelta, int timedInvokeTimeoutMs) { + final long commandId = 6L; + + ArrayList elements = new ArrayList<>(); + final long videoStreamIDFieldID = 0L; + BaseTLVType videoStreamIDtlvValue = new UIntType(videoStreamID); + elements.add(new StructElement(videoStreamIDFieldID, videoStreamIDtlvValue)); + + final long deltaXFieldID = 1L; + BaseTLVType deltaXtlvValue = deltaX.map((nonOptionaldeltaX) -> new IntType(nonOptionaldeltaX)).orElse(new EmptyType()); + elements.add(new StructElement(deltaXFieldID, deltaXtlvValue)); + + final long deltaYFieldID = 2L; + BaseTLVType deltaYtlvValue = deltaY.map((nonOptionaldeltaY) -> new IntType(nonOptionaldeltaY)).orElse(new EmptyType()); + elements.add(new StructElement(deltaYFieldID, deltaYtlvValue)); + + final long zoomDeltaFieldID = 3L; + BaseTLVType zoomDeltatlvValue = zoomDelta.map((nonOptionalzoomDelta) -> new IntType(nonOptionalzoomDelta)).orElse(new EmptyType()); + elements.add(new StructElement(zoomDeltaFieldID, zoomDeltatlvValue)); + + StructType commandArgs = new StructType(elements); + invoke(new InvokeCallbackImpl(callback) { + @Override + public void onResponse(StructType invokeStructValue) { + callback.onSuccess(); + }}, commandId, commandArgs, timedInvokeTimeoutMs); + } + + public interface MptzPositionAttributeCallback extends BaseAttributeCallback { + void onSuccess(ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct value); + } + + public interface MptzPresetsAttributeCallback extends BaseAttributeCallback { + void onSuccess(List value); + } + + public interface DptzRelativeMoveAttributeCallback extends BaseAttributeCallback { + void onSuccess(List value); + } + + public interface GeneratedCommandListAttributeCallback extends BaseAttributeCallback { + void onSuccess(List value); + } + + public interface AcceptedCommandListAttributeCallback extends BaseAttributeCallback { + void onSuccess(List value); + } + + public interface EventListAttributeCallback extends BaseAttributeCallback { + void onSuccess(List value); + } + + public interface AttributeListAttributeCallback extends BaseAttributeCallback { + void onSuccess(List value); + } + + public void readMptzPositionAttribute( + MptzPositionAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_POSITION_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, MPTZ_POSITION_ATTRIBUTE_ID, true); + } + + public void subscribeMptzPositionAttribute( + MptzPositionAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_POSITION_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, MPTZ_POSITION_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readMaxPresetsAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRESETS_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, MAX_PRESETS_ATTRIBUTE_ID, true); + } + + public void subscribeMaxPresetsAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MAX_PRESETS_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, MAX_PRESETS_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readMptzPresetsAttribute( + MptzPresetsAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_PRESETS_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, MPTZ_PRESETS_ATTRIBUTE_ID, true); + } + + public void subscribeMptzPresetsAttribute( + MptzPresetsAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_PRESETS_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, MPTZ_PRESETS_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readDptzRelativeMoveAttribute( + DptzRelativeMoveAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID, true); + } + + public void subscribeDptzRelativeMoveAttribute( + DptzRelativeMoveAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readZoomMaxAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ZOOM_MAX_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, ZOOM_MAX_ATTRIBUTE_ID, true); + } + + public void subscribeZoomMaxAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ZOOM_MAX_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, ZOOM_MAX_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readTiltMinAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TILT_MIN_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, TILT_MIN_ATTRIBUTE_ID, true); + } + + public void subscribeTiltMinAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TILT_MIN_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, TILT_MIN_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readTiltMaxAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TILT_MAX_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, TILT_MAX_ATTRIBUTE_ID, true); + } + + public void subscribeTiltMaxAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, TILT_MAX_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, TILT_MAX_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readPanMinAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PAN_MIN_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, PAN_MIN_ATTRIBUTE_ID, true); + } + + public void subscribePanMinAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PAN_MIN_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, PAN_MIN_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readPanMaxAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PAN_MAX_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, PAN_MAX_ATTRIBUTE_ID, true); + } + + public void subscribePanMaxAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, PAN_MAX_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, PAN_MAX_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readGeneratedCommandListAttribute( + GeneratedCommandListAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, true); + } + + public void subscribeGeneratedCommandListAttribute( + GeneratedCommandListAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, GENERATED_COMMAND_LIST_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, GENERATED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readAcceptedCommandListAttribute( + AcceptedCommandListAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, true); + } + + public void subscribeAcceptedCommandListAttribute( + AcceptedCommandListAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, ACCEPTED_COMMAND_LIST_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readEventListAttribute( + EventListAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, EVENT_LIST_ATTRIBUTE_ID, true); + } + + public void subscribeEventListAttribute( + EventListAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, EVENT_LIST_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, EVENT_LIST_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readAttributeListAttribute( + AttributeListAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, ATTRIBUTE_LIST_ATTRIBUTE_ID, true); + } + + public void subscribeAttributeListAttribute( + AttributeListAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, ATTRIBUTE_LIST_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + List value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, ATTRIBUTE_LIST_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readFeatureMapAttribute( + LongAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, FEATURE_MAP_ATTRIBUTE_ID, true); + } + + public void subscribeFeatureMapAttribute( + LongAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, FEATURE_MAP_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Long value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, FEATURE_MAP_ATTRIBUTE_ID, minInterval, maxInterval); + } + + public void readClusterRevisionAttribute( + IntegerAttributeCallback callback) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID); + + readAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, CLUSTER_REVISION_ATTRIBUTE_ID, true); + } + + public void subscribeClusterRevisionAttribute( + IntegerAttributeCallback callback, int minInterval, int maxInterval) { + ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, CLUSTER_REVISION_ATTRIBUTE_ID); + + subscribeAttribute(new ReportCallbackImpl(callback, path) { + @Override + public void onSuccess(byte[] tlv) { + Integer value = ChipTLVValueDecoder.decodeAttributeValue(path, tlv); + callback.onSuccess(value); + } + }, CLUSTER_REVISION_ATTRIBUTE_ID, minInterval, maxInterval); + } + } + public static class WebRTCTransportProviderCluster extends BaseChipCluster { public static final long CLUSTER_ID = 1363L; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index b3fcd6df3bfde3..9d3fa99ea51fa3 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -14087,6 +14087,249 @@ public String toString() { return output.toString(); } } +public static class CameraAvSettingsUserLevelManagementClusterMPTZStruct { + public Optional pan; + public Optional tilt; + public Optional zoom; + private static final long PAN_ID = 2L; + private static final long TILT_ID = 3L; + private static final long ZOOM_ID = 4L; + + public CameraAvSettingsUserLevelManagementClusterMPTZStruct( + Optional pan, + Optional tilt, + Optional zoom + ) { + this.pan = pan; + this.tilt = tilt; + this.zoom = zoom; + } + + public StructType encodeTlv() { + ArrayList values = new ArrayList<>(); + values.add(new StructElement(PAN_ID, pan.map((nonOptionalpan) -> new IntType(nonOptionalpan)).orElse(new EmptyType()))); + values.add(new StructElement(TILT_ID, tilt.map((nonOptionaltilt) -> new IntType(nonOptionaltilt)).orElse(new EmptyType()))); + values.add(new StructElement(ZOOM_ID, zoom.map((nonOptionalzoom) -> new UIntType(nonOptionalzoom)).orElse(new EmptyType()))); + + return new StructType(values); + } + + public static CameraAvSettingsUserLevelManagementClusterMPTZStruct decodeTlv(BaseTLVType tlvValue) { + if (tlvValue == null || tlvValue.type() != TLVType.Struct) { + return null; + } + Optional pan = Optional.empty(); + Optional tilt = Optional.empty(); + Optional zoom = Optional.empty(); + for (StructElement element: ((StructType)tlvValue).value()) { + if (element.contextTagNum() == PAN_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.Int) { + IntType castingValue = element.value(IntType.class); + pan = Optional.of(castingValue.value(Integer.class)); + } + } else if (element.contextTagNum() == TILT_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.Int) { + IntType castingValue = element.value(IntType.class); + tilt = Optional.of(castingValue.value(Integer.class)); + } + } else if (element.contextTagNum() == ZOOM_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + zoom = Optional.of(castingValue.value(Integer.class)); + } + } + } + return new CameraAvSettingsUserLevelManagementClusterMPTZStruct( + pan, + tilt, + zoom + ); + } + + @Override + public String toString() { + StringBuilder output = new StringBuilder(); + output.append("CameraAvSettingsUserLevelManagementClusterMPTZStruct {\n"); + output.append("\tpan: "); + output.append(pan); + output.append("\n"); + output.append("\ttilt: "); + output.append(tilt); + output.append("\n"); + output.append("\tzoom: "); + output.append(zoom); + output.append("\n"); + output.append("}\n"); + return output.toString(); + } +} +public static class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct { + public Integer presetID; + public String name; + public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values; + private static final long PRESET_ID_ID = 0L; + private static final long NAME_ID = 1L; + private static final long VALUES_ID = 2L; + + public CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( + Integer presetID, + String name, + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values + ) { + this.presetID = presetID; + this.name = name; + this.values = values; + } + + public StructType encodeTlv() { + ArrayList values = new ArrayList<>(); + values.add(new StructElement(PRESET_ID_ID, new UIntType(presetID))); + values.add(new StructElement(NAME_ID, new StringType(name))); + values.add(new StructElement(VALUES_ID, values.encodeTlv())); + + return new StructType(values); + } + + public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeTlv(BaseTLVType tlvValue) { + if (tlvValue == null || tlvValue.type() != TLVType.Struct) { + return null; + } + Integer presetID = null; + String name = null; + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values = null; + for (StructElement element: ((StructType)tlvValue).value()) { + if (element.contextTagNum() == PRESET_ID_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + presetID = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == NAME_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.String) { + StringType castingValue = element.value(StringType.class); + name = castingValue.value(String.class); + } + } else if (element.contextTagNum() == VALUES_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.Struct) { + StructType castingValue = element.value(StructType.class); + values = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); + } + } + } + return new CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( + presetID, + name, + values + ); + } + + @Override + public String toString() { + StringBuilder output = new StringBuilder(); + output.append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n"); + output.append("\tpresetID: "); + output.append(presetID); + output.append("\n"); + output.append("\tname: "); + output.append(name); + output.append("\n"); + output.append("\tvalues: "); + output.append(values); + output.append("\n"); + output.append("}\n"); + return output.toString(); + } +} +public static class CameraAvSettingsUserLevelManagementClusterViewportStruct { + public Integer x1; + public Integer y1; + public Integer x2; + public Integer y2; + private static final long X1_ID = 0L; + private static final long Y1_ID = 1L; + private static final long X2_ID = 2L; + private static final long Y2_ID = 3L; + + public CameraAvSettingsUserLevelManagementClusterViewportStruct( + Integer x1, + Integer y1, + Integer x2, + Integer y2 + ) { + this.x1 = x1; + this.y1 = y1; + this.x2 = x2; + this.y2 = y2; + } + + public StructType encodeTlv() { + ArrayList values = new ArrayList<>(); + values.add(new StructElement(X1_ID, new UIntType(x1))); + values.add(new StructElement(Y1_ID, new UIntType(y1))); + values.add(new StructElement(X2_ID, new UIntType(x2))); + values.add(new StructElement(Y2_ID, new UIntType(y2))); + + return new StructType(values); + } + + public static CameraAvSettingsUserLevelManagementClusterViewportStruct decodeTlv(BaseTLVType tlvValue) { + if (tlvValue == null || tlvValue.type() != TLVType.Struct) { + return null; + } + Integer x1 = null; + Integer y1 = null; + Integer x2 = null; + Integer y2 = null; + for (StructElement element: ((StructType)tlvValue).value()) { + if (element.contextTagNum() == X1_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + x1 = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == Y1_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + y1 = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == X2_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + x2 = castingValue.value(Integer.class); + } + } else if (element.contextTagNum() == Y2_ID) { + if (element.value(BaseTLVType.class).type() == TLVType.UInt) { + UIntType castingValue = element.value(UIntType.class); + y2 = castingValue.value(Integer.class); + } + } + } + return new CameraAvSettingsUserLevelManagementClusterViewportStruct( + x1, + y1, + x2, + y2 + ); + } + + @Override + public String toString() { + StringBuilder output = new StringBuilder(); + output.append("CameraAvSettingsUserLevelManagementClusterViewportStruct {\n"); + output.append("\tx1: "); + output.append(x1); + output.append("\n"); + output.append("\ty1: "); + output.append(y1); + output.append("\n"); + output.append("\tx2: "); + output.append(x2); + output.append("\n"); + output.append("\ty2: "); + output.append(y2); + output.append("\n"); + output.append("}\n"); + return output.toString(); + } +} public static class WebRTCTransportProviderClusterICEServerStruct { public ArrayList urls; public Optional username; diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index a43df66e40bf0a..46f46c2c1739fa 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -385,6 +385,9 @@ public static BaseCluster getCluster(long clusterId) { if (clusterId == CameraAvStreamManagement.ID) { return new CameraAvStreamManagement(); } + if (clusterId == CameraAvSettingsUserLevelManagement.ID) { + return new CameraAvSettingsUserLevelManagement(); + } if (clusterId == WebRTCTransportProvider.ID) { return new WebRTCTransportProvider(); } @@ -17450,6 +17453,241 @@ public long getCommandID(String name) throws IllegalArgumentException { return Command.valueOf(name).getID(); } } + public static class CameraAvSettingsUserLevelManagement implements BaseCluster { + public static final long ID = 1362L; + public long getID() { + return ID; + } + + public enum Attribute { + MptzPosition(0L), + MaxPresets(1L), + MptzPresets(2L), + DptzRelativeMove(3L), + ZoomMax(4L), + TiltMin(5L), + TiltMax(6L), + PanMin(7L), + PanMax(8L), + GeneratedCommandList(65528L), + AcceptedCommandList(65529L), + EventList(65530L), + AttributeList(65531L), + FeatureMap(65532L), + ClusterRevision(65533L),; + private final long id; + Attribute(long id) { + this.id = id; + } + + public long getID() { + return id; + } + + public static Attribute value(long id) throws NoSuchFieldError { + for (Attribute attribute : Attribute.values()) { + if (attribute.getID() == id) { + return attribute; + } + } + throw new NoSuchFieldError(); + } + } + + public enum Event {; + private final long id; + Event(long id) { + this.id = id; + } + + public long getID() { + return id; + } + + public static Event value(long id) throws NoSuchFieldError { + for (Event event : Event.values()) { + if (event.getID() == id) { + return event; + } + } + throw new NoSuchFieldError(); + } + } + + public enum Command { + MptzSetPosition(0L), + MptzRelativeMove(1L), + MptzMoveToPreset(2L), + MptzSavePreset(3L), + MptzRemovePreset(4L), + DptzSetViewport(5L), + DptzRelativeMove(6L),; + private final long id; + Command(long id) { + this.id = id; + } + + public long getID() { + return id; + } + + public static Command value(long id) throws NoSuchFieldError { + for (Command command : Command.values()) { + if (command.getID() == id) { + return command; + } + } + throw new NoSuchFieldError(); + } + }public enum MptzSetPositionCommandField {Pan(0),Tilt(1),Zoom(2),; + private final int id; + MptzSetPositionCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static MptzSetPositionCommandField value(int id) throws NoSuchFieldError { + for (MptzSetPositionCommandField field : MptzSetPositionCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }public enum MptzRelativeMoveCommandField {PanDelta(0),TiltDelta(1),ZoomDelta(2),; + private final int id; + MptzRelativeMoveCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static MptzRelativeMoveCommandField value(int id) throws NoSuchFieldError { + for (MptzRelativeMoveCommandField field : MptzRelativeMoveCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }public enum MptzMoveToPresetCommandField {PresetID(0),; + private final int id; + MptzMoveToPresetCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static MptzMoveToPresetCommandField value(int id) throws NoSuchFieldError { + for (MptzMoveToPresetCommandField field : MptzMoveToPresetCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }public enum MptzSavePresetCommandField {PresetID(0),Name(1),; + private final int id; + MptzSavePresetCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static MptzSavePresetCommandField value(int id) throws NoSuchFieldError { + for (MptzSavePresetCommandField field : MptzSavePresetCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }public enum MptzRemovePresetCommandField {PresetID(0),; + private final int id; + MptzRemovePresetCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static MptzRemovePresetCommandField value(int id) throws NoSuchFieldError { + for (MptzRemovePresetCommandField field : MptzRemovePresetCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }public enum DptzSetViewportCommandField {VideoStreamID(0),Viewport(1),; + private final int id; + DptzSetViewportCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static DptzSetViewportCommandField value(int id) throws NoSuchFieldError { + for (DptzSetViewportCommandField field : DptzSetViewportCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }public enum DptzRelativeMoveCommandField {VideoStreamID(0),DeltaX(1),DeltaY(2),ZoomDelta(3),; + private final int id; + DptzRelativeMoveCommandField(int id) { + this.id = id; + } + + public int getID() { + return id; + } + public static DptzRelativeMoveCommandField value(int id) throws NoSuchFieldError { + for (DptzRelativeMoveCommandField field : DptzRelativeMoveCommandField.values()) { + if (field.getID() == id) { + return field; + } + } + throw new NoSuchFieldError(); + } + }@Override + public String getAttributeName(long id) throws NoSuchFieldError { + return Attribute.value(id).toString(); + } + + @Override + public String getEventName(long id) throws NoSuchFieldError { + return Event.value(id).toString(); + } + + @Override + public String getCommandName(long id) throws NoSuchFieldError { + return Command.value(id).toString(); + } + + @Override + public long getAttributeID(String name) throws IllegalArgumentException { + return Attribute.valueOf(name).getID(); + } + + @Override + public long getEventID(String name) throws IllegalArgumentException { + return Event.valueOf(name).getID(); + } + + @Override + public long getCommandID(String name) throws IllegalArgumentException { + return Command.valueOf(name).getID(); + } + } public static class WebRTCTransportProvider implements BaseCluster { public static final long ID = 1363L; public long getID() { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index d0e83258a32ae5..78dcbb520c6d32 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -20504,6 +20504,153 @@ public void onError(Exception ex) { } } + public static class DelegatedCameraAvSettingsUserLevelManagementClusterMptzPositionAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.MptzPositionAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct value) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct"); + responseValues.put(commandResponseInfo, value); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + + public static class DelegatedCameraAvSettingsUserLevelManagementClusterMptzPresetsAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.MptzPresetsAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(List valueList) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + responseValues.put(commandResponseInfo, valueList); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + + public static class DelegatedCameraAvSettingsUserLevelManagementClusterDptzRelativeMoveAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.DptzRelativeMoveAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(List valueList) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + responseValues.put(commandResponseInfo, valueList); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + + public static class DelegatedCameraAvSettingsUserLevelManagementClusterGeneratedCommandListAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(List valueList) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + responseValues.put(commandResponseInfo, valueList); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + + public static class DelegatedCameraAvSettingsUserLevelManagementClusterAcceptedCommandListAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(List valueList) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + responseValues.put(commandResponseInfo, valueList); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + + public static class DelegatedCameraAvSettingsUserLevelManagementClusterEventListAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.EventListAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(List valueList) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + responseValues.put(commandResponseInfo, valueList); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + + public static class DelegatedCameraAvSettingsUserLevelManagementClusterAttributeListAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.AttributeListAttributeCallback, DelegatedClusterCallback { + private ClusterCommandCallback callback; + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(List valueList) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); + responseValues.put(commandResponseInfo, valueList); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + public static class DelegatedWebRTCTransportProviderClusterSolicitOfferResponseCallback implements ChipClusters.WebRTCTransportProviderCluster.SolicitOfferResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -23217,6 +23364,10 @@ public Map initializeClusterMap() { (ptr, endpointId) -> new ChipClusters.CameraAvStreamManagementCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("cameraAvStreamManagement", cameraAvStreamManagementClusterInfo); + ClusterInfo cameraAvSettingsUserLevelManagementClusterInfo = new ClusterInfo( + (ptr, endpointId) -> new ChipClusters.CameraAvSettingsUserLevelManagementCluster(ptr, endpointId), new HashMap<>()); + clusterMap.put("cameraAvSettingsUserLevelManagement", cameraAvSettingsUserLevelManagementClusterInfo); + ClusterInfo webRTCTransportProviderClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.WebRTCTransportProviderCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("webRTCTransportProvider", webRTCTransportProviderClusterInfo); @@ -23372,6 +23523,7 @@ public void combineCommand(Map destination, Map> getCommandMap() { commandMap.put("cameraAvStreamManagement", cameraAvStreamManagementClusterInteractionInfoMap); + Map cameraAvSettingsUserLevelManagementClusterInteractionInfoMap = new LinkedHashMap<>(); + + Map cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSetPositionpanCommandParameterInfo = new CommandParameterInfo("pan", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams.put("pan",cameraAvSettingsUserLevelManagementmptzSetPositionpanCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSetPositiontiltCommandParameterInfo = new CommandParameterInfo("tilt", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams.put("tilt",cameraAvSettingsUserLevelManagementmptzSetPositiontiltCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSetPositionzoomCommandParameterInfo = new CommandParameterInfo("zoom", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams.put("zoom",cameraAvSettingsUserLevelManagementmptzSetPositionzoomCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementmptzSetPositionInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .mptzSetPosition((DefaultClusterCallback) callback + , (Optional) + commandArguments.get("pan") + , (Optional) + commandArguments.get("tilt") + , (Optional) + commandArguments.get("zoom") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzSetPosition", cameraAvSettingsUserLevelManagementmptzSetPositionInteractionInfo); + + Map cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRelativeMovepanDeltaCommandParameterInfo = new CommandParameterInfo("panDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams.put("panDelta",cameraAvSettingsUserLevelManagementmptzRelativeMovepanDeltaCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRelativeMovetiltDeltaCommandParameterInfo = new CommandParameterInfo("tiltDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams.put("tiltDelta",cameraAvSettingsUserLevelManagementmptzRelativeMovetiltDeltaCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRelativeMovezoomDeltaCommandParameterInfo = new CommandParameterInfo("zoomDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams.put("zoomDelta",cameraAvSettingsUserLevelManagementmptzRelativeMovezoomDeltaCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementmptzRelativeMoveInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .mptzRelativeMove((DefaultClusterCallback) callback + , (Optional) + commandArguments.get("panDelta") + , (Optional) + commandArguments.get("tiltDelta") + , (Optional) + commandArguments.get("zoomDelta") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzRelativeMove", cameraAvSettingsUserLevelManagementmptzRelativeMoveInteractionInfo); + + Map cameraAvSettingsUserLevelManagementmptzMoveToPresetCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzMoveToPresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzMoveToPresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementmptzMoveToPresetpresetIDCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementmptzMoveToPresetInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .mptzMoveToPreset((DefaultClusterCallback) callback + , (Integer) + commandArguments.get("presetID") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementmptzMoveToPresetCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzMoveToPreset", cameraAvSettingsUserLevelManagementmptzMoveToPresetInteractionInfo); + + Map cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSavePresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementmptzSavePresetpresetIDCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSavePresetnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class); + cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams.put("name",cameraAvSettingsUserLevelManagementmptzSavePresetnameCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementmptzSavePresetInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .mptzSavePreset((DefaultClusterCallback) callback + , (Optional) + commandArguments.get("presetID") + , (String) + commandArguments.get("name") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzSavePreset", cameraAvSettingsUserLevelManagementmptzSavePresetInteractionInfo); + + Map cameraAvSettingsUserLevelManagementmptzRemovePresetCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRemovePresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementmptzRemovePresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementmptzRemovePresetpresetIDCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementmptzRemovePresetInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .mptzRemovePreset((DefaultClusterCallback) callback + , (Integer) + commandArguments.get("presetID") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementmptzRemovePresetCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzRemovePreset", cameraAvSettingsUserLevelManagementmptzRemovePresetInteractionInfo); + + Map cameraAvSettingsUserLevelManagementdptzSetViewportCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementdptzSetViewportvideoStreamIDCommandParameterInfo = new CommandParameterInfo("videoStreamID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementdptzSetViewportCommandParams.put("videoStreamID",cameraAvSettingsUserLevelManagementdptzSetViewportvideoStreamIDCommandParameterInfo); + + InteractionInfo cameraAvSettingsUserLevelManagementdptzSetViewportInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .dptzSetViewport((DefaultClusterCallback) callback + , (Integer) + commandArguments.get("videoStreamID") + , (ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct) + commandArguments.get("viewport") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementdptzSetViewportCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("dptzSetViewport", cameraAvSettingsUserLevelManagementdptzSetViewportInteractionInfo); + + Map cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams = new LinkedHashMap(); + + CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovevideoStreamIDCommandParameterInfo = new CommandParameterInfo("videoStreamID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("videoStreamID",cameraAvSettingsUserLevelManagementdptzRelativeMovevideoStreamIDCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaXCommandParameterInfo = new CommandParameterInfo("deltaX", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("deltaX",cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaXCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaYCommandParameterInfo = new CommandParameterInfo("deltaY", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("deltaY",cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaYCommandParameterInfo); + + CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovezoomDeltaCommandParameterInfo = new CommandParameterInfo("zoomDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("zoomDelta",cameraAvSettingsUserLevelManagementdptzRelativeMovezoomDeltaCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementdptzRelativeMoveInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) + .dptzRelativeMove((DefaultClusterCallback) callback + , (Integer) + commandArguments.get("videoStreamID") + , (Optional) + commandArguments.get("deltaX") + , (Optional) + commandArguments.get("deltaY") + , (Optional) + commandArguments.get("zoomDelta") + ); + }, + () -> new DelegatedDefaultClusterCallback(), + cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams + ); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("dptzRelativeMove", cameraAvSettingsUserLevelManagementdptzRelativeMoveInteractionInfo); + + commandMap.put("cameraAvSettingsUserLevelManagement", cameraAvSettingsUserLevelManagementClusterInteractionInfoMap); + Map webRTCTransportProviderClusterInteractionInfoMap = new LinkedHashMap<>(); Map webRTCTransportProvidersolicitOfferCommandParams = new LinkedHashMap(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index 9abbcd879c5503..3ba80e7f2a326f 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -18816,6 +18816,164 @@ private static Map readCameraAvStreamManagementInteract return result; } + private static Map readCameraAvSettingsUserLevelManagementInteractionInfo() { + Map result = new LinkedHashMap<>();Map readCameraAvSettingsUserLevelManagementMaxPresetsCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementMaxPresetsAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readMaxPresetsAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementMaxPresetsCommandParams + ); + result.put("readMaxPresetsAttribute", readCameraAvSettingsUserLevelManagementMaxPresetsAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementMptzPresetsCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementMptzPresetsAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readMptzPresetsAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.MptzPresetsAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterMptzPresetsAttributeCallback(), + readCameraAvSettingsUserLevelManagementMptzPresetsCommandParams + ); + result.put("readMptzPresetsAttribute", readCameraAvSettingsUserLevelManagementMptzPresetsAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementDptzRelativeMoveCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementDptzRelativeMoveAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readDptzRelativeMoveAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.DptzRelativeMoveAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterDptzRelativeMoveAttributeCallback(), + readCameraAvSettingsUserLevelManagementDptzRelativeMoveCommandParams + ); + result.put("readDptzRelativeMoveAttribute", readCameraAvSettingsUserLevelManagementDptzRelativeMoveAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementZoomMaxCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementZoomMaxAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readZoomMaxAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementZoomMaxCommandParams + ); + result.put("readZoomMaxAttribute", readCameraAvSettingsUserLevelManagementZoomMaxAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementTiltMinCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementTiltMinAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readTiltMinAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementTiltMinCommandParams + ); + result.put("readTiltMinAttribute", readCameraAvSettingsUserLevelManagementTiltMinAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementTiltMaxCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementTiltMaxAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readTiltMaxAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementTiltMaxCommandParams + ); + result.put("readTiltMaxAttribute", readCameraAvSettingsUserLevelManagementTiltMaxAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementPanMinCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementPanMinAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readPanMinAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementPanMinCommandParams + ); + result.put("readPanMinAttribute", readCameraAvSettingsUserLevelManagementPanMinAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementPanMaxCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementPanMaxAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readPanMaxAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementPanMaxCommandParams + ); + result.put("readPanMaxAttribute", readCameraAvSettingsUserLevelManagementPanMaxAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementGeneratedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readGeneratedCommandListAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.GeneratedCommandListAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterGeneratedCommandListAttributeCallback(), + readCameraAvSettingsUserLevelManagementGeneratedCommandListCommandParams + ); + result.put("readGeneratedCommandListAttribute", readCameraAvSettingsUserLevelManagementGeneratedCommandListAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementAcceptedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readAcceptedCommandListAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.AcceptedCommandListAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterAcceptedCommandListAttributeCallback(), + readCameraAvSettingsUserLevelManagementAcceptedCommandListCommandParams + ); + result.put("readAcceptedCommandListAttribute", readCameraAvSettingsUserLevelManagementAcceptedCommandListAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementEventListCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementEventListAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readEventListAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.EventListAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterEventListAttributeCallback(), + readCameraAvSettingsUserLevelManagementEventListCommandParams + ); + result.put("readEventListAttribute", readCameraAvSettingsUserLevelManagementEventListAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementAttributeListCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementAttributeListAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readAttributeListAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.AttributeListAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterAttributeListAttributeCallback(), + readCameraAvSettingsUserLevelManagementAttributeListCommandParams + ); + result.put("readAttributeListAttribute", readCameraAvSettingsUserLevelManagementAttributeListAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementFeatureMapCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementFeatureMapAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readFeatureMapAttribute( + (ChipClusters.LongAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readCameraAvSettingsUserLevelManagementFeatureMapCommandParams + ); + result.put("readFeatureMapAttribute", readCameraAvSettingsUserLevelManagementFeatureMapAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementClusterRevisionCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementClusterRevisionAttributeInteractionInfo = new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readClusterRevisionAttribute( + (ChipClusters.IntegerAttributeCallback) callback + ); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readCameraAvSettingsUserLevelManagementClusterRevisionCommandParams + ); + result.put("readClusterRevisionAttribute", readCameraAvSettingsUserLevelManagementClusterRevisionAttributeInteractionInfo); + + return result; + } private static Map readWebRTCTransportProviderInteractionInfo() { Map result = new LinkedHashMap<>();Map readWebRTCTransportProviderCurrentSessionsCommandParams = new LinkedHashMap(); InteractionInfo readWebRTCTransportProviderCurrentSessionsAttributeInteractionInfo = new InteractionInfo( @@ -20533,6 +20691,7 @@ public Map> getReadAttributeMap() { put("contentAppObserver", readContentAppObserverInteractionInfo()); put("zoneManagement", readZoneManagementInteractionInfo()); put("cameraAvStreamManagement", readCameraAvStreamManagementInteractionInfo()); + put("cameraAvSettingsUserLevelManagement", readCameraAvSettingsUserLevelManagementInteractionInfo()); put("webRTCTransportProvider", readWebRTCTransportProviderInteractionInfo()); put("webRTCTransportRequestor", readWebRTCTransportRequestorInteractionInfo()); put("chime", readChimeInteractionInfo()); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java index 725fd0baeccf65..6e0ca4e48395fb 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java @@ -3850,6 +3850,8 @@ public Map> getWriteAttributeMap() { ); writeCameraAvStreamManagementInteractionInfo.put("writeDepthSensorStatusAttribute", writeCameraAvStreamManagementDepthSensorStatusAttributeInteractionInfo); writeAttributeMap.put("cameraAvStreamManagement", writeCameraAvStreamManagementInteractionInfo); + Map writeCameraAvSettingsUserLevelManagementInteractionInfo = new LinkedHashMap<>(); + writeAttributeMap.put("cameraAvSettingsUserLevelManagement", writeCameraAvSettingsUserLevelManagementInteractionInfo); Map writeWebRTCTransportProviderInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("webRTCTransportProvider", writeWebRTCTransportProviderInteractionInfo); Map writeWebRTCTransportRequestorInteractionInfo = new LinkedHashMap<>(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni index 2aed70a3dcf4d6..c97cd1c570567b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/files.gni @@ -19,6 +19,9 @@ structs_sources = [ "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt", + "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvStreamManagementClusterAudioCapabilitiesStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvStreamManagementClusterAudioStreamStruct.kt", "${chip_root}/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvStreamManagementClusterRateDistortionTradeOffPointsStruct.kt", diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt new file mode 100644 index 00000000000000..766c02742ca5f6 --- /dev/null +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -0,0 +1,71 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package chip.devicecontroller.cluster.structs + +import chip.devicecontroller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( + val presetID: UInt, + val name: String, + val values: CameraAvSettingsUserLevelManagementClusterMPTZStruct, +) { + override fun toString(): String = buildString { + append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") + append("\tpresetID : $presetID\n") + append("\tname : $name\n") + append("\tvalues : $values\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + put(ContextSpecificTag(TAG_PRESET_ID), presetID) + put(ContextSpecificTag(TAG_NAME), name) + values.toTlv(ContextSpecificTag(TAG_VALUES), this) + endStructure() + } + } + + companion object { + private const val TAG_PRESET_ID = 0 + private const val TAG_NAME = 1 + private const val TAG_VALUES = 2 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct { + tlvReader.enterStructure(tlvTag) + val presetID = tlvReader.getUInt(ContextSpecificTag(TAG_PRESET_ID)) + val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) + val values = + CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( + ContextSpecificTag(TAG_VALUES), + tlvReader, + ) + + tlvReader.exitContainer() + + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, values) + } + } +} diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt new file mode 100644 index 00000000000000..39a5522c07eff3 --- /dev/null +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt @@ -0,0 +1,92 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package chip.devicecontroller.cluster.structs + +import chip.devicecontroller.cluster.* +import java.util.Optional +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementClusterMPTZStruct( + val pan: Optional, + val tilt: Optional, + val zoom: Optional, +) { + override fun toString(): String = buildString { + append("CameraAvSettingsUserLevelManagementClusterMPTZStruct {\n") + append("\tpan : $pan\n") + append("\ttilt : $tilt\n") + append("\tzoom : $zoom\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + if (pan.isPresent) { + val optpan = pan.get() + put(ContextSpecificTag(TAG_PAN), optpan) + } + if (tilt.isPresent) { + val opttilt = tilt.get() + put(ContextSpecificTag(TAG_TILT), opttilt) + } + if (zoom.isPresent) { + val optzoom = zoom.get() + put(ContextSpecificTag(TAG_ZOOM), optzoom) + } + endStructure() + } + } + + companion object { + private const val TAG_PAN = 2 + private const val TAG_TILT = 3 + private const val TAG_ZOOM = 4 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): CameraAvSettingsUserLevelManagementClusterMPTZStruct { + tlvReader.enterStructure(tlvTag) + val pan = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_PAN))) { + Optional.of(tlvReader.getInt(ContextSpecificTag(TAG_PAN))) + } else { + Optional.empty() + } + val tilt = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_TILT))) { + Optional.of(tlvReader.getInt(ContextSpecificTag(TAG_TILT))) + } else { + Optional.empty() + } + val zoom = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_ZOOM))) { + Optional.of(tlvReader.getUInt(ContextSpecificTag(TAG_ZOOM))) + } else { + Optional.empty() + } + + tlvReader.exitContainer() + + return CameraAvSettingsUserLevelManagementClusterMPTZStruct(pan, tilt, zoom) + } + } +} diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt new file mode 100644 index 00000000000000..c781d0f8f01a5c --- /dev/null +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt @@ -0,0 +1,72 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package chip.devicecontroller.cluster.structs + +import chip.devicecontroller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementClusterViewportStruct( + val x1: UInt, + val y1: UInt, + val x2: UInt, + val y2: UInt, +) { + override fun toString(): String = buildString { + append("CameraAvSettingsUserLevelManagementClusterViewportStruct {\n") + append("\tx1 : $x1\n") + append("\ty1 : $y1\n") + append("\tx2 : $x2\n") + append("\ty2 : $y2\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + put(ContextSpecificTag(TAG_X1), x1) + put(ContextSpecificTag(TAG_Y1), y1) + put(ContextSpecificTag(TAG_X2), x2) + put(ContextSpecificTag(TAG_Y2), y2) + endStructure() + } + } + + companion object { + private const val TAG_X1 = 0 + private const val TAG_Y1 = 1 + private const val TAG_X2 = 2 + private const val TAG_Y2 = 3 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): CameraAvSettingsUserLevelManagementClusterViewportStruct { + tlvReader.enterStructure(tlvTag) + val x1 = tlvReader.getUInt(ContextSpecificTag(TAG_X1)) + val y1 = tlvReader.getUInt(ContextSpecificTag(TAG_Y1)) + val x2 = tlvReader.getUInt(ContextSpecificTag(TAG_X2)) + val y2 = tlvReader.getUInt(ContextSpecificTag(TAG_Y2)) + + tlvReader.exitContainer() + + return CameraAvSettingsUserLevelManagementClusterViewportStruct(x1, y1, x2, y2) + } + } +} diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt new file mode 100644 index 00000000000000..62217a5680f8b7 --- /dev/null +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt @@ -0,0 +1,1725 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package matter.controller.cluster.clusters + +import java.time.Duration +import java.util.logging.Level +import java.util.logging.Logger +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.transform +import matter.controller.InvokeRequest +import matter.controller.InvokeResponse +import matter.controller.MatterController +import matter.controller.ReadData +import matter.controller.ReadRequest +import matter.controller.ShortSubscriptionState +import matter.controller.SubscribeRequest +import matter.controller.SubscriptionState +import matter.controller.UByteSubscriptionState +import matter.controller.UIntSubscriptionState +import matter.controller.UShortSubscriptionState +import matter.controller.cluster.structs.* +import matter.controller.model.AttributePath +import matter.controller.model.CommandPath +import matter.tlv.AnonymousTag +import matter.tlv.ContextSpecificTag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementCluster( + private val controller: MatterController, + private val endpointId: UShort, +) { + class MptzPositionAttribute(val value: CameraAvSettingsUserLevelManagementClusterMPTZStruct?) + + sealed class MptzPositionAttributeSubscriptionState { + data class Success(val value: CameraAvSettingsUserLevelManagementClusterMPTZStruct?) : + MptzPositionAttributeSubscriptionState() + + data class Error(val exception: Exception) : MptzPositionAttributeSubscriptionState() + + object SubscriptionEstablished : MptzPositionAttributeSubscriptionState() + } + + class MptzPresetsAttribute( + val value: List? + ) + + sealed class MptzPresetsAttributeSubscriptionState { + data class Success( + val value: List? + ) : MptzPresetsAttributeSubscriptionState() + + data class Error(val exception: Exception) : MptzPresetsAttributeSubscriptionState() + + object SubscriptionEstablished : MptzPresetsAttributeSubscriptionState() + } + + class DptzRelativeMoveAttribute(val value: List?) + + sealed class DptzRelativeMoveAttributeSubscriptionState { + data class Success(val value: List?) : DptzRelativeMoveAttributeSubscriptionState() + + data class Error(val exception: Exception) : DptzRelativeMoveAttributeSubscriptionState() + + object SubscriptionEstablished : DptzRelativeMoveAttributeSubscriptionState() + } + + class GeneratedCommandListAttribute(val value: List) + + sealed class GeneratedCommandListAttributeSubscriptionState { + data class Success(val value: List) : GeneratedCommandListAttributeSubscriptionState() + + data class Error(val exception: Exception) : GeneratedCommandListAttributeSubscriptionState() + + object SubscriptionEstablished : GeneratedCommandListAttributeSubscriptionState() + } + + class AcceptedCommandListAttribute(val value: List) + + sealed class AcceptedCommandListAttributeSubscriptionState { + data class Success(val value: List) : AcceptedCommandListAttributeSubscriptionState() + + data class Error(val exception: Exception) : AcceptedCommandListAttributeSubscriptionState() + + object SubscriptionEstablished : AcceptedCommandListAttributeSubscriptionState() + } + + class EventListAttribute(val value: List) + + sealed class EventListAttributeSubscriptionState { + data class Success(val value: List) : EventListAttributeSubscriptionState() + + data class Error(val exception: Exception) : EventListAttributeSubscriptionState() + + object SubscriptionEstablished : EventListAttributeSubscriptionState() + } + + class AttributeListAttribute(val value: List) + + sealed class AttributeListAttributeSubscriptionState { + data class Success(val value: List) : AttributeListAttributeSubscriptionState() + + data class Error(val exception: Exception) : AttributeListAttributeSubscriptionState() + + object SubscriptionEstablished : AttributeListAttributeSubscriptionState() + } + + suspend fun mptzSetPosition( + pan: Short?, + tilt: Short?, + zoom: UByte?, + timedInvokeTimeout: Duration? = null, + ) { + val commandId: UInt = 0u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_PAN_REQ: Int = 0 + pan?.let { tlvWriter.put(ContextSpecificTag(TAG_PAN_REQ), pan) } + + val TAG_TILT_REQ: Int = 1 + tilt?.let { tlvWriter.put(ContextSpecificTag(TAG_TILT_REQ), tilt) } + + val TAG_ZOOM_REQ: Int = 2 + zoom?.let { tlvWriter.put(ContextSpecificTag(TAG_ZOOM_REQ), zoom) } + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun mptzRelativeMove( + panDelta: Short?, + tiltDelta: Short?, + zoomDelta: Byte?, + timedInvokeTimeout: Duration? = null, + ) { + val commandId: UInt = 1u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_PAN_DELTA_REQ: Int = 0 + panDelta?.let { tlvWriter.put(ContextSpecificTag(TAG_PAN_DELTA_REQ), panDelta) } + + val TAG_TILT_DELTA_REQ: Int = 1 + tiltDelta?.let { tlvWriter.put(ContextSpecificTag(TAG_TILT_DELTA_REQ), tiltDelta) } + + val TAG_ZOOM_DELTA_REQ: Int = 2 + zoomDelta?.let { tlvWriter.put(ContextSpecificTag(TAG_ZOOM_DELTA_REQ), zoomDelta) } + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun mptzMoveToPreset(presetID: UByte, timedInvokeTimeout: Duration? = null) { + val commandId: UInt = 2u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_PRESET_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_PRESET_ID_REQ), presetID) + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun mptzSavePreset(presetID: UByte?, name: String, timedInvokeTimeout: Duration? = null) { + val commandId: UInt = 3u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_PRESET_ID_REQ: Int = 0 + presetID?.let { tlvWriter.put(ContextSpecificTag(TAG_PRESET_ID_REQ), presetID) } + + val TAG_NAME_REQ: Int = 1 + tlvWriter.put(ContextSpecificTag(TAG_NAME_REQ), name) + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun mptzRemovePreset(presetID: UByte, timedInvokeTimeout: Duration? = null) { + val commandId: UInt = 4u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_PRESET_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_PRESET_ID_REQ), presetID) + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun dptzSetViewport( + videoStreamID: UShort, + viewport: CameraAvSettingsUserLevelManagementClusterViewportStruct, + timedInvokeTimeout: Duration? = null, + ) { + val commandId: UInt = 5u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_VIDEO_STREAM_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_VIDEO_STREAM_ID_REQ), videoStreamID) + + val TAG_VIEWPORT_REQ: Int = 1 + viewport.toTlv(ContextSpecificTag(TAG_VIEWPORT_REQ), tlvWriter) + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun dptzRelativeMove( + videoStreamID: UShort, + deltaX: Short?, + deltaY: Short?, + zoomDelta: Byte?, + timedInvokeTimeout: Duration? = null, + ) { + val commandId: UInt = 6u + + val tlvWriter = TlvWriter() + tlvWriter.startStructure(AnonymousTag) + + val TAG_VIDEO_STREAM_ID_REQ: Int = 0 + tlvWriter.put(ContextSpecificTag(TAG_VIDEO_STREAM_ID_REQ), videoStreamID) + + val TAG_DELTA_X_REQ: Int = 1 + deltaX?.let { tlvWriter.put(ContextSpecificTag(TAG_DELTA_X_REQ), deltaX) } + + val TAG_DELTA_Y_REQ: Int = 2 + deltaY?.let { tlvWriter.put(ContextSpecificTag(TAG_DELTA_Y_REQ), deltaY) } + + val TAG_ZOOM_DELTA_REQ: Int = 3 + zoomDelta?.let { tlvWriter.put(ContextSpecificTag(TAG_ZOOM_DELTA_REQ), zoomDelta) } + tlvWriter.endStructure() + + val request: InvokeRequest = + InvokeRequest( + CommandPath(endpointId, clusterId = CLUSTER_ID, commandId), + tlvPayload = tlvWriter.getEncoded(), + timedRequest = timedInvokeTimeout, + ) + + val response: InvokeResponse = controller.invoke(request) + logger.log(Level.FINE, "Invoke command succeeded: ${response}") + } + + suspend fun readMptzPositionAttribute(): MptzPositionAttribute { + val ATTRIBUTE_ID: UInt = 0u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Mptzposition attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: CameraAvSettingsUserLevelManagementClusterMPTZStruct? = + if (tlvReader.isNextTag(AnonymousTag)) { + CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv(AnonymousTag, tlvReader) + } else { + null + } + + return MptzPositionAttribute(decodedValue) + } + + suspend fun subscribeMptzPositionAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 0u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + MptzPositionAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Mptzposition attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: CameraAvSettingsUserLevelManagementClusterMPTZStruct? = + if (tlvReader.isNextTag(AnonymousTag)) { + CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv(AnonymousTag, tlvReader) + } else { + null + } + + decodedValue?.let { emit(MptzPositionAttributeSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(MptzPositionAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readMaxPresetsAttribute(): UByte? { + val ATTRIBUTE_ID: UInt = 1u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Maxpresets attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UByte? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getUByte(AnonymousTag) + } else { + null + } + + return decodedValue + } + + suspend fun subscribeMaxPresetsAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 1u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + UByteSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Maxpresets attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UByte? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getUByte(AnonymousTag) + } else { + null + } + + decodedValue?.let { emit(UByteSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(UByteSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readMptzPresetsAttribute(): MptzPresetsAttribute { + val ATTRIBUTE_ID: UInt = 2u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Mptzpresets attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List? = + if (tlvReader.isNextTag(AnonymousTag)) { + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add( + CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.fromTlv( + AnonymousTag, + tlvReader, + ) + ) + } + tlvReader.exitContainer() + } + } else { + null + } + + return MptzPresetsAttribute(decodedValue) + } + + suspend fun subscribeMptzPresetsAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 2u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + MptzPresetsAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Mptzpresets attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List? = + if (tlvReader.isNextTag(AnonymousTag)) { + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add( + CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.fromTlv( + AnonymousTag, + tlvReader, + ) + ) + } + tlvReader.exitContainer() + } + } else { + null + } + + decodedValue?.let { emit(MptzPresetsAttributeSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(MptzPresetsAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readDptzRelativeMoveAttribute(): DptzRelativeMoveAttribute { + val ATTRIBUTE_ID: UInt = 3u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Dptzrelativemove attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List? = + if (tlvReader.isNextTag(AnonymousTag)) { + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUShort(AnonymousTag)) + } + tlvReader.exitContainer() + } + } else { + null + } + + return DptzRelativeMoveAttribute(decodedValue) + } + + suspend fun subscribeDptzRelativeMoveAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 3u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + DptzRelativeMoveAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { + "Dptzrelativemove attribute not found in Node State update" + } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List? = + if (tlvReader.isNextTag(AnonymousTag)) { + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUShort(AnonymousTag)) + } + tlvReader.exitContainer() + } + } else { + null + } + + decodedValue?.let { emit(DptzRelativeMoveAttributeSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(DptzRelativeMoveAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readZoomMaxAttribute(): UByte? { + val ATTRIBUTE_ID: UInt = 4u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Zoommax attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UByte? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getUByte(AnonymousTag) + } else { + null + } + + return decodedValue + } + + suspend fun subscribeZoomMaxAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 4u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + UByteSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Zoommax attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UByte? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getUByte(AnonymousTag) + } else { + null + } + + decodedValue?.let { emit(UByteSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(UByteSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readTiltMinAttribute(): Short? { + val ATTRIBUTE_ID: UInt = 5u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Tiltmin attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + return decodedValue + } + + suspend fun subscribeTiltMinAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 5u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + ShortSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Tiltmin attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + decodedValue?.let { emit(ShortSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(ShortSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readTiltMaxAttribute(): Short? { + val ATTRIBUTE_ID: UInt = 6u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Tiltmax attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + return decodedValue + } + + suspend fun subscribeTiltMaxAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 6u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + ShortSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Tiltmax attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + decodedValue?.let { emit(ShortSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(ShortSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readPanMinAttribute(): Short? { + val ATTRIBUTE_ID: UInt = 7u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Panmin attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + return decodedValue + } + + suspend fun subscribePanMinAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 7u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + ShortSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Panmin attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + decodedValue?.let { emit(ShortSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(ShortSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readPanMaxAttribute(): Short? { + val ATTRIBUTE_ID: UInt = 8u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Panmax attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + return decodedValue + } + + suspend fun subscribePanMaxAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 8u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + ShortSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Panmax attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: Short? = + if (tlvReader.isNextTag(AnonymousTag)) { + tlvReader.getShort(AnonymousTag) + } else { + null + } + + decodedValue?.let { emit(ShortSubscriptionState.Success(it)) } + } + SubscriptionState.SubscriptionEstablished -> { + emit(ShortSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute { + val ATTRIBUTE_ID: UInt = 65528u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Generatedcommandlist attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + return GeneratedCommandListAttribute(decodedValue) + } + + suspend fun subscribeGeneratedCommandListAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 65528u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + GeneratedCommandListAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { + "Generatedcommandlist attribute not found in Node State update" + } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + emit(GeneratedCommandListAttributeSubscriptionState.Success(decodedValue)) + } + SubscriptionState.SubscriptionEstablished -> { + emit(GeneratedCommandListAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute { + val ATTRIBUTE_ID: UInt = 65529u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Acceptedcommandlist attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + return AcceptedCommandListAttribute(decodedValue) + } + + suspend fun subscribeAcceptedCommandListAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 65529u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + AcceptedCommandListAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { + "Acceptedcommandlist attribute not found in Node State update" + } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + emit(AcceptedCommandListAttributeSubscriptionState.Success(decodedValue)) + } + SubscriptionState.SubscriptionEstablished -> { + emit(AcceptedCommandListAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readEventListAttribute(): EventListAttribute { + val ATTRIBUTE_ID: UInt = 65530u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Eventlist attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + return EventListAttribute(decodedValue) + } + + suspend fun subscribeEventListAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 65530u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + EventListAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Eventlist attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + emit(EventListAttributeSubscriptionState.Success(decodedValue)) + } + SubscriptionState.SubscriptionEstablished -> { + emit(EventListAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readAttributeListAttribute(): AttributeListAttribute { + val ATTRIBUTE_ID: UInt = 65531u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Attributelist attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + return AttributeListAttribute(decodedValue) + } + + suspend fun subscribeAttributeListAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 65531u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + AttributeListAttributeSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Attributelist attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: List = + buildList { + tlvReader.enterArray(AnonymousTag) + while (!tlvReader.isEndOfContainer()) { + add(tlvReader.getUInt(AnonymousTag)) + } + tlvReader.exitContainer() + } + + emit(AttributeListAttributeSubscriptionState.Success(decodedValue)) + } + SubscriptionState.SubscriptionEstablished -> { + emit(AttributeListAttributeSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readFeatureMapAttribute(): UInt { + val ATTRIBUTE_ID: UInt = 65532u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Featuremap attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UInt = tlvReader.getUInt(AnonymousTag) + + return decodedValue + } + + suspend fun subscribeFeatureMapAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 65532u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + UIntSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { "Featuremap attribute not found in Node State update" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UInt = tlvReader.getUInt(AnonymousTag) + + emit(UIntSubscriptionState.Success(decodedValue)) + } + SubscriptionState.SubscriptionEstablished -> { + emit(UIntSubscriptionState.SubscriptionEstablished) + } + } + } + } + + suspend fun readClusterRevisionAttribute(): UShort { + val ATTRIBUTE_ID: UInt = 65533u + + val attributePath = + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + + val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath)) + + val response = controller.read(readRequest) + + if (response.successes.isEmpty()) { + logger.log(Level.WARNING, "Read command failed") + throw IllegalStateException("Read command failed with failures: ${response.failures}") + } + + logger.log(Level.FINE, "Read command succeeded") + + val attributeData = + response.successes.filterIsInstance().firstOrNull { + it.path.attributeId == ATTRIBUTE_ID + } + + requireNotNull(attributeData) { "Clusterrevision attribute not found in response" } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UShort = tlvReader.getUShort(AnonymousTag) + + return decodedValue + } + + suspend fun subscribeClusterRevisionAttribute( + minInterval: Int, + maxInterval: Int, + ): Flow { + val ATTRIBUTE_ID: UInt = 65533u + val attributePaths = + listOf( + AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID) + ) + + val subscribeRequest: SubscribeRequest = + SubscribeRequest( + eventPaths = emptyList(), + attributePaths = attributePaths, + minInterval = Duration.ofSeconds(minInterval.toLong()), + maxInterval = Duration.ofSeconds(maxInterval.toLong()), + ) + + return controller.subscribe(subscribeRequest).transform { subscriptionState -> + when (subscriptionState) { + is SubscriptionState.SubscriptionErrorNotification -> { + emit( + UShortSubscriptionState.Error( + Exception( + "Subscription terminated with error code: ${subscriptionState.terminationCause}" + ) + ) + ) + } + is SubscriptionState.NodeStateUpdate -> { + val attributeData = + subscriptionState.updateState.successes + .filterIsInstance() + .firstOrNull { it.path.attributeId == ATTRIBUTE_ID } + + requireNotNull(attributeData) { + "Clusterrevision attribute not found in Node State update" + } + + // Decode the TLV data into the appropriate type + val tlvReader = TlvReader(attributeData.data) + val decodedValue: UShort = tlvReader.getUShort(AnonymousTag) + + emit(UShortSubscriptionState.Success(decodedValue)) + } + SubscriptionState.SubscriptionEstablished -> { + emit(UShortSubscriptionState.SubscriptionEstablished) + } + } + } + } + + companion object { + private val logger = + Logger.getLogger(CameraAvSettingsUserLevelManagementCluster::class.java.name) + const val CLUSTER_ID: UInt = 1362u + } +} diff --git a/src/controller/java/generated/java/matter/controller/cluster/files.gni b/src/controller/java/generated/java/matter/controller/cluster/files.gni index 15406011f71772..3815c00a9070e6 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/files.gni +++ b/src/controller/java/generated/java/matter/controller/cluster/files.gni @@ -19,6 +19,9 @@ matter_structs_sources = [ "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BindingClusterTargetStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvStreamManagementClusterAudioCapabilitiesStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvStreamManagementClusterAudioStreamStruct.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvStreamManagementClusterRateDistortionTradeOffPointsStruct.kt", @@ -287,6 +290,7 @@ matter_clusters_sources = [ "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanStateCluster.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanStateConfigurationCluster.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt", + "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvStreamManagementCluster.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt", "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt", diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt new file mode 100644 index 00000000000000..5831e0cac5c6a6 --- /dev/null +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -0,0 +1,71 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package matter.controller.cluster.structs + +import matter.controller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( + val presetID: UByte, + val name: String, + val values: CameraAvSettingsUserLevelManagementClusterMPTZStruct, +) { + override fun toString(): String = buildString { + append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") + append("\tpresetID : $presetID\n") + append("\tname : $name\n") + append("\tvalues : $values\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + put(ContextSpecificTag(TAG_PRESET_ID), presetID) + put(ContextSpecificTag(TAG_NAME), name) + values.toTlv(ContextSpecificTag(TAG_VALUES), this) + endStructure() + } + } + + companion object { + private const val TAG_PRESET_ID = 0 + private const val TAG_NAME = 1 + private const val TAG_VALUES = 2 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct { + tlvReader.enterStructure(tlvTag) + val presetID = tlvReader.getUByte(ContextSpecificTag(TAG_PRESET_ID)) + val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) + val values = + CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( + ContextSpecificTag(TAG_VALUES), + tlvReader, + ) + + tlvReader.exitContainer() + + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, values) + } + } +} diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt new file mode 100644 index 00000000000000..c07c704b0bb06e --- /dev/null +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt @@ -0,0 +1,92 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package matter.controller.cluster.structs + +import java.util.Optional +import matter.controller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementClusterMPTZStruct( + val pan: Optional, + val tilt: Optional, + val zoom: Optional, +) { + override fun toString(): String = buildString { + append("CameraAvSettingsUserLevelManagementClusterMPTZStruct {\n") + append("\tpan : $pan\n") + append("\ttilt : $tilt\n") + append("\tzoom : $zoom\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + if (pan.isPresent) { + val optpan = pan.get() + put(ContextSpecificTag(TAG_PAN), optpan) + } + if (tilt.isPresent) { + val opttilt = tilt.get() + put(ContextSpecificTag(TAG_TILT), opttilt) + } + if (zoom.isPresent) { + val optzoom = zoom.get() + put(ContextSpecificTag(TAG_ZOOM), optzoom) + } + endStructure() + } + } + + companion object { + private const val TAG_PAN = 2 + private const val TAG_TILT = 3 + private const val TAG_ZOOM = 4 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): CameraAvSettingsUserLevelManagementClusterMPTZStruct { + tlvReader.enterStructure(tlvTag) + val pan = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_PAN))) { + Optional.of(tlvReader.getShort(ContextSpecificTag(TAG_PAN))) + } else { + Optional.empty() + } + val tilt = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_TILT))) { + Optional.of(tlvReader.getShort(ContextSpecificTag(TAG_TILT))) + } else { + Optional.empty() + } + val zoom = + if (tlvReader.isNextTag(ContextSpecificTag(TAG_ZOOM))) { + Optional.of(tlvReader.getUByte(ContextSpecificTag(TAG_ZOOM))) + } else { + Optional.empty() + } + + tlvReader.exitContainer() + + return CameraAvSettingsUserLevelManagementClusterMPTZStruct(pan, tilt, zoom) + } + } +} diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt new file mode 100644 index 00000000000000..983f73d46b88bb --- /dev/null +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterViewportStruct.kt @@ -0,0 +1,72 @@ +/* + * + * Copyright (c) 2023 Project CHIP Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package matter.controller.cluster.structs + +import matter.controller.cluster.* +import matter.tlv.ContextSpecificTag +import matter.tlv.Tag +import matter.tlv.TlvReader +import matter.tlv.TlvWriter + +class CameraAvSettingsUserLevelManagementClusterViewportStruct( + val x1: UShort, + val y1: UShort, + val x2: UShort, + val y2: UShort, +) { + override fun toString(): String = buildString { + append("CameraAvSettingsUserLevelManagementClusterViewportStruct {\n") + append("\tx1 : $x1\n") + append("\ty1 : $y1\n") + append("\tx2 : $x2\n") + append("\ty2 : $y2\n") + append("}\n") + } + + fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) { + tlvWriter.apply { + startStructure(tlvTag) + put(ContextSpecificTag(TAG_X1), x1) + put(ContextSpecificTag(TAG_Y1), y1) + put(ContextSpecificTag(TAG_X2), x2) + put(ContextSpecificTag(TAG_Y2), y2) + endStructure() + } + } + + companion object { + private const val TAG_X1 = 0 + private const val TAG_Y1 = 1 + private const val TAG_X2 = 2 + private const val TAG_Y2 = 3 + + fun fromTlv( + tlvTag: Tag, + tlvReader: TlvReader, + ): CameraAvSettingsUserLevelManagementClusterViewportStruct { + tlvReader.enterStructure(tlvTag) + val x1 = tlvReader.getUShort(ContextSpecificTag(TAG_X1)) + val y1 = tlvReader.getUShort(ContextSpecificTag(TAG_Y1)) + val x2 = tlvReader.getUShort(ContextSpecificTag(TAG_X2)) + val y2 = tlvReader.getUShort(ContextSpecificTag(TAG_Y2)) + + tlvReader.exitContainer() + + return CameraAvSettingsUserLevelManagementClusterViewportStruct(x1, y1, x2, y2) + } + } +} diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index c49674fbbefe7e..3c1f7fb0ef6064 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -41745,6 +41745,468 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } + case app::Clusters::CameraAvSettingsUserLevelManagement::Id: { + using namespace app::Clusters::CameraAvSettingsUserLevelManagement; + switch (aPath.mAttributeId) + { + case Attributes::MptzPosition::Id: { + using TypeInfo = Attributes::MptzPosition::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + jobject value_pan; + if (!cppValue.pan.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, value_pan); + } + else + { + jobject value_panInsideOptional; + std::string value_panInsideOptionalClassName = "java/lang/Integer"; + std::string value_panInsideOptionalCtorSignature = "(I)V"; + jint jnivalue_panInsideOptional = static_cast(cppValue.pan.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject(value_panInsideOptionalClassName.c_str(), + value_panInsideOptionalCtorSignature.c_str(), + jnivalue_panInsideOptional, value_panInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(value_panInsideOptional, value_pan); + } + jobject value_tilt; + if (!cppValue.tilt.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, value_tilt); + } + else + { + jobject value_tiltInsideOptional; + std::string value_tiltInsideOptionalClassName = "java/lang/Integer"; + std::string value_tiltInsideOptionalCtorSignature = "(I)V"; + jint jnivalue_tiltInsideOptional = static_cast(cppValue.tilt.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject(value_tiltInsideOptionalClassName.c_str(), + value_tiltInsideOptionalCtorSignature.c_str(), + jnivalue_tiltInsideOptional, value_tiltInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(value_tiltInsideOptional, value_tilt); + } + jobject value_zoom; + if (!cppValue.zoom.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, value_zoom); + } + else + { + jobject value_zoomInsideOptional; + std::string value_zoomInsideOptionalClassName = "java/lang/Integer"; + std::string value_zoomInsideOptionalCtorSignature = "(I)V"; + jint jnivalue_zoomInsideOptional = static_cast(cppValue.zoom.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject(value_zoomInsideOptionalClassName.c_str(), + value_zoomInsideOptionalCtorSignature.c_str(), + jnivalue_zoomInsideOptional, value_zoomInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(value_zoomInsideOptional, value_zoom); + } + + { + jclass MPTZStructStructClass_0; + err = chip::JniReferences::GetInstance().GetLocalClassRef( + env, "chip/devicecontroller/ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct", + MPTZStructStructClass_0); + if (err != CHIP_NO_ERROR) + { + ChipLogError(Zcl, "Could not find class ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct"); + return nullptr; + } + + jmethodID MPTZStructStructCtor_0; + err = chip::JniReferences::GetInstance().FindMethod( + env, MPTZStructStructClass_0, "", "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", + &MPTZStructStructCtor_0); + if (err != CHIP_NO_ERROR || MPTZStructStructCtor_0 == nullptr) + { + ChipLogError(Zcl, + "Could not find ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct constructor"); + return nullptr; + } + + value = env->NewObject(MPTZStructStructClass_0, MPTZStructStructCtor_0, value_pan, value_tilt, value_zoom); + } + return value; + } + case Attributes::MaxPresets::Id: { + using TypeInfo = Attributes::MaxPresets::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + case Attributes::MptzPresets::Id: { + using TypeInfo = Attributes::MptzPresets::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + chip::JniReferences::GetInstance().CreateArrayList(value); + + auto iter_value_0 = cppValue.begin(); + while (iter_value_0.Next()) + { + auto & entry_0 = iter_value_0.GetValue(); + jobject newElement_0; + jobject newElement_0_presetID; + std::string newElement_0_presetIDClassName = "java/lang/Integer"; + std::string newElement_0_presetIDCtorSignature = "(I)V"; + jint jninewElement_0_presetID = static_cast(entry_0.presetID); + chip::JniReferences::GetInstance().CreateBoxedObject(newElement_0_presetIDClassName.c_str(), + newElement_0_presetIDCtorSignature.c_str(), + jninewElement_0_presetID, newElement_0_presetID); + jobject newElement_0_name; + LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name)); + jobject newElement_0_values; + jobject newElement_0_values_pan; + if (!entry_0.values.pan.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_pan); + } + else + { + jobject newElement_0_values_panInsideOptional; + std::string newElement_0_values_panInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_values_panInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_values_panInsideOptional = static_cast(entry_0.values.pan.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0_values_panInsideOptionalClassName.c_str(), + newElement_0_values_panInsideOptionalCtorSignature.c_str(), jninewElement_0_values_panInsideOptional, + newElement_0_values_panInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_panInsideOptional, + newElement_0_values_pan); + } + jobject newElement_0_values_tilt; + if (!entry_0.values.tilt.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_tilt); + } + else + { + jobject newElement_0_values_tiltInsideOptional; + std::string newElement_0_values_tiltInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_values_tiltInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_values_tiltInsideOptional = static_cast(entry_0.values.tilt.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0_values_tiltInsideOptionalClassName.c_str(), + newElement_0_values_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_values_tiltInsideOptional, + newElement_0_values_tiltInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_tiltInsideOptional, + newElement_0_values_tilt); + } + jobject newElement_0_values_zoom; + if (!entry_0.values.zoom.HasValue()) + { + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_zoom); + } + else + { + jobject newElement_0_values_zoomInsideOptional; + std::string newElement_0_values_zoomInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_values_zoomInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_values_zoomInsideOptional = static_cast(entry_0.values.zoom.Value()); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0_values_zoomInsideOptionalClassName.c_str(), + newElement_0_values_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_values_zoomInsideOptional, + newElement_0_values_zoomInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_zoomInsideOptional, + newElement_0_values_zoom); + } + + { + jclass MPTZStructStructClass_2; + err = chip::JniReferences::GetInstance().GetLocalClassRef( + env, "chip/devicecontroller/ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct", + MPTZStructStructClass_2); + if (err != CHIP_NO_ERROR) + { + ChipLogError(Zcl, "Could not find class ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct"); + return nullptr; + } + + jmethodID MPTZStructStructCtor_2; + err = chip::JniReferences::GetInstance().FindMethod( + env, MPTZStructStructClass_2, "", "(Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V", + &MPTZStructStructCtor_2); + if (err != CHIP_NO_ERROR || MPTZStructStructCtor_2 == nullptr) + { + ChipLogError(Zcl, + "Could not find ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct constructor"); + return nullptr; + } + + newElement_0_values = env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_values_pan, + newElement_0_values_tilt, newElement_0_values_zoom); + } + + { + jclass MPTZPresetStructStructClass_1; + err = chip::JniReferences::GetInstance().GetLocalClassRef( + env, "chip/devicecontroller/ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct", + MPTZPresetStructStructClass_1); + if (err != CHIP_NO_ERROR) + { + ChipLogError(Zcl, + "Could not find class ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct"); + return nullptr; + } + + jmethodID MPTZPresetStructStructCtor_1; + err = chip::JniReferences::GetInstance().FindMethod( + env, MPTZPresetStructStructClass_1, "", + "(Ljava/lang/Integer;Ljava/lang/String;Lchip/devicecontroller/" + "ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZStruct;)V", + &MPTZPresetStructStructCtor_1); + if (err != CHIP_NO_ERROR || MPTZPresetStructStructCtor_1 == nullptr) + { + ChipLogError( + Zcl, + "Could not find ChipStructs$CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct constructor"); + return nullptr; + } + + newElement_0 = env->NewObject(MPTZPresetStructStructClass_1, MPTZPresetStructStructCtor_1, + newElement_0_presetID, newElement_0_name, newElement_0_values); + } + chip::JniReferences::GetInstance().AddToList(value, newElement_0); + } + return value; + } + case Attributes::DptzRelativeMove::Id: { + using TypeInfo = Attributes::DptzRelativeMove::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + chip::JniReferences::GetInstance().CreateArrayList(value); + + auto iter_value_0 = cppValue.begin(); + while (iter_value_0.Next()) + { + auto & entry_0 = iter_value_0.GetValue(); + jobject newElement_0; + std::string newElement_0ClassName = "java/lang/Integer"; + std::string newElement_0CtorSignature = "(I)V"; + jint jninewElement_0 = static_cast(entry_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0); + chip::JniReferences::GetInstance().AddToList(value, newElement_0); + } + return value; + } + case Attributes::ZoomMax::Id: { + using TypeInfo = Attributes::ZoomMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + case Attributes::TiltMin::Id: { + using TypeInfo = Attributes::TiltMin::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + case Attributes::TiltMax::Id: { + using TypeInfo = Attributes::TiltMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + case Attributes::PanMin::Id: { + using TypeInfo = Attributes::PanMin::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + case Attributes::PanMax::Id: { + using TypeInfo = Attributes::PanMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + case Attributes::GeneratedCommandList::Id: { + using TypeInfo = Attributes::GeneratedCommandList::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + chip::JniReferences::GetInstance().CreateArrayList(value); + + auto iter_value_0 = cppValue.begin(); + while (iter_value_0.Next()) + { + auto & entry_0 = iter_value_0.GetValue(); + jobject newElement_0; + std::string newElement_0ClassName = "java/lang/Long"; + std::string newElement_0CtorSignature = "(J)V"; + jlong jninewElement_0 = static_cast(entry_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0); + chip::JniReferences::GetInstance().AddToList(value, newElement_0); + } + return value; + } + case Attributes::AcceptedCommandList::Id: { + using TypeInfo = Attributes::AcceptedCommandList::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + chip::JniReferences::GetInstance().CreateArrayList(value); + + auto iter_value_0 = cppValue.begin(); + while (iter_value_0.Next()) + { + auto & entry_0 = iter_value_0.GetValue(); + jobject newElement_0; + std::string newElement_0ClassName = "java/lang/Long"; + std::string newElement_0CtorSignature = "(J)V"; + jlong jninewElement_0 = static_cast(entry_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0); + chip::JniReferences::GetInstance().AddToList(value, newElement_0); + } + return value; + } + case Attributes::AttributeList::Id: { + using TypeInfo = Attributes::AttributeList::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + chip::JniReferences::GetInstance().CreateArrayList(value); + + auto iter_value_0 = cppValue.begin(); + while (iter_value_0.Next()) + { + auto & entry_0 = iter_value_0.GetValue(); + jobject newElement_0; + std::string newElement_0ClassName = "java/lang/Long"; + std::string newElement_0CtorSignature = "(J)V"; + jlong jninewElement_0 = static_cast(entry_0); + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_0ClassName.c_str(), newElement_0CtorSignature.c_str(), jninewElement_0, newElement_0); + chip::JniReferences::GetInstance().AddToList(value, newElement_0); + } + return value; + } + case Attributes::FeatureMap::Id: { + using TypeInfo = Attributes::FeatureMap::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Long"; + std::string valueCtorSignature = "(J)V"; + jlong jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), + jnivalue, value); + return value; + } + case Attributes::ClusterRevision::Id: { + using TypeInfo = Attributes::ClusterRevision::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + jint jnivalue = static_cast(cppValue); + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), jnivalue, + value); + return value; + } + default: + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; + break; + } + break; + } case app::Clusters::WebRTCTransportProvider::Id: { using namespace app::Clusters::WebRTCTransportProvider; switch (aPath.mAttributeId) diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index fdb5c9fb6589f7..c7474a956151bd 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -9089,6 +9089,16 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } + case app::Clusters::CameraAvSettingsUserLevelManagement::Id: { + using namespace app::Clusters::CameraAvSettingsUserLevelManagement; + switch (aPath.mEventId) + { + default: + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; + break; + } + break; + } case app::Clusters::WebRTCTransportProvider::Id: { using namespace app::Clusters::WebRTCTransportProvider; switch (aPath.mEventId) diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 395506b33bb843..f3e62f7a3a3a09 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -12843,6 +12843,156 @@ class ChipClusters: }, }, } + _CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_INFO = { + "clusterName": "CameraAvSettingsUserLevelManagement", + "clusterId": 0x00000552, + "commands": { + 0x00000000: { + "commandId": 0x00000000, + "commandName": "MptzSetPosition", + "args": { + "pan": "int", + "tilt": "int", + "zoom": "int", + }, + }, + 0x00000001: { + "commandId": 0x00000001, + "commandName": "MptzRelativeMove", + "args": { + "panDelta": "int", + "tiltDelta": "int", + "zoomDelta": "int", + }, + }, + 0x00000002: { + "commandId": 0x00000002, + "commandName": "MptzMoveToPreset", + "args": { + "presetID": "int", + }, + }, + 0x00000003: { + "commandId": 0x00000003, + "commandName": "MptzSavePreset", + "args": { + "presetID": "int", + "name": "str", + }, + }, + 0x00000004: { + "commandId": 0x00000004, + "commandName": "MptzRemovePreset", + "args": { + "presetID": "int", + }, + }, + 0x00000005: { + "commandId": 0x00000005, + "commandName": "DptzSetViewport", + "args": { + "videoStreamID": "int", + "viewport": "ViewportStruct", + }, + }, + 0x00000006: { + "commandId": 0x00000006, + "commandName": "DptzRelativeMove", + "args": { + "videoStreamID": "int", + "deltaX": "int", + "deltaY": "int", + "zoomDelta": "int", + }, + }, + }, + "attributes": { + 0x00000000: { + "attributeName": "MptzPosition", + "attributeId": 0x00000000, + "type": "", + "reportable": True, + }, + 0x00000001: { + "attributeName": "MaxPresets", + "attributeId": 0x00000001, + "type": "int", + "reportable": True, + }, + 0x00000002: { + "attributeName": "MptzPresets", + "attributeId": 0x00000002, + "type": "", + "reportable": True, + }, + 0x00000003: { + "attributeName": "DptzRelativeMove", + "attributeId": 0x00000003, + "type": "int", + "reportable": True, + }, + 0x00000004: { + "attributeName": "ZoomMax", + "attributeId": 0x00000004, + "type": "int", + "reportable": True, + }, + 0x00000005: { + "attributeName": "TiltMin", + "attributeId": 0x00000005, + "type": "int", + "reportable": True, + }, + 0x00000006: { + "attributeName": "TiltMax", + "attributeId": 0x00000006, + "type": "int", + "reportable": True, + }, + 0x00000007: { + "attributeName": "PanMin", + "attributeId": 0x00000007, + "type": "int", + "reportable": True, + }, + 0x00000008: { + "attributeName": "PanMax", + "attributeId": 0x00000008, + "type": "int", + "reportable": True, + }, + 0x0000FFF8: { + "attributeName": "GeneratedCommandList", + "attributeId": 0x0000FFF8, + "type": "int", + "reportable": True, + }, + 0x0000FFF9: { + "attributeName": "AcceptedCommandList", + "attributeId": 0x0000FFF9, + "type": "int", + "reportable": True, + }, + 0x0000FFFB: { + "attributeName": "AttributeList", + "attributeId": 0x0000FFFB, + "type": "int", + "reportable": True, + }, + 0x0000FFFC: { + "attributeName": "FeatureMap", + "attributeId": 0x0000FFFC, + "type": "int", + "reportable": True, + }, + 0x0000FFFD: { + "attributeName": "ClusterRevision", + "attributeId": 0x0000FFFD, + "type": "int", + "reportable": True, + }, + }, + } _WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_INFO = { "clusterName": "WebRTCTransportProvider", "clusterId": 0x00000553, @@ -14299,6 +14449,7 @@ class ChipClusters: 0x00000510: _CONTENT_APP_OBSERVER_CLUSTER_INFO, 0x00000550: _ZONE_MANAGEMENT_CLUSTER_INFO, 0x00000551: _CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_INFO, + 0x00000552: _CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_INFO, 0x00000553: _WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_INFO, 0x00000554: _WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_INFO, 0x00000556: _CHIME_CLUSTER_INFO, @@ -14429,6 +14580,7 @@ class ChipClusters: "ContentAppObserver": _CONTENT_APP_OBSERVER_CLUSTER_INFO, "ZoneManagement": _ZONE_MANAGEMENT_CLUSTER_INFO, "CameraAvStreamManagement": _CAMERA_AV_STREAM_MANAGEMENT_CLUSTER_INFO, + "CameraAvSettingsUserLevelManagement": _CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER_INFO, "WebRTCTransportProvider": _WEB_RTC_TRANSPORT_PROVIDER_CLUSTER_INFO, "WebRTCTransportRequestor": _WEB_RTC_TRANSPORT_REQUESTOR_CLUSTER_INFO, "Chime": _CHIME_CLUSTER_INFO, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 0cdc2a54549cce..e1a4e3cfcd9f24 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -159,6 +159,7 @@ "ContentAppObserver", "ZoneManagement", "CameraAvStreamManagement", + "CameraAvSettingsUserLevelManagement", "WebRTCTransportProvider", "WebRTCTransportRequestor", "Chime", @@ -46399,6 +46400,458 @@ def descriptor(cls) -> ClusterObjectDescriptor: quality: typing.Optional[uint] = None +@dataclass +class CameraAvSettingsUserLevelManagement(Cluster): + id: typing.ClassVar[int] = 0x00000552 + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="mptzPosition", Tag=0x00000000, Type=typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct]), + ClusterObjectFieldDescriptor(Label="maxPresets", Tag=0x00000001, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="mptzPresets", Tag=0x00000002, Type=typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]]), + ClusterObjectFieldDescriptor(Label="dptzRelativeMove", Tag=0x00000003, Type=typing.Optional[typing.List[uint]]), + ClusterObjectFieldDescriptor(Label="zoomMax", Tag=0x00000004, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="tiltMin", Tag=0x00000005, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="tiltMax", Tag=0x00000006, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="panMin", Tag=0x00000007, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="panMax", Tag=0x00000008, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="attributeList", Tag=0x0000FFFB, Type=typing.List[uint]), + ClusterObjectFieldDescriptor(Label="featureMap", Tag=0x0000FFFC, Type=uint), + ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), + ]) + + mptzPosition: typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct] = None + maxPresets: typing.Optional[uint] = None + mptzPresets: typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]] = None + dptzRelativeMove: typing.Optional[typing.List[uint]] = None + zoomMax: typing.Optional[uint] = None + tiltMin: typing.Optional[int] = None + tiltMax: typing.Optional[int] = None + panMin: typing.Optional[int] = None + panMax: typing.Optional[int] = None + generatedCommandList: typing.List[uint] = field(default_factory=lambda: []) + acceptedCommandList: typing.List[uint] = field(default_factory=lambda: []) + attributeList: typing.List[uint] = field(default_factory=lambda: []) + featureMap: uint = 0 + clusterRevision: uint = 0 + + class Bitmaps: + class Feature(IntFlag): + kDigitalPTZ = 0x1 + kMechanicalPan = 0x2 + kMechanicalTilt = 0x4 + kMechanicalZoom = 0x8 + kMechanicalPresets = 0x10 + + class Structs: + @dataclass + class MPTZStruct(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="pan", Tag=2, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="tilt", Tag=3, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="zoom", Tag=4, Type=typing.Optional[uint]), + ]) + + pan: 'typing.Optional[int]' = None + tilt: 'typing.Optional[int]' = None + zoom: 'typing.Optional[uint]' = None + + @dataclass + class MPTZPresetStruct(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str), + ClusterObjectFieldDescriptor(Label="values", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), + ]) + + presetID: 'uint' = 0 + name: 'str' = "" + values: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) + + @dataclass + class ViewportStruct(ClusterObject): + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="x1", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="y1", Tag=1, Type=uint), + ClusterObjectFieldDescriptor(Label="x2", Tag=2, Type=uint), + ClusterObjectFieldDescriptor(Label="y2", Tag=3, Type=uint), + ]) + + x1: 'uint' = 0 + y1: 'uint' = 0 + x2: 'uint' = 0 + y2: 'uint' = 0 + + class Commands: + @dataclass + class MptzSetPosition(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000000 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="pan", Tag=0, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="tilt", Tag=1, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="zoom", Tag=2, Type=typing.Optional[uint]), + ]) + + pan: typing.Optional[int] = None + tilt: typing.Optional[int] = None + zoom: typing.Optional[uint] = None + + @dataclass + class MptzRelativeMove(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000001 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="panDelta", Tag=0, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="tiltDelta", Tag=1, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="zoomDelta", Tag=2, Type=typing.Optional[int]), + ]) + + panDelta: typing.Optional[int] = None + tiltDelta: typing.Optional[int] = None + zoomDelta: typing.Optional[int] = None + + @dataclass + class MptzMoveToPreset(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000002 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=uint), + ]) + + presetID: uint = 0 + + @dataclass + class MptzSavePreset(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000003 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str), + ]) + + presetID: typing.Optional[uint] = None + name: str = "" + + @dataclass + class MptzRemovePreset(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000004 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=uint), + ]) + + presetID: uint = 0 + + @dataclass + class DptzSetViewport(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000005 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="videoStreamID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="viewport", Tag=1, Type=CameraAvSettingsUserLevelManagement.Structs.ViewportStruct), + ]) + + videoStreamID: uint = 0 + viewport: CameraAvSettingsUserLevelManagement.Structs.ViewportStruct = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.ViewportStruct()) + + @dataclass + class DptzRelativeMove(ClusterCommand): + cluster_id: typing.ClassVar[int] = 0x00000552 + command_id: typing.ClassVar[int] = 0x00000006 + is_client: typing.ClassVar[bool] = True + response_type: typing.ClassVar[typing.Optional[str]] = None + + @ChipUtility.classproperty + def descriptor(cls) -> ClusterObjectDescriptor: + return ClusterObjectDescriptor( + Fields=[ + ClusterObjectFieldDescriptor(Label="videoStreamID", Tag=0, Type=uint), + ClusterObjectFieldDescriptor(Label="deltaX", Tag=1, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="deltaY", Tag=2, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="zoomDelta", Tag=3, Type=typing.Optional[int]), + ]) + + videoStreamID: uint = 0 + deltaX: typing.Optional[int] = None + deltaY: typing.Optional[int] = None + zoomDelta: typing.Optional[int] = None + + class Attributes: + @dataclass + class MptzPosition(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000000 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct]) + + value: typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct] = None + + @dataclass + class MaxPresets(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000001 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: typing.Optional[uint] = None + + @dataclass + class MptzPresets(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000002 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]]) + + value: typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]] = None + + @dataclass + class DptzRelativeMove(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000003 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[typing.List[uint]]) + + value: typing.Optional[typing.List[uint]] = None + + @dataclass + class ZoomMax(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000004 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[uint]) + + value: typing.Optional[uint] = None + + @dataclass + class TiltMin(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000005 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + + value: typing.Optional[int] = None + + @dataclass + class TiltMax(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000006 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + + value: typing.Optional[int] = None + + @dataclass + class PanMin(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000007 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + + value: typing.Optional[int] = None + + @dataclass + class PanMax(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000008 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Optional[int]) + + value: typing.Optional[int] = None + + @dataclass + class GeneratedCommandList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFF8 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: typing.List[uint] = field(default_factory=lambda: []) + + @dataclass + class AcceptedCommandList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFF9 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: typing.List[uint] = field(default_factory=lambda: []) + + @dataclass + class AttributeList(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFB + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.List[uint]) + + value: typing.List[uint] = field(default_factory=lambda: []) + + @dataclass + class FeatureMap(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFC + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: uint = 0 + + @dataclass + class ClusterRevision(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x00000552 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x0000FFFD + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=uint) + + value: uint = 0 + + @dataclass class WebRTCTransportProvider(Cluster): id: typing.ClassVar[int] = 0x00000553 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm index 5495d6a9d7a0ca..eb650e33219064 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm @@ -5756,6 +5756,57 @@ static BOOL AttributeIsSpecifiedInCameraAVStreamManagementCluster(AttributeId aA } } } +static BOOL AttributeIsSpecifiedInCameraAVSettingsUserLevelManagementCluster(AttributeId aAttributeId) +{ + using namespace Clusters::CameraAvSettingsUserLevelManagement; + switch (aAttributeId) { + case Attributes::MptzPosition::Id: { + return YES; + } + case Attributes::MaxPresets::Id: { + return YES; + } + case Attributes::MptzPresets::Id: { + return YES; + } + case Attributes::DptzRelativeMove::Id: { + return YES; + } + case Attributes::ZoomMax::Id: { + return YES; + } + case Attributes::TiltMin::Id: { + return YES; + } + case Attributes::TiltMax::Id: { + return YES; + } + case Attributes::PanMin::Id: { + return YES; + } + case Attributes::PanMax::Id: { + return YES; + } + case Attributes::GeneratedCommandList::Id: { + return YES; + } + case Attributes::AcceptedCommandList::Id: { + return YES; + } + case Attributes::AttributeList::Id: { + return YES; + } + case Attributes::FeatureMap::Id: { + return YES; + } + case Attributes::ClusterRevision::Id: { + return YES; + } + default: { + return NO; + } + } +} static BOOL AttributeIsSpecifiedInWebRTCTransportProviderCluster(AttributeId aAttributeId) { using namespace Clusters::WebRTCTransportProvider; @@ -6570,6 +6621,9 @@ BOOL MTRAttributeIsSpecified(ClusterId aClusterId, AttributeId aAttributeId) case Clusters::CameraAvStreamManagement::Id: { return AttributeIsSpecifiedInCameraAVStreamManagementCluster(aAttributeId); } + case Clusters::CameraAvSettingsUserLevelManagement::Id: { + return AttributeIsSpecifiedInCameraAVSettingsUserLevelManagementCluster(aAttributeId); + } case Clusters::WebRTCTransportProvider::Id: { return AttributeIsSpecifiedInWebRTCTransportProviderCluster(aAttributeId); } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index b894c30f6cfc8e..cd548060352281 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -17721,6 +17721,185 @@ static id _Nullable DecodeAttributeValueForCameraAVStreamManagementCluster(Attri *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; return nil; } +static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) +{ + using namespace Clusters::CameraAvSettingsUserLevelManagement; + switch (aAttributeId) { + case Attributes::MptzPosition::Id: { + using TypeInfo = Attributes::MptzPosition::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull value; + value = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + if (cppValue.pan.HasValue()) { + value.pan = [NSNumber numberWithShort:cppValue.pan.Value()]; + } else { + value.pan = nil; + } + if (cppValue.tilt.HasValue()) { + value.tilt = [NSNumber numberWithShort:cppValue.tilt.Value()]; + } else { + value.tilt = nil; + } + if (cppValue.zoom.HasValue()) { + value.zoom = [NSNumber numberWithUnsignedChar:cppValue.zoom.Value()]; + } else { + value.zoom = nil; + } + return value; + } + case Attributes::MaxPresets::Id: { + using TypeInfo = Attributes::MaxPresets::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithUnsignedChar:cppValue]; + return value; + } + case Attributes::MptzPresets::Id: { + using TypeInfo = Attributes::MptzPresets::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSArray * _Nonnull value; + { // Scope for our temporary variables + auto * array_0 = [NSMutableArray new]; + auto iter_0 = cppValue.begin(); + while (iter_0.Next()) { + auto & entry_0 = iter_0.GetValue(); + MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct * newElement_0; + newElement_0 = [MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct new]; + newElement_0.presetID = [NSNumber numberWithUnsignedChar:entry_0.presetID]; + newElement_0.name = AsString(entry_0.name); + if (newElement_0.name == nil) { + CHIP_ERROR err = CHIP_ERROR_INVALID_ARGUMENT; + *aError = err; + return nil; + } + newElement_0.values = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + if (entry_0.values.pan.HasValue()) { + newElement_0.values.pan = [NSNumber numberWithShort:entry_0.values.pan.Value()]; + } else { + newElement_0.values.pan = nil; + } + if (entry_0.values.tilt.HasValue()) { + newElement_0.values.tilt = [NSNumber numberWithShort:entry_0.values.tilt.Value()]; + } else { + newElement_0.values.tilt = nil; + } + if (entry_0.values.zoom.HasValue()) { + newElement_0.values.zoom = [NSNumber numberWithUnsignedChar:entry_0.values.zoom.Value()]; + } else { + newElement_0.values.zoom = nil; + } + [array_0 addObject:newElement_0]; + } + CHIP_ERROR err = iter_0.GetStatus(); + if (err != CHIP_NO_ERROR) { + *aError = err; + return nil; + } + value = array_0; + } + return value; + } + case Attributes::DptzRelativeMove::Id: { + using TypeInfo = Attributes::DptzRelativeMove::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSArray * _Nonnull value; + { // Scope for our temporary variables + auto * array_0 = [NSMutableArray new]; + auto iter_0 = cppValue.begin(); + while (iter_0.Next()) { + auto & entry_0 = iter_0.GetValue(); + NSNumber * newElement_0; + newElement_0 = [NSNumber numberWithUnsignedShort:entry_0]; + [array_0 addObject:newElement_0]; + } + CHIP_ERROR err = iter_0.GetStatus(); + if (err != CHIP_NO_ERROR) { + *aError = err; + return nil; + } + value = array_0; + } + return value; + } + case Attributes::ZoomMax::Id: { + using TypeInfo = Attributes::ZoomMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithUnsignedChar:cppValue]; + return value; + } + case Attributes::TiltMin::Id: { + using TypeInfo = Attributes::TiltMin::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithShort:cppValue]; + return value; + } + case Attributes::TiltMax::Id: { + using TypeInfo = Attributes::TiltMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithShort:cppValue]; + return value; + } + case Attributes::PanMin::Id: { + using TypeInfo = Attributes::PanMin::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithShort:cppValue]; + return value; + } + case Attributes::PanMax::Id: { + using TypeInfo = Attributes::PanMax::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nonnull value; + value = [NSNumber numberWithShort:cppValue]; + return value; + } + default: { + break; + } + } + + *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; + return nil; +} static id _Nullable DecodeAttributeValueForWebRTCTransportProviderCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { using namespace Clusters::WebRTCTransportProvider; @@ -20009,6 +20188,9 @@ id _Nullable MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::T case Clusters::CameraAvStreamManagement::Id: { return DecodeAttributeValueForCameraAVStreamManagementCluster(aPath.mAttributeId, aReader, aError); } + case Clusters::CameraAvSettingsUserLevelManagement::Id: { + return DecodeAttributeValueForCameraAVSettingsUserLevelManagementCluster(aPath.mAttributeId, aReader, aError); + } case Clusters::WebRTCTransportProvider::Id: { return DecodeAttributeValueForWebRTCTransportProviderCluster(aPath.mAttributeId, aReader, aError); } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index d3f7ba442b3c80..1abe93f0821d09 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14599,6 +14599,162 @@ MTR_PROVISIONALLY_AVAILABLE @end +/** + * Cluster Camera AV Settings User Level Management + * + * This cluster provides an interface into controls associated with the operation of a device that provides pan, tilt, and zoom functions, either mechanically, or against a digital image. + */ +MTR_PROVISIONALLY_AVAILABLE +@interface MTRBaseClusterCameraAVSettingsUserLevelManagement : MTRGenericBaseCluster + +/** + * Command MptzSetPosition + * + * This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. + */ +- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzSetPositionWithCompletion:(MTRStatusCompletion)completion + MTR_PROVISIONALLY_AVAILABLE; +/** + * Command MptzRelativeMove + * + * This command SHALL move the device by the delta values relative to the currently defined position. + */ +- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzRelativeMoveWithCompletion:(MTRStatusCompletion)completion + MTR_PROVISIONALLY_AVAILABLE; +/** + * Command MptzMoveToPreset + * + * This command SHALL move the camera to the positions specified by the Preset passed. + */ +- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +/** + * Command MptzSavePreset + * + * This command allows creating a new preset or updating the values of an existing one. + */ +- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +/** + * Command MptzRemovePreset + * + * This command SHALL remove a preset entry from the PresetMptzTable. + */ +- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +/** + * Command DptzSetViewport + * + * This command allows for setting the digital viewport for a specific Video Stream. + */ +- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +/** + * Command DptzRelativeMove + * + * This command SHALL change the viewports location by the amount specified in a relative fashion. + */ +- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeMptzPositionWithCompletion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeMptzPositionWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeMptzPositionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeMaxPresetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeMaxPresetsWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeMaxPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeMptzPresetsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeMptzPresetsWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeMptzPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeDptzRelativeMoveWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeDptzRelativeMoveWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeDptzRelativeMoveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeZoomMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeZoomMaxWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeZoomMaxWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeTiltMinWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeTiltMinWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeTiltMinWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeTiltMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeTiltMaxWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeTiltMaxWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributePanMinWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributePanMinWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributePanMinWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributePanMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributePanMaxWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributePanMaxWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; + +- (instancetype)init NS_UNAVAILABLE; ++ (instancetype)new NS_UNAVAILABLE; + +@end + +@interface MTRBaseClusterCameraAVSettingsUserLevelManagement (Availability) + +/** + * For all instance methods (reads, writes, commands) that take a completion, + * the completion will be called on the provided queue. + */ +- (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device + endpointID:(NSNumber *)endpointID + queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE; + +@end + /** * Cluster WebRTC Transport Provider * @@ -20246,6 +20402,14 @@ typedef NS_OPTIONS(uint32_t, MTRCameraAVStreamManagementFeature) { MTRCameraAVStreamManagementFeatureLocalStorage MTR_PROVISIONALLY_AVAILABLE = 0x100, } MTR_PROVISIONALLY_AVAILABLE; +typedef NS_OPTIONS(uint32_t, MTRCameraAVSettingsUserLevelManagementFeature) { + MTRCameraAVSettingsUserLevelManagementFeatureDigitalPTZ MTR_PROVISIONALLY_AVAILABLE = 0x1, + MTRCameraAVSettingsUserLevelManagementFeatureMechanicalPan MTR_PROVISIONALLY_AVAILABLE = 0x2, + MTRCameraAVSettingsUserLevelManagementFeatureMechanicalTilt MTR_PROVISIONALLY_AVAILABLE = 0x4, + MTRCameraAVSettingsUserLevelManagementFeatureMechanicalZoom MTR_PROVISIONALLY_AVAILABLE = 0x8, + MTRCameraAVSettingsUserLevelManagementFeatureMechanicalPresets MTR_PROVISIONALLY_AVAILABLE = 0x10, +} MTR_PROVISIONALLY_AVAILABLE; + typedef NS_ENUM(uint8_t, MTRWebRTCTransportProviderStreamType) { MTRWebRTCTransportProviderStreamTypeInternal MTR_PROVISIONALLY_AVAILABLE = 0x00, MTRWebRTCTransportProviderStreamTypeRecording MTR_PROVISIONALLY_AVAILABLE = 0x01, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index eb2a2f5687c1f5..9b0dc231ef2afb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -100966,6 +100966,691 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC @end +@implementation MTRBaseClusterCameraAVSettingsUserLevelManagement + +- (void)mptzSetPositionWithCompletion:(MTRStatusCompletion)completion +{ + [self mptzSetPositionWithParams:nil completion:completion]; +} +- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} +- (void)mptzRelativeMoveWithCompletion:(MTRStatusCompletion)completion +{ + [self mptzRelativeMoveWithParams:nil completion:completion]; +} +- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} +- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} +- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} +- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} +- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} +- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)readAttributeMptzPositionWithCompletion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeMptzPositionWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeMptzPositionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeMaxPresetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeMaxPresetsWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeMaxPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeMptzPresetsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeMptzPresetsWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeMptzPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeDptzRelativeMoveWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeDptzRelativeMoveWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeDptzRelativeMoveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeZoomMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeZoomMaxWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeZoomMaxWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeTiltMinWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::TiltMin::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeTiltMinWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::TiltMin::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeTiltMinWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::TiltMin::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeTiltMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::TiltMax::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeTiltMaxWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::TiltMax::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeTiltMaxWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::TiltMax::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributePanMinWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::PanMin::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributePanMinWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::PanMin::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributePanMinWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::PanMin::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributePanMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::PanMax::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributePanMaxWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::PanMax::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributePanMaxWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::PanMax::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::AttributeList::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::AttributeList::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::AttributeList::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +- (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::TypeInfo; + [self.device _readKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:nil + queue:self.callbackQueue + completion:completion]; +} + +- (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::TypeInfo; + [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID + clusterID:@(TypeInfo::GetClusterId()) + attributeID:@(TypeInfo::GetAttributeId()) + params:params + queue:self.callbackQueue + reportHandler:reportHandler + subscriptionEstablished:subscriptionEstablished]; +} + ++ (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::TypeInfo; + [clusterStateCacheContainer + _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) + clusterID:TypeInfo::GetClusterId() + attributeID:TypeInfo::GetAttributeId() + queue:queue + completion:completion]; +} + +@end + @implementation MTRBaseClusterWebRTCTransportProvider - (void)solicitOfferWithParams:(MTRWebRTCTransportProviderClusterSolicitOfferParams *)params completion:(void (^)(MTRWebRTCTransportProviderClusterSolicitOfferResponseParams * _Nullable data, NSError * _Nullable error))completion diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index 7ee2c7d88af1c0..76628584795fd9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -199,6 +199,7 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTRClusterIDTypeContentAppObserverID MTR_PROVISIONALLY_AVAILABLE = 0x00000510, MTRClusterIDTypeZoneManagementID MTR_PROVISIONALLY_AVAILABLE = 0x00000550, MTRClusterIDTypeCameraAVStreamManagementID MTR_PROVISIONALLY_AVAILABLE = 0x00000551, + MTRClusterIDTypeCameraAVSettingsUserLevelManagementID MTR_PROVISIONALLY_AVAILABLE = 0x00000552, MTRClusterIDTypeWebRTCTransportProviderID MTR_PROVISIONALLY_AVAILABLE = 0x00000553, MTRClusterIDTypeWebRTCTransportRequestorID MTR_PROVISIONALLY_AVAILABLE = 0x00000554, MTRClusterIDTypeChimeID MTR_PROVISIONALLY_AVAILABLE = 0x00000556, @@ -4688,6 +4689,22 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID, MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, + // Cluster CameraAVSettingsUserLevelManagement attributes + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPositionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMaxPresetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPresetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDptzRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeZoomMaxID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMinID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMaxID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributePanMinID MTR_PROVISIONALLY_AVAILABLE = 0x00000007, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributePanMaxID MTR_PROVISIONALLY_AVAILABLE = 0x00000008, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeAcceptedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeAttributeListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeFeatureMapID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, + // Cluster WebRTCTransportProvider attributes MTRAttributeIDTypeClusterWebRTCTransportProviderAttributeCurrentSessionsID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, MTRAttributeIDTypeClusterWebRTCTransportProviderAttributeGeneratedCommandListID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, @@ -6930,6 +6947,15 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { MTRCommandIDTypeClusterCameraAVStreamManagementCommandSetImageFlipHorizontalID MTR_PROVISIONALLY_AVAILABLE = 0x0000000F, MTRCommandIDTypeClusterCameraAVStreamManagementCommandSetImageFlipVerticalID MTR_PROVISIONALLY_AVAILABLE = 0x00000010, + // Cluster CameraAVSettingsUserLevelManagement commands + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSetPositionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzMoveToPresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSavePresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRemovePresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzSetViewportID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + // Cluster WebRTCTransportProvider commands MTRCommandIDTypeClusterWebRTCTransportProviderCommandSolicitOfferID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, MTRCommandIDTypeClusterWebRTCTransportProviderCommandSolicitOfferResponseID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm index 08373371a7c5e2..1bdf4e3f3015e7 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm @@ -375,6 +375,9 @@ case MTRClusterIDTypeCameraAVStreamManagementID: result = @"CameraAVStreamManagement"; break; + case MTRClusterIDTypeCameraAVSettingsUserLevelManagementID: + result = @"CameraAVSettingsUserLevelManagement"; + break; case MTRClusterIDTypeWebRTCTransportProviderID: result = @"WebRTCTransportProvider"; break; @@ -7941,6 +7944,73 @@ } break; + case MTRClusterIDTypeCameraAVSettingsUserLevelManagementID: + + switch (attributeID) { + + // Cluster CameraAVSettingsUserLevelManagement attributes + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPositionID: + result = @"MptzPosition"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMaxPresetsID: + result = @"MaxPresets"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPresetsID: + result = @"MptzPresets"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDptzRelativeMoveID: + result = @"DptzRelativeMove"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeZoomMaxID: + result = @"ZoomMax"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMinID: + result = @"TiltMin"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMaxID: + result = @"TiltMax"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributePanMinID: + result = @"PanMin"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributePanMaxID: + result = @"PanMax"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeGeneratedCommandListID: + result = @"GeneratedCommandList"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeAcceptedCommandListID: + result = @"AcceptedCommandList"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeAttributeListID: + result = @"AttributeList"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeFeatureMapID: + result = @"FeatureMap"; + break; + + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeClusterRevisionID: + result = @"ClusterRevision"; + break; + + default: + result = [NSString stringWithFormat:@"", attributeID]; + break; + } + break; + case MTRClusterIDTypeWebRTCTransportProviderID: switch (attributeID) { @@ -10854,6 +10924,44 @@ } break; + case MTRClusterIDTypeCameraAVSettingsUserLevelManagementID: + + switch (commandID) { + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSetPositionID: + result = @"MptzSetPosition"; + break; + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRelativeMoveID: + result = @"MptzRelativeMove"; + break; + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzMoveToPresetID: + result = @"MptzMoveToPreset"; + break; + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSavePresetID: + result = @"MptzSavePreset"; + break; + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRemovePresetID: + result = @"MptzRemovePreset"; + break; + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzSetViewportID: + result = @"DptzSetViewport"; + break; + + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzRelativeMoveID: + result = @"DptzRelativeMove"; + break; + + default: + result = [NSString stringWithFormat:@"", commandID]; + break; + } + break; + case MTRClusterIDTypeWebRTCTransportProviderID: switch (commandID) { @@ -12566,6 +12674,16 @@ } break; + case MTRClusterIDTypeCameraAVSettingsUserLevelManagementID: + + switch (commandID) { + + default: + result = [NSString stringWithFormat:@"", commandID]; + break; + } + break; + case MTRClusterIDTypeWebRTCTransportProviderID: switch (commandID) { @@ -14397,6 +14515,16 @@ } break; + case MTRClusterIDTypeCameraAVSettingsUserLevelManagementID: + + switch (eventID) { + + default: + result = [NSString stringWithFormat:@"", eventID]; + break; + } + break; + case MTRClusterIDTypeWebRTCTransportProviderID: switch (eventID) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index d9ca769e250aaa..9902490f04ae7c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -6815,6 +6815,70 @@ MTR_PROVISIONALLY_AVAILABLE @end +/** + * Cluster Camera AV Settings User Level Management + * This cluster provides an interface into controls associated with the operation of a device that provides pan, tilt, and zoom functions, either mechanically, or against a digital image. + */ +MTR_PROVISIONALLY_AVAILABLE +@interface MTRClusterCameraAVSettingsUserLevelManagement : MTRGenericCluster + +- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzSetPositionWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion + MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzRelativeMoveWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion + MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeMptzPositionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeMaxPresetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeMptzPresetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeDptzRelativeMoveWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeZoomMaxWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeTiltMinWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeTiltMaxWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributePanMinWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributePanMaxWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (NSDictionary * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; + +- (instancetype)init NS_UNAVAILABLE; ++ (instancetype)new NS_UNAVAILABLE; + +@end + +@interface MTRClusterCameraAVSettingsUserLevelManagement (Availability) + +/** + * For all instance methods that take a completion (i.e. command invocations), + * the completion will be called on the provided queue. + */ +- (instancetype _Nullable)initWithDevice:(MTRDevice *)device + endpointID:(NSNumber *)endpointID + queue:(dispatch_queue_t)queue MTR_PROVISIONALLY_AVAILABLE; + +@end + /** * Cluster WebRTC Transport Provider * The WebRTC transport provider cluster provides a way for stream providers (e.g. Cameras) to stream or receive their data through WebRTC. diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 0923caca7cead0..864468927b6246 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -19939,6 +19939,277 @@ - (void)writeAttributeDepthSensorStatusWithValue:(NSDictionary * @end +@implementation MTRClusterCameraAVSettingsUserLevelManagement + +- (void)mptzSetPositionWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + [self mptzSetPositionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; +} +- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)mptzRelativeMoveWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + [self mptzRelativeMoveWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; +} +- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +{ + if (params == nil) { + params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams + alloc] init]; + } + + auto responseHandler = ^(id _Nullable response, NSError * _Nullable error) { + completion(error); + }; + + auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; + + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type; + [self.device _invokeKnownCommandWithEndpointID:self.endpointID + clusterID:@(RequestType::GetClusterId()) + commandID:@(RequestType::GetCommandId()) + commandPayload:params + expectedValues:expectedValues + expectedValueInterval:expectedValueIntervalMs + timedInvokeTimeout:timedInvokeTimeoutMs + serverSideProcessingTimeout:params.serverSideProcessingTimeout + responseClass:nil + queue:self.callbackQueue + completion:responseHandler]; +} + +- (NSDictionary * _Nullable)readAttributeMptzPositionWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPositionID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeMaxPresetsWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMaxPresetsID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeMptzPresetsWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPresetsID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeDptzRelativeMoveWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDptzRelativeMoveID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeZoomMaxWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeZoomMaxID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeTiltMinWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMinID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeTiltMaxWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMaxID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributePanMinWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributePanMinID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributePanMaxWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributePanMaxID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeGeneratedCommandListID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeAcceptedCommandListID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeAttributeListID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeFeatureMapID) params:params]; +} + +- (NSDictionary * _Nullable)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeClusterRevisionID) params:params]; +} + +@end + @implementation MTRClusterWebRTCTransportProvider - (void)solicitOfferWithParams:(MTRWebRTCTransportProviderClusterSolicitOfferParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(void (^)(MTRWebRTCTransportProviderClusterSolicitOfferResponseParams * _Nullable data, NSError * _Nullable error))completion diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 6a5580c95b88db..990c72edd51d8a 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -11515,6 +11515,234 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; @end +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nullable pan MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable tilt MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable zoom MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nullable panDelta MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable tiltDelta MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable zoomDelta MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nullable presetID MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nonnull videoStreamID MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterViewportStruct * _Nonnull viewport MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams : NSObject + +@property (nonatomic, copy) NSNumber * _Nonnull videoStreamID MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable deltaX MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable deltaY MTR_PROVISIONALLY_AVAILABLE; + +@property (nonatomic, copy) NSNumber * _Nullable zoomDelta MTR_PROVISIONALLY_AVAILABLE; +/** + * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; + +/** + * Controls how much time, in seconds, we will allow for the server to process the command. + * + * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. + * + * If nil, the framework will try to select an appropriate timeout value itself. + */ +@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; +@end + MTR_PROVISIONALLY_AVAILABLE @interface MTRWebRTCTransportProviderClusterSolicitOfferParams : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 2010627d89e7db..879a2361ea4b70 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -33479,6 +33479,646 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams +- (instancetype)init +{ + if (self = [super init]) { + + _pan = nil; + + _tilt = nil; + + _zoom = nil; + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams alloc] init]; + + other.pan = self.pan; + other.tilt = self.tilt; + other.zoom = self.zoom; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: pan:%@; tilt:%@; zoom:%@; >", NSStringFromClass([self class]), _pan, _tilt, _zoom]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type encodableStruct; + ListFreer listFreer; + { + if (self.pan != nil) { + auto & definedValue_0 = encodableStruct.pan.Emplace(); + definedValue_0 = self.pan.shortValue; + } + } + { + if (self.tilt != nil) { + auto & definedValue_0 = encodableStruct.tilt.Emplace(); + definedValue_0 = self.tilt.shortValue; + } + } + { + if (self.zoom != nil) { + auto & definedValue_0 = encodableStruct.zoom.Emplace(); + definedValue_0 = self.zoom.unsignedCharValue; + } + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams +- (instancetype)init +{ + if (self = [super init]) { + + _panDelta = nil; + + _tiltDelta = nil; + + _zoomDelta = nil; + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams alloc] init]; + + other.panDelta = self.panDelta; + other.tiltDelta = self.tiltDelta; + other.zoomDelta = self.zoomDelta; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: panDelta:%@; tiltDelta:%@; zoomDelta:%@; >", NSStringFromClass([self class]), _panDelta, _tiltDelta, _zoomDelta]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type encodableStruct; + ListFreer listFreer; + { + if (self.panDelta != nil) { + auto & definedValue_0 = encodableStruct.panDelta.Emplace(); + definedValue_0 = self.panDelta.shortValue; + } + } + { + if (self.tiltDelta != nil) { + auto & definedValue_0 = encodableStruct.tiltDelta.Emplace(); + definedValue_0 = self.tiltDelta.shortValue; + } + } + { + if (self.zoomDelta != nil) { + auto & definedValue_0 = encodableStruct.zoomDelta.Emplace(); + definedValue_0 = self.zoomDelta.charValue; + } + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams +- (instancetype)init +{ + if (self = [super init]) { + + _presetID = @(0); + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams alloc] init]; + + other.presetID = self.presetID; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; >", NSStringFromClass([self class]), _presetID]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type encodableStruct; + ListFreer listFreer; + { + encodableStruct.presetID = self.presetID.unsignedCharValue; + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams +- (instancetype)init +{ + if (self = [super init]) { + + _presetID = nil; + + _name = @""; + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams alloc] init]; + + other.presetID = self.presetID; + other.name = self.name; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; >", NSStringFromClass([self class]), _presetID, _name]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type encodableStruct; + ListFreer listFreer; + { + if (self.presetID != nil) { + auto & definedValue_0 = encodableStruct.presetID.Emplace(); + definedValue_0 = self.presetID.unsignedCharValue; + } + } + { + encodableStruct.name = AsCharSpan(self.name); + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams +- (instancetype)init +{ + if (self = [super init]) { + + _presetID = @(0); + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams alloc] init]; + + other.presetID = self.presetID; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; >", NSStringFromClass([self class]), _presetID]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type encodableStruct; + ListFreer listFreer; + { + encodableStruct.presetID = self.presetID.unsignedCharValue; + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams +- (instancetype)init +{ + if (self = [super init]) { + + _videoStreamID = @(0); + + _viewport = [MTRCameraAVSettingsUserLevelManagementClusterViewportStruct new]; + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams alloc] init]; + + other.videoStreamID = self.videoStreamID; + other.viewport = self.viewport; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: videoStreamID:%@; viewport:%@; >", NSStringFromClass([self class]), _videoStreamID, _viewport]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type encodableStruct; + ListFreer listFreer; + { + encodableStruct.videoStreamID = self.videoStreamID.unsignedShortValue; + } + { + encodableStruct.viewport.x1 = self.viewport.x1.unsignedShortValue; + encodableStruct.viewport.y1 = self.viewport.y1.unsignedShortValue; + encodableStruct.viewport.x2 = self.viewport.x2.unsignedShortValue; + encodableStruct.viewport.y2 = self.viewport.y2.unsignedShortValue; + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams +- (instancetype)init +{ + if (self = [super init]) { + + _videoStreamID = @(0); + + _deltaX = nil; + + _deltaY = nil; + + _zoomDelta = nil; + _timedInvokeTimeoutMs = nil; + _serverSideProcessingTimeout = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone; +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams alloc] init]; + + other.videoStreamID = self.videoStreamID; + other.deltaX = self.deltaX; + other.deltaY = self.deltaY; + other.zoomDelta = self.zoomDelta; + other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; + other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: videoStreamID:%@; deltaX:%@; deltaY:%@; zoomDelta:%@; >", NSStringFromClass([self class]), _videoStreamID, _deltaX, _deltaY, _zoomDelta]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams (InternalMethods) + +- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader +{ + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type encodableStruct; + ListFreer listFreer; + { + encodableStruct.videoStreamID = self.videoStreamID.unsignedShortValue; + } + { + if (self.deltaX != nil) { + auto & definedValue_0 = encodableStruct.deltaX.Emplace(); + definedValue_0 = self.deltaX.shortValue; + } + } + { + if (self.deltaY != nil) { + auto & definedValue_0 = encodableStruct.deltaY.Emplace(); + definedValue_0 = self.deltaY.shortValue; + } + } + { + if (self.zoomDelta != nil) { + auto & definedValue_0 = encodableStruct.zoomDelta.Emplace(); + definedValue_0 = self.zoomDelta.charValue; + } + } + + auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); + if (buffer.IsNull()) { + return CHIP_ERROR_NO_MEMORY; + } + + chip::System::PacketBufferTLVWriter writer; + // Commands never need chained buffers, since they cannot be chunked. + writer.Init(std::move(buffer), /* useChainedBuffers = */ false); + + ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); + + ReturnErrorOnFailure(writer.Finalize(&buffer)); + + reader.Init(std::move(buffer)); + return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); +} + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error +{ + chip::System::PacketBufferTLVReader reader; + CHIP_ERROR err = [self _encodeToTLVReader:reader]; + if (err != CHIP_NO_ERROR) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:err]; + } + return nil; + } + + auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); + if (decodedObj == nil) { + if (error) { + *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; + } + } + return decodedObj; +} +@end + @implementation MTRWebRTCTransportProviderClusterSolicitOfferParams - (instancetype)init { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h index 70d8a461c6bf9e..94affae6193485 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h @@ -2170,6 +2170,48 @@ NS_ASSUME_NONNULL_BEGIN @end +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + +@interface MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams (InternalMethods) + +- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; + +@end + @interface MTRWebRTCTransportProviderClusterSolicitOfferParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm index f45fd6f3ccdccb..08eaa8c4de9058 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm @@ -1142,6 +1142,15 @@ static BOOL CommandNeedsTimedInvokeInCameraAVStreamManagementCluster(AttributeId } } } +static BOOL CommandNeedsTimedInvokeInCameraAVSettingsUserLevelManagementCluster(AttributeId aAttributeId) +{ + using namespace Clusters::CameraAvSettingsUserLevelManagement; + switch (aAttributeId) { + default: { + return NO; + } + } +} static BOOL CommandNeedsTimedInvokeInWebRTCTransportProviderCluster(AttributeId aAttributeId) { using namespace Clusters::WebRTCTransportProvider; @@ -1563,6 +1572,9 @@ BOOL MTRCommandNeedsTimedInvoke(NSNumber * _Nonnull aClusterID, NSNumber * _Nonn case Clusters::CameraAvStreamManagement::Id: { return CommandNeedsTimedInvokeInCameraAVStreamManagementCluster(commandID); } + case Clusters::CameraAvSettingsUserLevelManagement::Id: { + return CommandNeedsTimedInvokeInCameraAVSettingsUserLevelManagementCluster(commandID); + } case Clusters::WebRTCTransportProvider::Id: { return CommandNeedsTimedInvokeInWebRTCTransportProviderCluster(commandID); } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index 0a04add54fd1d3..b37dd112fec100 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -4898,6 +4898,18 @@ static id _Nullable DecodeEventPayloadForCameraAVStreamManagementCluster(EventId *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; return nil; } +static id _Nullable DecodeEventPayloadForCameraAVSettingsUserLevelManagementCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) +{ + using namespace Clusters::CameraAvSettingsUserLevelManagement; + switch (aEventId) { + default: { + break; + } + } + + *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; + return nil; +} static id _Nullable DecodeEventPayloadForWebRTCTransportProviderCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { using namespace Clusters::WebRTCTransportProvider; @@ -5530,6 +5542,9 @@ id _Nullable MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVRead case Clusters::CameraAvStreamManagement::Id: { return DecodeEventPayloadForCameraAVStreamManagementCluster(aPath.mEventId, aReader, aError); } + case Clusters::CameraAvSettingsUserLevelManagement::Id: { + return DecodeEventPayloadForCameraAVSettingsUserLevelManagementCluster(aPath.mEventId, aReader, aError); + } case Clusters::WebRTCTransportProvider::Id: { return DecodeEventPayloadForWebRTCTransportProviderCluster(aPath.mEventId, aReader, aError); } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index 02d36a82d710b9..6f8a2650c6f712 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -2282,6 +2282,28 @@ MTR_PROVISIONALLY_AVAILABLE @property (nonatomic, copy) NSNumber * _Nullable quality MTR_PROVISIONALLY_AVAILABLE; @end +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nullable pan MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable tilt MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nullable zoom MTR_PROVISIONALLY_AVAILABLE; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull values MTR_PROVISIONALLY_AVAILABLE; +@end + +MTR_PROVISIONALLY_AVAILABLE +@interface MTRCameraAVSettingsUserLevelManagementClusterViewportStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull x1 MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull y1 MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull x2 MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) NSNumber * _Nonnull y2 MTR_PROVISIONALLY_AVAILABLE; +@end + MTR_PROVISIONALLY_AVAILABLE @interface MTRWebRTCTransportProviderClusterICEServerStruct : NSObject @property (nonatomic, copy) NSArray * _Nonnull urls MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index e38df789310a97..bc356ce163d37b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -9479,6 +9479,108 @@ - (NSString *)description @end +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct +- (instancetype)init +{ + if (self = [super init]) { + + _pan = nil; + + _tilt = nil; + + _zoom = nil; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct alloc] init]; + + other.pan = self.pan; + other.tilt = self.tilt; + other.zoom = self.zoom; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: pan:%@; tilt:%@; zoom:%@; >", NSStringFromClass([self class]), _pan, _tilt, _zoom]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct +- (instancetype)init +{ + if (self = [super init]) { + + _presetID = @(0); + + _name = @""; + + _values = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct alloc] init]; + + other.presetID = self.presetID; + other.name = self.name; + other.values = self.values; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; values:%@; >", NSStringFromClass([self class]), _presetID, _name, _values]; + return descriptionString; +} + +@end + +@implementation MTRCameraAVSettingsUserLevelManagementClusterViewportStruct +- (instancetype)init +{ + if (self = [super init]) { + + _x1 = @(0); + + _y1 = @(0); + + _x2 = @(0); + + _y2 = @(0); + } + return self; +} + +- (id)copyWithZone:(NSZone * _Nullable)zone +{ + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterViewportStruct alloc] init]; + + other.x1 = self.x1; + other.y1 = self.y1; + other.x2 = self.x2; + other.y2 = self.y2; + + return other; +} + +- (NSString *)description +{ + NSString * descriptionString = [NSString stringWithFormat:@"<%@: x1:%@; y1:%@; x2:%@; y2:%@; >", NSStringFromClass([self class]), _x1, _y1, _x2, _y2]; + return descriptionString; +} + +@end + @implementation MTRWebRTCTransportProviderClusterICEServerStruct - (instancetype)init { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index 382c808a78cc62..d9b3d6581ff041 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -38574,6 +38574,396 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +namespace Attributes { + +namespace MaxPresets { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT8U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT8U_ATTRIBUTE_TYPE); +} + +} // namespace MaxPresets + +namespace ZoomMax { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT8U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT8U_ATTRIBUTE_TYPE); +} + +} // namespace ZoomMax + +namespace TiltMin { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT16S_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT16S_ATTRIBUTE_TYPE); +} + +} // namespace TiltMin + +namespace TiltMax { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT16S_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT16S_ATTRIBUTE_TYPE); +} + +} // namespace TiltMax + +namespace PanMin { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT16S_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT16S_ATTRIBUTE_TYPE); +} + +} // namespace PanMin + +namespace PanMax { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT16S_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT16S_ATTRIBUTE_TYPE); +} + +} // namespace PanMax + +namespace FeatureMap { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_BITMAP32_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_BITMAP32_ATTRIBUTE_TYPE); +} + +} // namespace FeatureMap + +namespace ClusterRevision { + +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + Protocols::InteractionModel::Status status = + emberAfReadAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(Protocols::InteractionModel::Status::Success == status, status); + if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + *value = Traits::StorageToWorking(temp); + return status; +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(ConcreteAttributePath(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id), + EmberAfWriteDataInput(writable, ZCL_INT16U_ATTRIBUTE_TYPE).SetMarkDirty(markDirty)); +} + +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) + { + return Protocols::InteractionModel::Status::ConstraintError; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::CameraAvSettingsUserLevelManagement::Id, Id, writable, + ZCL_INT16U_ATTRIBUTE_TYPE); +} + +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace CameraAvSettingsUserLevelManagement + namespace WebRTCTransportProvider { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index e0a965b732a743..10cff6f79fa5d5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -5828,6 +5828,60 @@ Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, Mar } // namespace Attributes } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +namespace Attributes { + +namespace MaxPresets { +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value); // int8u +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty); +} // namespace MaxPresets + +namespace ZoomMax { +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint8_t * value); // int8u +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint8_t value, MarkAttributeDirty markDirty); +} // namespace ZoomMax + +namespace TiltMin { +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value); // int16s +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty); +} // namespace TiltMin + +namespace TiltMax { +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value); // int16s +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty); +} // namespace TiltMax + +namespace PanMin { +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value); // int16s +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty); +} // namespace PanMin + +namespace PanMax { +Protocols::InteractionModel::Status Get(EndpointId endpoint, int16_t * value); // int16s +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, int16_t value, MarkAttributeDirty markDirty); +} // namespace PanMax + +namespace FeatureMap { +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint32_t * value); // bitmap32 +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint32_t value, MarkAttributeDirty markDirty); +} // namespace FeatureMap + +namespace ClusterRevision { +Protocols::InteractionModel::Status Get(EndpointId endpoint, uint16_t * value); // int16u +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value); +Protocols::InteractionModel::Status Set(EndpointId endpoint, uint16_t value, MarkAttributeDirty markDirty); +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace CameraAvSettingsUserLevelManagement + namespace WebRTCTransportProvider { namespace Attributes { 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 90be2632818072..f69691c5e7cb71 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -628,6 +628,11 @@ void emberAfZoneManagementClusterInitCallback(chip::EndpointId endpoint); */ void emberAfCameraAvStreamManagementClusterInitCallback(chip::EndpointId endpoint); +/** + * @param endpoint Endpoint that is being initialized + */ +void emberAfCameraAvSettingsUserLevelManagementClusterInitCallback(chip::EndpointId endpoint); + /** * @param endpoint Endpoint that is being initialized */ @@ -5269,6 +5274,45 @@ chip::Protocols::InteractionModel::Status MatterCameraAvStreamManagementClusterS */ void emberAfCameraAvStreamManagementClusterServerTickCallback(chip::EndpointId endpoint); +// +// Camera AV Settings User Level Management Cluster +// + +/** + * @param endpoint Endpoint that is being initialized + */ +void emberAfCameraAvSettingsUserLevelManagementClusterServerInitCallback(chip::EndpointId endpoint); + +/** + * @param endpoint Endpoint that is being shutdown + */ +void MatterCameraAvSettingsUserLevelManagementClusterServerShutdownCallback(chip::EndpointId endpoint); + +/** + * @param endpoint Endpoint that is being initialized + */ +void emberAfCameraAvSettingsUserLevelManagementClusterClientInitCallback(chip::EndpointId endpoint); + +/** + * @param attributePath Concrete attribute path that changed + */ +void MatterCameraAvSettingsUserLevelManagementClusterServerAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath); + +/** + * @param attributePath Concrete attribute path to be changed + * @param attributeType Attribute type + * @param size Attribute size + * @param value Attribute value + */ +chip::Protocols::InteractionModel::Status MatterCameraAvSettingsUserLevelManagementClusterServerPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); + +/** + * @param endpoint Endpoint that is being served + */ +void emberAfCameraAvSettingsUserLevelManagementClusterServerTickCallback(chip::EndpointId endpoint); + // // WebRTC Transport Provider Cluster // @@ -6876,6 +6920,48 @@ bool emberAfCameraAvStreamManagementClusterSetImageFlipHorizontalCallback( bool emberAfCameraAvStreamManagementClusterSetImageFlipVerticalCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageFlipVertical::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster MptzSetPosition Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterMptzSetPositionCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster MptzRelativeMove Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterMptzRelativeMoveCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster MptzMoveToPreset Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterMptzMoveToPresetCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster MptzSavePreset Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterMptzSavePresetCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster MptzRemovePreset Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterMptzRemovePresetCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster DptzSetViewport Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterDptzSetViewportCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::DecodableType & commandData); +/** + * @brief Camera AV Settings User Level Management Cluster DptzRelativeMove Command callback (from client) + */ +bool emberAfCameraAvSettingsUserLevelManagementClusterDptzRelativeMoveCallback( + chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::DecodableType & commandData); /** * @brief WebRTC Transport Provider Cluster SolicitOffer Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h index 586eeb91aff695..4f190043674f2e 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums.h @@ -5611,6 +5611,19 @@ enum class Feature : uint32_t }; } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { + +// Bitmap for Feature +enum class Feature : uint32_t +{ + kDigitalPTZ = 0x1, + kMechanicalPan = 0x2, + kMechanicalTilt = 0x4, + kMechanicalZoom = 0x8, + kMechanicalPresets = 0x10, +}; +} // namespace CameraAvSettingsUserLevelManagement + namespace WebRTCTransportProvider { using StreamTypeEnum = Clusters::detail::StreamTypeEnum; 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 7e9752db4a888c..76e756abd28313 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 @@ -30455,6 +30455,430 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace Events } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +namespace Structs { + +namespace MPTZStruct { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPan), pan); + encoder.Encode(to_underlying(Fields::kTilt), tilt); + encoder.Encode(to_underlying(Fields::kZoom), zoom); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPan)) + { + err = DataModel::Decode(reader, pan); + } + else if (__context_tag == to_underlying(Fields::kTilt)) + { + err = DataModel::Decode(reader, tilt); + } + else if (__context_tag == to_underlying(Fields::kZoom)) + { + err = DataModel::Decode(reader, zoom); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} + +} // namespace MPTZStruct + +namespace MPTZPresetStruct { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPresetID), presetID); + encoder.Encode(to_underlying(Fields::kName), name); + encoder.Encode(to_underlying(Fields::kValues), values); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPresetID)) + { + err = DataModel::Decode(reader, presetID); + } + else if (__context_tag == to_underlying(Fields::kName)) + { + err = DataModel::Decode(reader, name); + } + else if (__context_tag == to_underlying(Fields::kValues)) + { + err = DataModel::Decode(reader, values); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} + +} // namespace MPTZPresetStruct +} // namespace Structs + +namespace Commands { +namespace MptzSetPosition { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPan), pan); + encoder.Encode(to_underlying(Fields::kTilt), tilt); + encoder.Encode(to_underlying(Fields::kZoom), zoom); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPan)) + { + err = DataModel::Decode(reader, pan); + } + else if (__context_tag == to_underlying(Fields::kTilt)) + { + err = DataModel::Decode(reader, tilt); + } + else if (__context_tag == to_underlying(Fields::kZoom)) + { + err = DataModel::Decode(reader, zoom); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace MptzSetPosition. +namespace MptzRelativeMove { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPanDelta), panDelta); + encoder.Encode(to_underlying(Fields::kTiltDelta), tiltDelta); + encoder.Encode(to_underlying(Fields::kZoomDelta), zoomDelta); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPanDelta)) + { + err = DataModel::Decode(reader, panDelta); + } + else if (__context_tag == to_underlying(Fields::kTiltDelta)) + { + err = DataModel::Decode(reader, tiltDelta); + } + else if (__context_tag == to_underlying(Fields::kZoomDelta)) + { + err = DataModel::Decode(reader, zoomDelta); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace MptzRelativeMove. +namespace MptzMoveToPreset { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPresetID), presetID); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPresetID)) + { + err = DataModel::Decode(reader, presetID); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace MptzMoveToPreset. +namespace MptzSavePreset { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPresetID), presetID); + encoder.Encode(to_underlying(Fields::kName), name); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPresetID)) + { + err = DataModel::Decode(reader, presetID); + } + else if (__context_tag == to_underlying(Fields::kName)) + { + err = DataModel::Decode(reader, name); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace MptzSavePreset. +namespace MptzRemovePreset { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kPresetID), presetID); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kPresetID)) + { + err = DataModel::Decode(reader, presetID); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace MptzRemovePreset. +namespace DptzSetViewport { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kVideoStreamID), videoStreamID); + encoder.Encode(to_underlying(Fields::kViewport), viewport); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kVideoStreamID)) + { + err = DataModel::Decode(reader, videoStreamID); + } + else if (__context_tag == to_underlying(Fields::kViewport)) + { + err = DataModel::Decode(reader, viewport); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace DptzSetViewport. +namespace DptzRelativeMove { +CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const +{ + DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; + encoder.Encode(to_underlying(Fields::kVideoStreamID), videoStreamID); + encoder.Encode(to_underlying(Fields::kDeltaX), deltaX); + encoder.Encode(to_underlying(Fields::kDeltaY), deltaY); + encoder.Encode(to_underlying(Fields::kZoomDelta), zoomDelta); + return encoder.Finalize(); +} + +CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) +{ + detail::StructDecodeIterator __iterator(reader); + while (true) + { + auto __element = __iterator.Next(); + if (std::holds_alternative(__element)) + { + return std::get(__element); + } + + CHIP_ERROR err = CHIP_NO_ERROR; + const uint8_t __context_tag = std::get(__element); + + if (__context_tag == to_underlying(Fields::kVideoStreamID)) + { + err = DataModel::Decode(reader, videoStreamID); + } + else if (__context_tag == to_underlying(Fields::kDeltaX)) + { + err = DataModel::Decode(reader, deltaX); + } + else if (__context_tag == to_underlying(Fields::kDeltaY)) + { + err = DataModel::Decode(reader, deltaY); + } + else if (__context_tag == to_underlying(Fields::kZoomDelta)) + { + err = DataModel::Decode(reader, zoomDelta); + } + else + { + } + + ReturnErrorOnFailure(err); + } +} +} // namespace DptzRelativeMove. +} // namespace Commands + +namespace Attributes { +CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path) +{ + switch (path.mAttributeId) + { + case Attributes::MptzPosition::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, mptzPosition); + case Attributes::MaxPresets::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, maxPresets); + case Attributes::MptzPresets::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, mptzPresets); + case Attributes::DptzRelativeMove::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, dptzRelativeMove); + case Attributes::ZoomMax::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, zoomMax); + case Attributes::TiltMin::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, tiltMin); + case Attributes::TiltMax::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, tiltMax); + case Attributes::PanMin::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, panMin); + case Attributes::PanMax::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, panMax); + case Attributes::GeneratedCommandList::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, generatedCommandList); + case Attributes::AcceptedCommandList::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, acceptedCommandList); + case Attributes::AttributeList::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, attributeList); + case Attributes::FeatureMap::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, featureMap); + case Attributes::ClusterRevision::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, clusterRevision); + default: + return CHIP_NO_ERROR; + } +} +} // namespace Attributes + +namespace Events {} // namespace Events + +} // namespace CameraAvSettingsUserLevelManagement namespace WebRTCTransportProvider { namespace Structs {} // namespace Structs @@ -35048,6 +35472,13 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand) return false; } } + case Clusters::CameraAvSettingsUserLevelManagement::Id: { + switch (aCommand) + { + default: + return false; + } + } case Clusters::WebRTCTransportProvider::Id: { switch (aCommand) { 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 4ec96663f8becd..321832790a3be3 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 @@ -42752,6 +42752,525 @@ struct DecodableType } // namespace SnapshotStreamChanged } // namespace Events } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +namespace Structs { +namespace MPTZStruct { +enum class Fields : uint8_t +{ + kPan = 2, + kTilt = 3, + kZoom = 4, +}; + +struct Type +{ +public: + Optional pan; + Optional tilt; + Optional zoom; + + CHIP_ERROR Decode(TLV::TLVReader & reader); + + static constexpr bool kIsFabricScoped = false; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; +}; + +using DecodableType = Type; + +} // namespace MPTZStruct +namespace MPTZPresetStruct { +enum class Fields : uint8_t +{ + kPresetID = 0, + kName = 1, + kValues = 2, +}; + +struct Type +{ +public: + uint8_t presetID = static_cast(0); + chip::CharSpan name; + Structs::MPTZStruct::Type values; + + CHIP_ERROR Decode(TLV::TLVReader & reader); + + static constexpr bool kIsFabricScoped = false; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; +}; + +using DecodableType = Type; + +} // namespace MPTZPresetStruct +namespace ViewportStruct = Clusters::detail::Structs::ViewportStruct; +} // namespace Structs + +namespace Commands { +// Forward-declarations so we can reference these later. + +namespace MptzSetPosition { +struct Type; +struct DecodableType; +} // namespace MptzSetPosition + +namespace MptzRelativeMove { +struct Type; +struct DecodableType; +} // namespace MptzRelativeMove + +namespace MptzMoveToPreset { +struct Type; +struct DecodableType; +} // namespace MptzMoveToPreset + +namespace MptzSavePreset { +struct Type; +struct DecodableType; +} // namespace MptzSavePreset + +namespace MptzRemovePreset { +struct Type; +struct DecodableType; +} // namespace MptzRemovePreset + +namespace DptzSetViewport { +struct Type; +struct DecodableType; +} // namespace DptzSetViewport + +namespace DptzRelativeMove { +struct Type; +struct DecodableType; +} // namespace DptzRelativeMove + +} // namespace Commands + +namespace Commands { +namespace MptzSetPosition { +enum class Fields : uint8_t +{ + kPan = 0, + kTilt = 1, + kZoom = 2, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::MptzSetPosition::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + Optional pan; + Optional tilt; + Optional zoom; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::MptzSetPosition::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + Optional pan; + Optional tilt; + Optional zoom; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace MptzSetPosition +namespace MptzRelativeMove { +enum class Fields : uint8_t +{ + kPanDelta = 0, + kTiltDelta = 1, + kZoomDelta = 2, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::MptzRelativeMove::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + Optional panDelta; + Optional tiltDelta; + Optional zoomDelta; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::MptzRelativeMove::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + Optional panDelta; + Optional tiltDelta; + Optional zoomDelta; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace MptzRelativeMove +namespace MptzMoveToPreset { +enum class Fields : uint8_t +{ + kPresetID = 0, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::MptzMoveToPreset::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint8_t presetID = static_cast(0); + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::MptzMoveToPreset::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint8_t presetID = static_cast(0); + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace MptzMoveToPreset +namespace MptzSavePreset { +enum class Fields : uint8_t +{ + kPresetID = 0, + kName = 1, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::MptzSavePreset::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + Optional presetID; + chip::CharSpan name; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::MptzSavePreset::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + Optional presetID; + chip::CharSpan name; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace MptzSavePreset +namespace MptzRemovePreset { +enum class Fields : uint8_t +{ + kPresetID = 0, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::MptzRemovePreset::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint8_t presetID = static_cast(0); + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::MptzRemovePreset::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint8_t presetID = static_cast(0); + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace MptzRemovePreset +namespace DptzSetViewport { +enum class Fields : uint8_t +{ + kVideoStreamID = 0, + kViewport = 1, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::DptzSetViewport::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint16_t videoStreamID = static_cast(0); + Structs::ViewportStruct::Type viewport; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::DptzSetViewport::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint16_t videoStreamID = static_cast(0); + Structs::ViewportStruct::DecodableType viewport; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace DptzSetViewport +namespace DptzRelativeMove { +enum class Fields : uint8_t +{ + kVideoStreamID = 0, + kDeltaX = 1, + kDeltaY = 2, + kZoomDelta = 3, +}; + +struct Type +{ +public: + // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand + static constexpr CommandId GetCommandId() { return Commands::DptzRelativeMove::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint16_t videoStreamID = static_cast(0); + Optional deltaX; + Optional deltaY; + Optional zoomDelta; + + CHIP_ERROR Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const; + + using ResponseType = DataModel::NullObjectType; + + static constexpr bool MustUseTimedInvoke() { return false; } +}; + +struct DecodableType +{ +public: + static constexpr CommandId GetCommandId() { return Commands::DptzRelativeMove::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + uint16_t videoStreamID = static_cast(0); + Optional deltaX; + Optional deltaY; + Optional zoomDelta; + CHIP_ERROR Decode(TLV::TLVReader & reader); +}; +}; // namespace DptzRelativeMove +} // namespace Commands + +namespace Attributes { + +namespace MptzPosition { +struct TypeInfo +{ + using Type = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type; + using DecodableType = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType; + using DecodableArgType = const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType &; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MptzPosition::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace MptzPosition +namespace MaxPresets { +struct TypeInfo +{ + using Type = uint8_t; + using DecodableType = uint8_t; + using DecodableArgType = uint8_t; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MaxPresets::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace MaxPresets +namespace MptzPresets { +struct TypeInfo +{ + using Type = + chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList< + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType>; + using DecodableArgType = const chip::app::DataModel::DecodableList< + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType> &; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MptzPresets::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace MptzPresets +namespace DptzRelativeMove { +struct TypeInfo +{ + using Type = chip::app::DataModel::List; + using DecodableType = chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList &; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::DptzRelativeMove::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace DptzRelativeMove +namespace ZoomMax { +struct TypeInfo +{ + using Type = uint8_t; + using DecodableType = uint8_t; + using DecodableArgType = uint8_t; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::ZoomMax::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace ZoomMax +namespace TiltMin { +struct TypeInfo +{ + using Type = int16_t; + using DecodableType = int16_t; + using DecodableArgType = int16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::TiltMin::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace TiltMin +namespace TiltMax { +struct TypeInfo +{ + using Type = int16_t; + using DecodableType = int16_t; + using DecodableArgType = int16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::TiltMax::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace TiltMax +namespace PanMin { +struct TypeInfo +{ + using Type = int16_t; + using DecodableType = int16_t; + using DecodableArgType = int16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PanMin::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace PanMin +namespace PanMax { +struct TypeInfo +{ + using Type = int16_t; + using DecodableType = int16_t; + using DecodableArgType = int16_t; + + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::PanMax::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace PanMax +namespace GeneratedCommandList { +struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } +}; +} // namespace GeneratedCommandList +namespace AcceptedCommandList { +struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } +}; +} // namespace AcceptedCommandList +namespace AttributeList { +struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } +}; +} // namespace AttributeList +namespace FeatureMap { +struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } +}; +} // namespace FeatureMap +namespace ClusterRevision { +struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo +{ + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } +}; +} // namespace ClusterRevision + +struct TypeInfo +{ + struct DecodableType + { + static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } + + CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); + + Attributes::MptzPosition::TypeInfo::DecodableType mptzPosition; + Attributes::MaxPresets::TypeInfo::DecodableType maxPresets = static_cast(0); + Attributes::MptzPresets::TypeInfo::DecodableType mptzPresets; + Attributes::DptzRelativeMove::TypeInfo::DecodableType dptzRelativeMove; + Attributes::ZoomMax::TypeInfo::DecodableType zoomMax = static_cast(0); + Attributes::TiltMin::TypeInfo::DecodableType tiltMin = static_cast(0); + Attributes::TiltMax::TypeInfo::DecodableType tiltMax = static_cast(0); + Attributes::PanMin::TypeInfo::DecodableType panMin = static_cast(0); + Attributes::PanMax::TypeInfo::DecodableType panMax = static_cast(0); + Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; + Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; + Attributes::AttributeList::TypeInfo::DecodableType attributeList; + Attributes::FeatureMap::TypeInfo::DecodableType featureMap = static_cast(0); + Attributes::ClusterRevision::TypeInfo::DecodableType clusterRevision = static_cast(0); + }; +}; +} // namespace Attributes +} // namespace CameraAvSettingsUserLevelManagement namespace WebRTCTransportProvider { namespace Structs { namespace ICEServerStruct = Clusters::detail::Structs::ICEServerStruct; diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 8ee5cb21be8e31..89db021a56f6bd 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -7077,6 +7077,68 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +namespace Attributes { + +namespace MptzPosition { +static constexpr AttributeId Id = 0x00000000; +} // namespace MptzPosition + +namespace MaxPresets { +static constexpr AttributeId Id = 0x00000001; +} // namespace MaxPresets + +namespace MptzPresets { +static constexpr AttributeId Id = 0x00000002; +} // namespace MptzPresets + +namespace DptzRelativeMove { +static constexpr AttributeId Id = 0x00000003; +} // namespace DptzRelativeMove + +namespace ZoomMax { +static constexpr AttributeId Id = 0x00000004; +} // namespace ZoomMax + +namespace TiltMin { +static constexpr AttributeId Id = 0x00000005; +} // namespace TiltMin + +namespace TiltMax { +static constexpr AttributeId Id = 0x00000006; +} // namespace TiltMax + +namespace PanMin { +static constexpr AttributeId Id = 0x00000007; +} // namespace PanMin + +namespace PanMax { +static constexpr AttributeId Id = 0x00000008; +} // namespace PanMax + +namespace GeneratedCommandList { +static constexpr AttributeId Id = Globals::Attributes::GeneratedCommandList::Id; +} // namespace GeneratedCommandList + +namespace AcceptedCommandList { +static constexpr AttributeId Id = Globals::Attributes::AcceptedCommandList::Id; +} // namespace AcceptedCommandList + +namespace AttributeList { +static constexpr AttributeId Id = Globals::Attributes::AttributeList::Id; +} // namespace AttributeList + +namespace FeatureMap { +static constexpr AttributeId Id = Globals::Attributes::FeatureMap::Id; +} // namespace FeatureMap + +namespace ClusterRevision { +static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; +} // namespace ClusterRevision + +} // namespace Attributes +} // namespace CameraAvSettingsUserLevelManagement + namespace WebRTCTransportProvider { namespace Attributes { diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h index e492255152c333..a9e3fad362a4ae 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h @@ -382,6 +382,9 @@ static constexpr ClusterId Id = 0x00000550; namespace CameraAvStreamManagement { static constexpr ClusterId Id = 0x00000551; } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +static constexpr ClusterId Id = 0x00000552; +} // namespace CameraAvSettingsUserLevelManagement namespace WebRTCTransportProvider { static constexpr ClusterId Id = 0x00000553; } // namespace WebRTCTransportProvider 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 5a07d8ac1bd191..6b6efcb6165f89 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 @@ -1907,6 +1907,40 @@ static constexpr CommandId Id = 0x00000010; } // namespace Commands } // namespace CameraAvStreamManagement +namespace CameraAvSettingsUserLevelManagement { +namespace Commands { + +namespace MptzSetPosition { +static constexpr CommandId Id = 0x00000000; +} // namespace MptzSetPosition + +namespace MptzRelativeMove { +static constexpr CommandId Id = 0x00000001; +} // namespace MptzRelativeMove + +namespace MptzMoveToPreset { +static constexpr CommandId Id = 0x00000002; +} // namespace MptzMoveToPreset + +namespace MptzSavePreset { +static constexpr CommandId Id = 0x00000003; +} // namespace MptzSavePreset + +namespace MptzRemovePreset { +static constexpr CommandId Id = 0x00000004; +} // namespace MptzRemovePreset + +namespace DptzSetViewport { +static constexpr CommandId Id = 0x00000005; +} // namespace DptzSetViewport + +namespace DptzRelativeMove { +static constexpr CommandId Id = 0x00000006; +} // namespace DptzRelativeMove + +} // namespace Commands +} // namespace CameraAvSettingsUserLevelManagement + namespace WebRTCTransportProvider { namespace Commands { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index afcc2abd01d6fb..927508d3c4e0fd 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -154,6 +154,7 @@ | ContentAppObserver | 0x0510 | | ZoneManagement | 0x0550 | | CameraAvStreamManagement | 0x0551 | +| CameraAvSettingsUserLevelManagement | 0x0552 | | WebRTCTransportProvider | 0x0553 | | WebRTCTransportRequestor | 0x0554 | | Chime | 0x0556 | @@ -14321,6 +14322,327 @@ class CameraAvStreamManagementSetImageFlipVertical : public ClusterCommand chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageFlipVertical::Type mRequest; }; +/*----------------------------------------------------------------------------*\ +| Cluster CameraAvSettingsUserLevelManagement | 0x0552 | +|------------------------------------------------------------------------------| +| Commands: | | +| * MptzSetPosition | 0x00 | +| * MptzRelativeMove | 0x01 | +| * MptzMoveToPreset | 0x02 | +| * MptzSavePreset | 0x03 | +| * MptzRemovePreset | 0x04 | +| * DptzSetViewport | 0x05 | +| * DptzRelativeMove | 0x06 | +|------------------------------------------------------------------------------| +| Attributes: | | +| * MptzPosition | 0x0000 | +| * MaxPresets | 0x0001 | +| * MptzPresets | 0x0002 | +| * DptzRelativeMove | 0x0003 | +| * ZoomMax | 0x0004 | +| * TiltMin | 0x0005 | +| * TiltMax | 0x0006 | +| * PanMin | 0x0007 | +| * PanMax | 0x0008 | +| * GeneratedCommandList | 0xFFF8 | +| * AcceptedCommandList | 0xFFF9 | +| * AttributeList | 0xFFFB | +| * FeatureMap | 0xFFFC | +| * ClusterRevision | 0xFFFD | +|------------------------------------------------------------------------------| +| Events: | | +\*----------------------------------------------------------------------------*/ + +/* + * Command MptzSetPosition + */ +class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementMptzSetPosition(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptz-set-position", credsIssuerConfig) + { + AddArgument("Pan", INT16_MIN, INT16_MAX, &mRequest.pan); + AddArgument("Tilt", INT16_MIN, INT16_MAX, &mRequest.tilt); + AddArgument("Zoom", 0, UINT8_MAX, &mRequest.zoom); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type mRequest; +}; + +/* + * Command MptzRelativeMove + */ +class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementMptzRelativeMove(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptz-relative-move", credsIssuerConfig) + { + AddArgument("PanDelta", INT16_MIN, INT16_MAX, &mRequest.panDelta); + AddArgument("TiltDelta", INT16_MIN, INT16_MAX, &mRequest.tiltDelta); + AddArgument("ZoomDelta", INT8_MIN, INT8_MAX, &mRequest.zoomDelta); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type mRequest; +}; + +/* + * Command MptzMoveToPreset + */ +class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementMptzMoveToPreset(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptz-move-to-preset", credsIssuerConfig) + { + AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type mRequest; +}; + +/* + * Command MptzSavePreset + */ +class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementMptzSavePreset(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptz-save-preset", credsIssuerConfig) + { + AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); + AddArgument("Name", &mRequest.name); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type mRequest; +}; + +/* + * Command MptzRemovePreset + */ +class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementMptzRemovePreset(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptz-remove-preset", credsIssuerConfig) + { + AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type mRequest; +}; + +/* + * Command DptzSetViewport + */ +class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementDptzSetViewport(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("dptz-set-viewport", credsIssuerConfig), mComplex_Viewport(&mRequest.viewport) + { + AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); + AddArgument("Viewport", &mComplex_Viewport); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type mRequest; + TypedComplexArgument mComplex_Viewport; +}; + +/* + * Command DptzRelativeMove + */ +class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterCommand +{ +public: + CameraAvSettingsUserLevelManagementDptzRelativeMove(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("dptz-relative-move", credsIssuerConfig) + { + AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); + AddArgument("DeltaX", INT16_MIN, INT16_MAX, &mRequest.deltaX); + AddArgument("DeltaY", INT16_MIN, INT16_MAX, &mRequest.deltaY); + AddArgument("ZoomDelta", INT8_MIN, INT8_MAX, &mRequest.zoomDelta); + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, + commandId, endpointIds.at(0)); + return ClusterCommand::SendCommand(device, endpointIds.at(0), clusterId, commandId, mRequest); + } + + CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, + groupId); + + return ClusterCommand::SendGroupCommand(groupId, fabricIndex, clusterId, commandId, mRequest); + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type mRequest; +}; + /*----------------------------------------------------------------------------*\ | Cluster WebRTCTransportProvider | 0x0553 | |------------------------------------------------------------------------------| @@ -27185,6 +27507,97 @@ void registerClusterCameraAvStreamManagement(Commands & commands, CredentialIssu commands.RegisterCluster(clusterName, clusterCommands); } +void registerClusterCameraAvSettingsUserLevelManagement(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +{ + using namespace chip::app::Clusters::CameraAvSettingsUserLevelManagement; + + const char * clusterName = "CameraAvSettingsUserLevelManagement"; + + commands_list clusterCommands = { + // + // Commands + // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + // + // Attributes + // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "mptz-position", Attributes::MptzPosition::Id, credsIssuerConfig), // + make_unique(Id, "max-presets", Attributes::MaxPresets::Id, credsIssuerConfig), // + make_unique(Id, "mptz-presets", Attributes::MptzPresets::Id, credsIssuerConfig), // + make_unique(Id, "dptz-relative-move", Attributes::DptzRelativeMove::Id, credsIssuerConfig), // + make_unique(Id, "zoom-max", Attributes::ZoomMax::Id, credsIssuerConfig), // + make_unique(Id, "tilt-min", Attributes::TiltMin::Id, credsIssuerConfig), // + make_unique(Id, "tilt-max", Attributes::TiltMax::Id, credsIssuerConfig), // + make_unique(Id, "pan-min", Attributes::PanMin::Id, credsIssuerConfig), // + make_unique(Id, "pan-max", Attributes::PanMax::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + make_unique>(Id, credsIssuerConfig), // + make_unique>( + Id, "mptz-position", Attributes::MptzPosition::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "max-presets", 0, UINT8_MAX, Attributes::MaxPresets::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "mptz-presets", Attributes::MptzPresets::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "dptz-relative-move", Attributes::DptzRelativeMove::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "zoom-max", 0, UINT8_MAX, Attributes::ZoomMax::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>(Id, "tilt-min", INT16_MIN, INT16_MAX, Attributes::TiltMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "tilt-max", INT16_MIN, INT16_MAX, Attributes::TiltMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "pan-min", INT16_MIN, INT16_MAX, Attributes::PanMin::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "pan-max", INT16_MIN, INT16_MAX, Attributes::PanMax::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "generated-command-list", Attributes::GeneratedCommandList::Id, WriteCommandType::kForceWrite, + credsIssuerConfig), // + make_unique>>( + Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>( + Id, "attribute-list", Attributes::AttributeList::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "feature-map", 0, UINT32_MAX, Attributes::FeatureMap::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, "mptz-position", Attributes::MptzPosition::Id, credsIssuerConfig), // + make_unique(Id, "max-presets", Attributes::MaxPresets::Id, credsIssuerConfig), // + make_unique(Id, "mptz-presets", Attributes::MptzPresets::Id, credsIssuerConfig), // + make_unique(Id, "dptz-relative-move", Attributes::DptzRelativeMove::Id, credsIssuerConfig), // + make_unique(Id, "zoom-max", Attributes::ZoomMax::Id, credsIssuerConfig), // + make_unique(Id, "tilt-min", Attributes::TiltMin::Id, credsIssuerConfig), // + make_unique(Id, "tilt-max", Attributes::TiltMax::Id, credsIssuerConfig), // + make_unique(Id, "pan-min", Attributes::PanMin::Id, credsIssuerConfig), // + make_unique(Id, "pan-max", Attributes::PanMax::Id, credsIssuerConfig), // + make_unique(Id, "generated-command-list", Attributes::GeneratedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "accepted-command-list", Attributes::AcceptedCommandList::Id, credsIssuerConfig), // + make_unique(Id, "attribute-list", Attributes::AttributeList::Id, credsIssuerConfig), // + make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // + make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // + // + // Events + // + make_unique(Id, credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + }; + + commands.RegisterCluster(clusterName, clusterCommands); +} void registerClusterWebRTCTransportProvider(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { using namespace chip::app::Clusters::WebRTCTransportProvider; @@ -28204,6 +28617,7 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue registerClusterContentAppObserver(commands, credsIssuerConfig); registerClusterZoneManagement(commands, credsIssuerConfig); registerClusterCameraAvStreamManagement(commands, credsIssuerConfig); + registerClusterCameraAvSettingsUserLevelManagement(commands, credsIssuerConfig); registerClusterWebRTCTransportProvider(commands, credsIssuerConfig); registerClusterWebRTCTransportRequestor(commands, credsIssuerConfig); registerClusterChime(commands, credsIssuerConfig); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 670d306354f37f..ee9ee37e759873 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -6470,6 +6470,87 @@ void ComplexArgumentParser::Finalize( ComplexArgumentParser::Finalize(request.maxHDRFPS); } +CHIP_ERROR +ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + // Copy to track which members we already processed. + Json::Value valueCopy(value); + + char labelWithMember[kMaxLabelLength]; + if (value.isMember("pan")) + { + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "pan"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.pan, value["pan"])); + } + valueCopy.removeMember("pan"); + + if (value.isMember("tilt")) + { + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "tilt"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.tilt, value["tilt"])); + } + valueCopy.removeMember("tilt"); + + if (value.isMember("zoom")) + { + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "zoom"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.zoom, value["zoom"])); + } + valueCopy.removeMember("zoom"); + + return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); +} + +void ComplexArgumentParser::Finalize(chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type & request) +{ + ComplexArgumentParser::Finalize(request.pan); + ComplexArgumentParser::Finalize(request.tilt); + ComplexArgumentParser::Finalize(request.zoom); +} + +CHIP_ERROR +ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + // Copy to track which members we already processed. + Json::Value valueCopy(value); + + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presetID", "presetID", value.isMember("presetID"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.name", "name", value.isMember("name"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.values", "values", value.isMember("values"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presetID"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.presetID, value["presetID"])); + valueCopy.removeMember("presetID"); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "name"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"])); + valueCopy.removeMember("name"); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "values"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.values, value["values"])); + valueCopy.removeMember("values"); + + return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); +} + +void ComplexArgumentParser::Finalize( + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::Type & request) +{ + ComplexArgumentParser::Finalize(request.presetID); + ComplexArgumentParser::Finalize(request.name); + ComplexArgumentParser::Finalize(request.values); +} + CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, Json::Value & value) { diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 38b3aee08f9859..3d7f35b5ee3b07 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -742,6 +742,18 @@ static CHIP_ERROR Setup(const char * label, static void Finalize(chip::app::Clusters::CameraAvStreamManagement::Structs::VideoSensorParamsStruct::Type & request); +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type & request); + +static CHIP_ERROR Setup(const char * label, + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::Type & request); + static CHIP_ERROR Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, Json::Value & value); 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 8a0e26cbca4bc1..d776dd343529e0 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5744,6 +5744,74 @@ CHIP_ERROR DataModelLogger::LogValue( return CHIP_NO_ERROR; } +CHIP_ERROR DataModelLogger::LogValue( + const char * label, size_t indent, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("Pan", indent + 1, value.pan); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Pan'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Tilt", indent + 1, value.tilt); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Tilt'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Zoom", indent + 1, value.zoom); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Zoom'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} + +CHIP_ERROR DataModelLogger::LogValue( + const char * label, size_t indent, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("PresetID", indent + 1, value.presetID); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'PresetID'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Name", indent + 1, value.name); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Name'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Values", indent + 1, value.values); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Values'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} + CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::Chime::Structs::ChimeSoundStruct::DecodableType & value) { @@ -18754,6 +18822,85 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } + case CameraAvSettingsUserLevelManagement::Id: { + switch (path.mAttributeId) + { + case CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id: { + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("MptzPosition", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::Id: { + uint8_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("MaxPresets", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id: { + chip::app::DataModel::DecodableList< + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType> + value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("MptzPresets", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id: { + chip::app::DataModel::DecodableList value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("DptzRelativeMove", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::Id: { + uint8_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("ZoomMax", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::TiltMin::Id: { + int16_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("TiltMin", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::TiltMax::Id: { + int16_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("TiltMax", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::PanMin::Id: { + int16_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("PanMin", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::PanMax::Id: { + int16_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("PanMax", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::Id: { + chip::app::DataModel::DecodableList value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogGeneratedCommandId("GeneratedCommandList", 1, value, + CameraAvSettingsUserLevelManagement::Id); + } + case CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::Id: { + chip::app::DataModel::DecodableList value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogAcceptedCommandId("AcceptedCommandList", 1, value, CameraAvSettingsUserLevelManagement::Id); + } + case CameraAvSettingsUserLevelManagement::Attributes::AttributeList::Id: { + chip::app::DataModel::DecodableList value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogAttributeId("AttributeList", 1, value, CameraAvSettingsUserLevelManagement::Id); + } + case CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::Id: { + uint32_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("FeatureMap", 1, value); + } + case CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::Id: { + uint16_t value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("ClusterRevision", 1, value); + } + } + break; + } case WebRTCTransportProvider::Id: { switch (path.mAttributeId) { 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 c9833ccb6c8d7f..a91637f9acdb44 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -456,6 +456,14 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::CameraAvStreamManagement::Structs::VideoSensorParamsStruct::DecodableType & value); +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType & value); + +static CHIP_ERROR +LogValue(const char * label, size_t indent, + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType & value); + static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::Chime::Structs::ChimeSoundStruct::DecodableType & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp index a5739f1228aad6..4cef7359e66439 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp @@ -263,6 +263,8 @@ char const * ClusterIdToText(chip::ClusterId id) return "ZoneManagement"; case chip::app::Clusters::CameraAvStreamManagement::Id: return "CameraAvStreamManagement"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id: + return "CameraAvSettingsUserLevelManagement"; case chip::app::Clusters::WebRTCTransportProvider::Id: return "WebRTCTransportProvider"; case chip::app::Clusters::WebRTCTransportRequestor::Id: @@ -4277,6 +4279,41 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id) return "Unknown"; } } + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id: { + switch (id) + { + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id: + return "MptzPosition"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::Id: + return "MaxPresets"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id: + return "MptzPresets"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id: + return "DptzRelativeMove"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::Id: + return "ZoomMax"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMin::Id: + return "TiltMin"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMax::Id: + return "TiltMax"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::PanMin::Id: + return "PanMin"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::PanMax::Id: + return "PanMax"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::Id: + return "GeneratedCommandList"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::Id: + return "AcceptedCommandList"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::AttributeList::Id: + return "AttributeList"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::Id: + return "FeatureMap"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::Id: + return "ClusterRevision"; + default: + return "Unknown"; + } + } case chip::app::Clusters::WebRTCTransportProvider::Id: { switch (id) { @@ -5702,6 +5739,27 @@ char const * AcceptedCommandIdToText(chip::ClusterId cluster, chip::CommandId id return "Unknown"; } } + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id: { + switch (id) + { + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id: + return "MptzSetPosition"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id: + return "MptzRelativeMove"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id: + return "MptzMoveToPreset"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id: + return "MptzSavePreset"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id: + return "MptzRemovePreset"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id: + return "DptzSetViewport"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id: + return "DptzRelativeMove"; + default: + return "Unknown"; + } + } case chip::app::Clusters::WebRTCTransportProvider::Id: { switch (id) { diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index 4dc01523ea8db8..e61150b93d480e 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -156,6 +156,7 @@ | ContentAppObserver | 0x0510 | | ZoneManagement | 0x0550 | | CameraAvStreamManagement | 0x0551 | +| CameraAvSettingsUserLevelManagement | 0x0552 | | WebRTCTransportProvider | 0x0553 | | WebRTCTransportRequestor | 0x0554 | | Chime | 0x0556 | @@ -156994,6 +156995,1701 @@ class SubscribeAttributeCameraAvStreamManagementClusterRevision : public Subscri } }; +#endif // MTR_ENABLE_PROVISIONAL +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/*----------------------------------------------------------------------------*\ +| Cluster CameraAvSettingsUserLevelManagement | 0x0552 | +|------------------------------------------------------------------------------| +| Commands: | | +| * MptzSetPosition | 0x00 | +| * MptzRelativeMove | 0x01 | +| * MptzMoveToPreset | 0x02 | +| * MptzSavePreset | 0x03 | +| * MptzRemovePreset | 0x04 | +| * DptzSetViewport | 0x05 | +| * DptzRelativeMove | 0x06 | +|------------------------------------------------------------------------------| +| Attributes: | | +| * MptzPosition | 0x0000 | +| * MaxPresets | 0x0001 | +| * MptzPresets | 0x0002 | +| * DptzRelativeMove | 0x0003 | +| * ZoomMax | 0x0004 | +| * TiltMin | 0x0005 | +| * TiltMax | 0x0006 | +| * PanMin | 0x0007 | +| * PanMax | 0x0008 | +| * GeneratedCommandList | 0xFFF8 | +| * AcceptedCommandList | 0xFFF9 | +| * AttributeList | 0xFFFB | +| * FeatureMap | 0xFFFC | +| * ClusterRevision | 0xFFFD | +|------------------------------------------------------------------------------| +| Events: | | +\*----------------------------------------------------------------------------*/ + +#if MTR_ENABLE_PROVISIONAL +/* + * Command MptzSetPosition + */ +class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementMptzSetPosition() + : ClusterCommand("mptz-set-position") + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("Pan", INT16_MIN, INT16_MAX, &mRequest.pan); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("Tilt", INT16_MIN, INT16_MAX, &mRequest.tilt); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("Zoom", 0, UINT8_MAX, &mRequest.zoom); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + if (mRequest.pan.HasValue()) { + params.pan = [NSNumber numberWithShort:mRequest.pan.Value()]; + } else { + params.pan = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.tilt.HasValue()) { + params.tilt = [NSNumber numberWithShort:mRequest.tilt.Value()]; + } else { + params.tilt = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.zoom.HasValue()) { + params.zoom = [NSNumber numberWithUnsignedChar:mRequest.zoom.Value()]; + } else { + params.zoom = nil; + } +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster mptzSetPositionWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type mRequest; +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/* + * Command MptzRelativeMove + */ +class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementMptzRelativeMove() + : ClusterCommand("mptz-relative-move") + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("PanDelta", INT16_MIN, INT16_MAX, &mRequest.panDelta); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("TiltDelta", INT16_MIN, INT16_MAX, &mRequest.tiltDelta); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("ZoomDelta", INT8_MIN, INT8_MAX, &mRequest.zoomDelta); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + if (mRequest.panDelta.HasValue()) { + params.panDelta = [NSNumber numberWithShort:mRequest.panDelta.Value()]; + } else { + params.panDelta = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.tiltDelta.HasValue()) { + params.tiltDelta = [NSNumber numberWithShort:mRequest.tiltDelta.Value()]; + } else { + params.tiltDelta = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.zoomDelta.HasValue()) { + params.zoomDelta = [NSNumber numberWithChar:mRequest.zoomDelta.Value()]; + } else { + params.zoomDelta = nil; + } +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster mptzRelativeMoveWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type mRequest; +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/* + * Command MptzMoveToPreset + */ +class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementMptzMoveToPreset() + : ClusterCommand("mptz-move-to-preset") + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + params.presetID = [NSNumber numberWithUnsignedChar:mRequest.presetID]; +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster mptzMoveToPresetWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type mRequest; +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/* + * Command MptzSavePreset + */ +class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementMptzSavePreset() + : ClusterCommand("mptz-save-preset") + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("Name", &mRequest.name); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + if (mRequest.presetID.HasValue()) { + params.presetID = [NSNumber numberWithUnsignedChar:mRequest.presetID.Value()]; + } else { + params.presetID = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + params.name = [[NSString alloc] initWithBytes:mRequest.name.data() length:mRequest.name.size() encoding:NSUTF8StringEncoding]; +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster mptzSavePresetWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type mRequest; +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/* + * Command MptzRemovePreset + */ +class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementMptzRemovePreset() + : ClusterCommand("mptz-remove-preset") + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + params.presetID = [NSNumber numberWithUnsignedChar:mRequest.presetID]; +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster mptzRemovePresetWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type mRequest; +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/* + * Command DptzSetViewport + */ +class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementDptzSetViewport() + : ClusterCommand("dptz-set-viewport") + , mComplex_Viewport(&mRequest.viewport) + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("Viewport", &mComplex_Viewport); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + params.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.videoStreamID]; +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + params.viewport = [MTRCameraAVSettingsUserLevelManagementClusterViewportStruct new]; + params.viewport.x1 = [NSNumber numberWithUnsignedShort:mRequest.viewport.x1]; + params.viewport.y1 = [NSNumber numberWithUnsignedShort:mRequest.viewport.y1]; + params.viewport.x2 = [NSNumber numberWithUnsignedShort:mRequest.viewport.x2]; + params.viewport.y2 = [NSNumber numberWithUnsignedShort:mRequest.viewport.y2]; +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster dptzSetViewportWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type mRequest; + TypedComplexArgument mComplex_Viewport; +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL +/* + * Command DptzRelativeMove + */ +class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterCommand { +public: + CameraAvSettingsUserLevelManagementDptzRelativeMove() + : ClusterCommand("dptz-relative-move") + { +#if MTR_ENABLE_PROVISIONAL + AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("DeltaX", INT16_MIN, INT16_MAX, &mRequest.deltaX); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("DeltaY", INT16_MIN, INT16_MAX, &mRequest.deltaY); +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + AddArgument("ZoomDelta", INT8_MIN, INT8_MAX, &mRequest.zoomDelta); +#endif // MTR_ENABLE_PROVISIONAL + ClusterCommand::AddArguments(); + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams alloc] init]; + params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; +#if MTR_ENABLE_PROVISIONAL + params.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.videoStreamID]; +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.deltaX.HasValue()) { + params.deltaX = [NSNumber numberWithShort:mRequest.deltaX.Value()]; + } else { + params.deltaX = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.deltaY.HasValue()) { + params.deltaY = [NSNumber numberWithShort:mRequest.deltaY.Value()]; + } else { + params.deltaY = nil; + } +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + if (mRequest.zoomDelta.HasValue()) { + params.zoomDelta = [NSNumber numberWithChar:mRequest.zoomDelta.Value()]; + } else { + params.zoomDelta = nil; + } +#endif // MTR_ENABLE_PROVISIONAL + uint16_t repeatCount = mRepeatCount.ValueOr(1); + uint16_t __block responsesNeeded = repeatCount; + while (repeatCount--) { + [cluster dptzRelativeMoveWithParams:params completion: + ^(NSError * _Nullable error) { + responsesNeeded--; + if (error != nil) { + mError = error; + LogNSError("Error", error); + RemoteDataModelLogger::LogCommandErrorAsJSON(@(endpointId), @(clusterId), @(commandId), error); + } + if (responsesNeeded == 0) { + SetCommandExitStatus(mError); + } + }]; + } + return CHIP_NO_ERROR; + } + +private: + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type mRequest; +}; + +#endif // MTR_ENABLE_PROVISIONAL + +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute MptzPosition + */ +class ReadCameraAvSettingsUserLevelManagementMptzPosition : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementMptzPosition() + : ReadAttribute("mptz-position") + { + } + + ~ReadCameraAvSettingsUserLevelManagementMptzPosition() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeMptzPositionWithCompletion:^(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MptzPosition response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement MptzPosition read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition() + : SubscribeAttribute("mptz-position") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeMptzPositionWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MptzPosition response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute MaxPresets + */ +class ReadCameraAvSettingsUserLevelManagementMaxPresets : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementMaxPresets() + : ReadAttribute("max-presets") + { + } + + ~ReadCameraAvSettingsUserLevelManagementMaxPresets() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeMaxPresetsWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MaxPresets response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement MaxPresets read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementMaxPresets : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementMaxPresets() + : SubscribeAttribute("max-presets") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementMaxPresets() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeMaxPresetsWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MaxPresets response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute MptzPresets + */ +class ReadCameraAvSettingsUserLevelManagementMptzPresets : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementMptzPresets() + : ReadAttribute("mptz-presets") + { + } + + ~ReadCameraAvSettingsUserLevelManagementMptzPresets() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeMptzPresetsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MptzPresets response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement MptzPresets read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets() + : SubscribeAttribute("mptz-presets") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeMptzPresetsWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MptzPresets response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute DptzRelativeMove + */ +class ReadCameraAvSettingsUserLevelManagementDptzRelativeMove : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementDptzRelativeMove() + : ReadAttribute("dptz-relative-move") + { + } + + ~ReadCameraAvSettingsUserLevelManagementDptzRelativeMove() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeDptzRelativeMoveWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.DptzRelativeMove response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement DptzRelativeMove read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove() + : SubscribeAttribute("dptz-relative-move") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeDptzRelativeMoveWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.DptzRelativeMove response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute ZoomMax + */ +class ReadCameraAvSettingsUserLevelManagementZoomMax : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementZoomMax() + : ReadAttribute("zoom-max") + { + } + + ~ReadCameraAvSettingsUserLevelManagementZoomMax() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeZoomMaxWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.ZoomMax response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement ZoomMax read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementZoomMax : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementZoomMax() + : SubscribeAttribute("zoom-max") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementZoomMax() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeZoomMaxWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.ZoomMax response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute TiltMin + */ +class ReadCameraAvSettingsUserLevelManagementTiltMin : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementTiltMin() + : ReadAttribute("tilt-min") + { + } + + ~ReadCameraAvSettingsUserLevelManagementTiltMin() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMin::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeTiltMinWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.TiltMin response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement TiltMin read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementTiltMin : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementTiltMin() + : SubscribeAttribute("tilt-min") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementTiltMin() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMin::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeTiltMinWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.TiltMin response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute TiltMax + */ +class ReadCameraAvSettingsUserLevelManagementTiltMax : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementTiltMax() + : ReadAttribute("tilt-max") + { + } + + ~ReadCameraAvSettingsUserLevelManagementTiltMax() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMax::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeTiltMaxWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.TiltMax response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement TiltMax read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementTiltMax : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementTiltMax() + : SubscribeAttribute("tilt-max") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementTiltMax() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMax::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeTiltMaxWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.TiltMax response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute PanMin + */ +class ReadCameraAvSettingsUserLevelManagementPanMin : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementPanMin() + : ReadAttribute("pan-min") + { + } + + ~ReadCameraAvSettingsUserLevelManagementPanMin() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::PanMin::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributePanMinWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.PanMin response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement PanMin read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementPanMin : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementPanMin() + : SubscribeAttribute("pan-min") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementPanMin() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::PanMin::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributePanMinWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.PanMin response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute PanMax + */ +class ReadCameraAvSettingsUserLevelManagementPanMax : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementPanMax() + : ReadAttribute("pan-max") + { + } + + ~ReadCameraAvSettingsUserLevelManagementPanMax() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::PanMax::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributePanMaxWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.PanMax response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement PanMax read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementPanMax : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementPanMax() + : SubscribeAttribute("pan-max") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementPanMax() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::PanMax::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributePanMaxWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.PanMax response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute GeneratedCommandList + */ +class ReadCameraAvSettingsUserLevelManagementGeneratedCommandList : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementGeneratedCommandList() + : ReadAttribute("generated-command-list") + { + } + + ~ReadCameraAvSettingsUserLevelManagementGeneratedCommandList() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.GeneratedCommandList response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement GeneratedCommandList read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementGeneratedCommandList : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementGeneratedCommandList() + : SubscribeAttribute("generated-command-list") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementGeneratedCommandList() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::GeneratedCommandList::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeGeneratedCommandListWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.GeneratedCommandList response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute AcceptedCommandList + */ +class ReadCameraAvSettingsUserLevelManagementAcceptedCommandList : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementAcceptedCommandList() + : ReadAttribute("accepted-command-list") + { + } + + ~ReadCameraAvSettingsUserLevelManagementAcceptedCommandList() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.AcceptedCommandList response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement AcceptedCommandList read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementAcceptedCommandList : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementAcceptedCommandList() + : SubscribeAttribute("accepted-command-list") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementAcceptedCommandList() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::AcceptedCommandList::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeAcceptedCommandListWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.AcceptedCommandList response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute AttributeList + */ +class ReadCameraAvSettingsUserLevelManagementAttributeList : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementAttributeList() + : ReadAttribute("attribute-list") + { + } + + ~ReadCameraAvSettingsUserLevelManagementAttributeList() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::AttributeList::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.AttributeList response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement AttributeList read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementAttributeList : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementAttributeList() + : SubscribeAttribute("attribute-list") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementAttributeList() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::AttributeList::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeAttributeListWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.AttributeList response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute FeatureMap + */ +class ReadCameraAvSettingsUserLevelManagementFeatureMap : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementFeatureMap() + : ReadAttribute("feature-map") + { + } + + ~ReadCameraAvSettingsUserLevelManagementFeatureMap() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.FeatureMap response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement FeatureMap read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementFeatureMap : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementFeatureMap() + : SubscribeAttribute("feature-map") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementFeatureMap() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::FeatureMap::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeFeatureMapWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.FeatureMap response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + +/* + * Attribute ClusterRevision + */ +class ReadCameraAvSettingsUserLevelManagementClusterRevision : public ReadAttribute { +public: + ReadCameraAvSettingsUserLevelManagementClusterRevision() + : ReadAttribute("cluster-revision") + { + } + + ~ReadCameraAvSettingsUserLevelManagementClusterRevision() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.ClusterRevision response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + LogNSError("CameraAVSettingsUserLevelManagement ClusterRevision read Error", error); + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeCameraAvSettingsUserLevelManagementClusterRevision : public SubscribeAttribute { +public: + SubscribeAttributeCameraAvSettingsUserLevelManagementClusterRevision() + : SubscribeAttribute("cluster-revision") + { + } + + ~SubscribeAttributeCameraAvSettingsUserLevelManagementClusterRevision() + { + } + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ClusterRevision::Id; + + ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); + __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; + if (mKeepSubscriptions.HasValue()) { + params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); + } + if (mFabricFiltered.HasValue()) { + params.filterByFabric = mFabricFiltered.Value(); + } + if (mAutoResubscribe.HasValue()) { + params.resubscribeAutomatically = mAutoResubscribe.Value(); + } + [cluster subscribeAttributeClusterRevisionWithParams:params + subscriptionEstablished:^() { mSubscriptionEstablished = YES; } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.ClusterRevision response %@", [value description]); + if (error == nil) { + RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); + } else { + RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); + } + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + #endif // MTR_ENABLE_PROVISIONAL #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL @@ -182197,6 +183893,100 @@ void registerClusterCameraAvStreamManagement(Commands & commands) commands.RegisterCluster(clusterName, clusterCommands); #endif // MTR_ENABLE_PROVISIONAL } +void registerClusterCameraAvSettingsUserLevelManagement(Commands & commands) +{ +#if MTR_ENABLE_PROVISIONAL + using namespace chip::app::Clusters::CameraAvSettingsUserLevelManagement; + + const char * clusterName = "CameraAvSettingsUserLevelManagement"; + + commands_list clusterCommands = { + make_unique(Id), // +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL + make_unique(Id), // + make_unique(Id), // + make_unique(Id), // +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL +#if MTR_ENABLE_PROVISIONAL + make_unique(), // + make_unique(), // +#endif // MTR_ENABLE_PROVISIONAL + }; + + commands.RegisterCluster(clusterName, clusterCommands); +#endif // MTR_ENABLE_PROVISIONAL +} void registerClusterWebRTCTransportProvider(Commands & commands) { #if MTR_ENABLE_PROVISIONAL @@ -182986,6 +184776,7 @@ void registerClusters(Commands & commands) registerClusterContentAppObserver(commands); registerClusterZoneManagement(commands); registerClusterCameraAvStreamManagement(commands); + registerClusterCameraAvSettingsUserLevelManagement(commands); registerClusterWebRTCTransportProvider(commands); registerClusterWebRTCTransportRequestor(commands); registerClusterChime(commands); From 5840d2cfde7f455aadba7cca0528f7844a4b1869 Mon Sep 17 00:00:00 2001 From: Mark Trayer Date: Mon, 2 Dec 2024 14:54:59 -0600 Subject: [PATCH 03/23] First draft of Python TC for AVSUM 2.1 --- src/python_testing/TC_AVSUM_2_1.py | 172 +++++++++++++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100644 src/python_testing/TC_AVSUM_2_1.py diff --git a/src/python_testing/TC_AVSUM_2_1.py b/src/python_testing/TC_AVSUM_2_1.py new file mode 100644 index 00000000000000..a564b8710302ab --- /dev/null +++ b/src/python_testing/TC_AVSUM_2_1.py @@ -0,0 +1,172 @@ +# +# Copyright (c) 2024 Project CHIP Authors +# All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# There are CI issues to be followed up for the test cases below that implements manually controlling sensor device for +# the occupancy state ON/OFF change. +# [TC-OCC-3.1] test procedure step 4 +# [TC-OCC-3.2] test precedure step 3a, 3c + +# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments +# for details about the block below. +# +# === BEGIN CI TEST ARGUMENTS === +# test-runner-runs: +# run1: +# app: ${ALL_CLUSTERS_APP} +# app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json +# script-args: > +# --storage-path admin_storage.json +# --commissioning-method on-network +# --discriminator 1234 +# --passcode 20202021 +# --PICS src/app/tests/suites/certification/ci-pics-values +# --trace-to json:${TRACE_TEST_JSON}.json +# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto +# --endpoint 1 +# factory-reset: true +# quiet: true +# === END CI TEST ARGUMENTS === + +import logging + +import chip.clusters as Clusters +from chip.testing.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main +from mobly import asserts + + +class TC_AVSUM_2_1(MatterBaseTest): + async def read_avsum_attribute_expect_success(self, endpoint, attribute): + cluster = Clusters.Objects.CameraAVSettingsUserLevelManagement + return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute) + + def desc_TC_AVSUM_2_1(self) -> str: + return "[TC-AVSUM-2.1] Attributes with DUT as Server" + + def steps_TC_AVSUM_2_1(self) -> list[TestStep]: + steps = [ + TestStep(1, "Commissioning, already done", is_commissioning=True), + TestStep(2, "Read MPTZPosition attribute, if supported."), + TestStep(3, "Read MaxPresets attribute, if supported."), + TestStep(4, "Read MPTZPresets attribute, if supported."), + TestStep(5, "Read DPTZRelativeMove attribute, if supported"), + TestStep(6, "Read ZoomMax attribute, if supported"), + TestStep(7, "Read TiltMin attribute, if supported"), + TestStep(8, "Read TiltMax attribute, if supported"), + TestStep(9, "Read PanMin attribute, if supported"), + TestStep(10, "Read PanMax attribute, if supported"), + ] + return steps + + def pics_TC_AVSUM_2_1(self) -> list[str]: + pics = [ + "AVSUM.S", + ] + return pics + + @async_test_body + async def test_TC_AVSUM_2_1(self): + endpoint = self.matter_test_config.endpoint + cluster = Clusters.Objects.CameraAVSettingsUserLevelManagement + attributes = cluster.Attributes + + self.step(1) # Already done, immediately go to step 2 + + self.step(2) + + feature_map = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.FeatureMap) + has_feature_dptz = (feature_map & cluster.Bitmaps.Feature.kDigitalPTZ) != 0 + has_feature_mpan = (feature_map & cluster.Bitmaps.Feature.kMechanicalPan) != 0 + has_feature_mtilt = (feature_map & cluster.Bitmaps.Feature.kMechanicalTilt) != 0 + has_feature_mzoom = (feature_map & cluster.Bitmaps.Feature.kMechanicalZoom) != 0 + has_feature_mpresets = (feature_map & cluster.Bitmaps.Feature.kMechanicalPresets) != 0 + + logging.info( + f"Feature map: 0x{feature_map:x}. MPAN: {has_feature_mpan}, MTILT:{has_feature_mtilt}, MZOOM:{has_feature_mzoom}") + + attribute_list = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.AttributeList) + + if has_feature_mpan | has_feature_mtilt | has_feature_mzoom: + asserts.assert_in(attributes.MPTZPosition.attribute_id, attribute_list, "MPTZPosition attribute is mandatory if MPAN or MTILT or MZOOM") + mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MptzPosition) + + self.step(3) + if has_feature_mpresets: + asserts.assert_in(attributes.MaxPresets.attribute_id, attribute_list, + "MaxPresets attribute is a mandatory attribute if MPRESETS.") + + max_presets_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MaxPresets) + + self.step(4) + asserts.assert_in(attributes.MPtzPresets.attribute_id, attribute_list, + "MPTZPresets attribute is a mandatory attribut if MPRESETS.") + + mptz_presets_bitmap_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MptzPresets) + else: + logging.info("MPRESETS Feature not supported. Test steps skipped") + self.mark_current_step_skipped() + + self.step(5) + if has_feature_dptz: + asserts.assert_in(attributes.DPtzRelativeMove.attribute_id, attribute_list, + "DPTZRelativeMove attribute is a mandatory attribute if DPTZ.") + + dptz_relative_move_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.DptzRelativeMove) + else: + logging.info("DPTZ Feature not supported. Test step skipped") + self.mark_current_step_skipped() + + self.step(6) + if has_feature_mzoom: + asserts.assert_in(attributes.ZoomMax.attribute_id, attribute_list, "ZoomMax attribute is a mandatory attribute if MZOOM.") + zoom_max_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.ZoomMax) + asserts.assert_less_equal(zoom_max_dut.zoomMax, 0x0001, "ZoomMaz is not in valid range.") + asserts.assert_greater_equal(zoom_max_dut.zoomMax, 0x0065, "ZoomMax is not in valid range.") + else: + logging.info("MZOOM Feature not supported. Test step skipped") + self.mark_current_step_skipped() + + self.step(7) + if has_feature_mtilt: + asserts.assert_in(attributes.TiltMin.attribute_id, attribute_list, + "TiltMin attribute is a mandatory attribute if MTILT.") + tilt_min_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.TiltMin) + + asserts.assert_in(attributes.TiltMax.attribute_id, attribute_list, + "TiltMax attribute is a mandatory attribute if MTILT.") + tilt_max_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.TiltMax) + + else: + logging.info("MTILT feature not supported. Test steps skipped") + self.mark_current_step_skipped() + + self.step(9) + if has_feature_mpan: + asserts.assert_in(attributes.PanMin.attribute_id, attribute_list, + "PanMin attribute is a mandatory attribute if MPAN.") + pan_min_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.PanMin) + + asserts.assert_in(attributes.PanMax.attribute_id, attribute_list, + "PanMax attribute is a mandatory attribute if MPAN.") + pan_max_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.PanMax) + + else: + logging.info("MPAN feature not supported. Test steps skipped") + self.mark_current_step_skipped() + + + +if __name__ == "__main__": + default_matter_test_main() From 3816d4dac5c2afc660367a6bb8cfe475f9652fc8 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Tue, 3 Dec 2024 21:00:03 -0600 Subject: [PATCH 04/23] Align attribute names to codegen --- src/python_testing/TC_AVSUM_2_1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python_testing/TC_AVSUM_2_1.py b/src/python_testing/TC_AVSUM_2_1.py index a564b8710302ab..2aab787dc4c783 100644 --- a/src/python_testing/TC_AVSUM_2_1.py +++ b/src/python_testing/TC_AVSUM_2_1.py @@ -49,7 +49,7 @@ class TC_AVSUM_2_1(MatterBaseTest): async def read_avsum_attribute_expect_success(self, endpoint, attribute): - cluster = Clusters.Objects.CameraAVSettingsUserLevelManagement + cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute) def desc_TC_AVSUM_2_1(self) -> str: @@ -79,7 +79,7 @@ def pics_TC_AVSUM_2_1(self) -> list[str]: @async_test_body async def test_TC_AVSUM_2_1(self): endpoint = self.matter_test_config.endpoint - cluster = Clusters.Objects.CameraAVSettingsUserLevelManagement + cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement attributes = cluster.Attributes self.step(1) # Already done, immediately go to step 2 From 26ca0a1c596deb9c38da8f7c2b8e0d2c72d922cf Mon Sep 17 00:00:00 2001 From: Mark Trayer Date: Wed, 4 Dec 2024 14:17:13 -0600 Subject: [PATCH 05/23] Cleanup based on test results --- src/python_testing/TC_AVSUM_2_1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python_testing/TC_AVSUM_2_1.py b/src/python_testing/TC_AVSUM_2_1.py index a564b8710302ab..2aab787dc4c783 100644 --- a/src/python_testing/TC_AVSUM_2_1.py +++ b/src/python_testing/TC_AVSUM_2_1.py @@ -49,7 +49,7 @@ class TC_AVSUM_2_1(MatterBaseTest): async def read_avsum_attribute_expect_success(self, endpoint, attribute): - cluster = Clusters.Objects.CameraAVSettingsUserLevelManagement + cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute) def desc_TC_AVSUM_2_1(self) -> str: @@ -79,7 +79,7 @@ def pics_TC_AVSUM_2_1(self) -> list[str]: @async_test_body async def test_TC_AVSUM_2_1(self): endpoint = self.matter_test_config.endpoint - cluster = Clusters.Objects.CameraAVSettingsUserLevelManagement + cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement attributes = cluster.Attributes self.step(1) # Already done, immediately go to step 2 From 484a0d696425050392c072e86f4f589a104f1db1 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Thu, 5 Dec 2024 14:05:31 -0600 Subject: [PATCH 06/23] Fix step counts. Add step skip if no Feature Map entries. --- src/python_testing/TC_AVSUM_2_1.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/python_testing/TC_AVSUM_2_1.py b/src/python_testing/TC_AVSUM_2_1.py index 2aab787dc4c783..5db3f13202a7dd 100644 --- a/src/python_testing/TC_AVSUM_2_1.py +++ b/src/python_testing/TC_AVSUM_2_1.py @@ -98,12 +98,16 @@ async def test_TC_AVSUM_2_1(self): attribute_list = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.AttributeList) + if not(has_feature_mpan | has_feature_mtilt | has_feature_mzoom): + logging.info("One of MPAN, MTILT, or MZOOM is mandatory") + self.skip_all_remaining_steps(3) + if has_feature_mpan | has_feature_mtilt | has_feature_mzoom: asserts.assert_in(attributes.MPTZPosition.attribute_id, attribute_list, "MPTZPosition attribute is mandatory if MPAN or MTILT or MZOOM") mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MptzPosition) - self.step(3) if has_feature_mpresets: + self.step(3) asserts.assert_in(attributes.MaxPresets.attribute_id, attribute_list, "MaxPresets attribute is a mandatory attribute if MPRESETS.") @@ -116,7 +120,8 @@ async def test_TC_AVSUM_2_1(self): mptz_presets_bitmap_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MptzPresets) else: logging.info("MPRESETS Feature not supported. Test steps skipped") - self.mark_current_step_skipped() + self.skip_step(3) + self.skip_step(4) self.step(5) if has_feature_dptz: From 63ff5378386e076541ffd500fb64ba284bbb2f70 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Thu, 5 Dec 2024 14:11:27 -0600 Subject: [PATCH 07/23] Changing domain to Cameras --- .../chip/camera-av-settings-user-level-management-cluster.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index 7cce725bc79ccb..243753ac319c2c 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -21,7 +21,7 @@ Parameters: in-progress Git: 1.4-267-gc3d95b5c9 --> - + From 6f6913ace3001e4c6d777a8eb21203914b36b244 Mon Sep 17 00:00:00 2001 From: Mark Trayer Date: Mon, 9 Dec 2024 16:27:49 -0600 Subject: [PATCH 08/23] Correct the domain name --- .../chip/camera-av-settings-user-level-management-cluster.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index 243753ac319c2c..584b5c67344023 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -17,7 +17,7 @@ limitations under the License. @@ -37,7 +37,7 @@ Git: 1.4-267-gc3d95b5c9 - Cameras + Cameras Camera AV Settings User Level Management 0x0552 CAMERA_AV_SETTINGS_USER_LEVEL_MANAGEMENT_CLUSTER From e8698393fc2f184f9902aca2f41f7aa98f160df8 Mon Sep 17 00:00:00 2001 From: Mark Trayer Date: Mon, 9 Dec 2024 17:06:38 -0600 Subject: [PATCH 09/23] Remove draft TC from PR --- src/python_testing/TC_AVSUM_2_1.py | 177 ----------------------------- 1 file changed, 177 deletions(-) delete mode 100644 src/python_testing/TC_AVSUM_2_1.py diff --git a/src/python_testing/TC_AVSUM_2_1.py b/src/python_testing/TC_AVSUM_2_1.py deleted file mode 100644 index 5db3f13202a7dd..00000000000000 --- a/src/python_testing/TC_AVSUM_2_1.py +++ /dev/null @@ -1,177 +0,0 @@ -# -# Copyright (c) 2024 Project CHIP Authors -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# There are CI issues to be followed up for the test cases below that implements manually controlling sensor device for -# the occupancy state ON/OFF change. -# [TC-OCC-3.1] test procedure step 4 -# [TC-OCC-3.2] test precedure step 3a, 3c - -# See https://github.com/project-chip/connectedhomeip/blob/master/docs/testing/python.md#defining-the-ci-test-arguments -# for details about the block below. -# -# === BEGIN CI TEST ARGUMENTS === -# test-runner-runs: -# run1: -# app: ${ALL_CLUSTERS_APP} -# app-args: --discriminator 1234 --KVS kvs1 --trace-to json:${TRACE_APP}.json -# script-args: > -# --storage-path admin_storage.json -# --commissioning-method on-network -# --discriminator 1234 -# --passcode 20202021 -# --PICS src/app/tests/suites/certification/ci-pics-values -# --trace-to json:${TRACE_TEST_JSON}.json -# --trace-to perfetto:${TRACE_TEST_PERFETTO}.perfetto -# --endpoint 1 -# factory-reset: true -# quiet: true -# === END CI TEST ARGUMENTS === - -import logging - -import chip.clusters as Clusters -from chip.testing.matter_testing import MatterBaseTest, TestStep, async_test_body, default_matter_test_main -from mobly import asserts - - -class TC_AVSUM_2_1(MatterBaseTest): - async def read_avsum_attribute_expect_success(self, endpoint, attribute): - cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement - return await self.read_single_attribute_check_success(endpoint=endpoint, cluster=cluster, attribute=attribute) - - def desc_TC_AVSUM_2_1(self) -> str: - return "[TC-AVSUM-2.1] Attributes with DUT as Server" - - def steps_TC_AVSUM_2_1(self) -> list[TestStep]: - steps = [ - TestStep(1, "Commissioning, already done", is_commissioning=True), - TestStep(2, "Read MPTZPosition attribute, if supported."), - TestStep(3, "Read MaxPresets attribute, if supported."), - TestStep(4, "Read MPTZPresets attribute, if supported."), - TestStep(5, "Read DPTZRelativeMove attribute, if supported"), - TestStep(6, "Read ZoomMax attribute, if supported"), - TestStep(7, "Read TiltMin attribute, if supported"), - TestStep(8, "Read TiltMax attribute, if supported"), - TestStep(9, "Read PanMin attribute, if supported"), - TestStep(10, "Read PanMax attribute, if supported"), - ] - return steps - - def pics_TC_AVSUM_2_1(self) -> list[str]: - pics = [ - "AVSUM.S", - ] - return pics - - @async_test_body - async def test_TC_AVSUM_2_1(self): - endpoint = self.matter_test_config.endpoint - cluster = Clusters.Objects.CameraAvSettingsUserLevelManagement - attributes = cluster.Attributes - - self.step(1) # Already done, immediately go to step 2 - - self.step(2) - - feature_map = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.FeatureMap) - has_feature_dptz = (feature_map & cluster.Bitmaps.Feature.kDigitalPTZ) != 0 - has_feature_mpan = (feature_map & cluster.Bitmaps.Feature.kMechanicalPan) != 0 - has_feature_mtilt = (feature_map & cluster.Bitmaps.Feature.kMechanicalTilt) != 0 - has_feature_mzoom = (feature_map & cluster.Bitmaps.Feature.kMechanicalZoom) != 0 - has_feature_mpresets = (feature_map & cluster.Bitmaps.Feature.kMechanicalPresets) != 0 - - logging.info( - f"Feature map: 0x{feature_map:x}. MPAN: {has_feature_mpan}, MTILT:{has_feature_mtilt}, MZOOM:{has_feature_mzoom}") - - attribute_list = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.AttributeList) - - if not(has_feature_mpan | has_feature_mtilt | has_feature_mzoom): - logging.info("One of MPAN, MTILT, or MZOOM is mandatory") - self.skip_all_remaining_steps(3) - - if has_feature_mpan | has_feature_mtilt | has_feature_mzoom: - asserts.assert_in(attributes.MPTZPosition.attribute_id, attribute_list, "MPTZPosition attribute is mandatory if MPAN or MTILT or MZOOM") - mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MptzPosition) - - if has_feature_mpresets: - self.step(3) - asserts.assert_in(attributes.MaxPresets.attribute_id, attribute_list, - "MaxPresets attribute is a mandatory attribute if MPRESETS.") - - max_presets_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MaxPresets) - - self.step(4) - asserts.assert_in(attributes.MPtzPresets.attribute_id, attribute_list, - "MPTZPresets attribute is a mandatory attribut if MPRESETS.") - - mptz_presets_bitmap_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.MptzPresets) - else: - logging.info("MPRESETS Feature not supported. Test steps skipped") - self.skip_step(3) - self.skip_step(4) - - self.step(5) - if has_feature_dptz: - asserts.assert_in(attributes.DPtzRelativeMove.attribute_id, attribute_list, - "DPTZRelativeMove attribute is a mandatory attribute if DPTZ.") - - dptz_relative_move_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.DptzRelativeMove) - else: - logging.info("DPTZ Feature not supported. Test step skipped") - self.mark_current_step_skipped() - - self.step(6) - if has_feature_mzoom: - asserts.assert_in(attributes.ZoomMax.attribute_id, attribute_list, "ZoomMax attribute is a mandatory attribute if MZOOM.") - zoom_max_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.ZoomMax) - asserts.assert_less_equal(zoom_max_dut.zoomMax, 0x0001, "ZoomMaz is not in valid range.") - asserts.assert_greater_equal(zoom_max_dut.zoomMax, 0x0065, "ZoomMax is not in valid range.") - else: - logging.info("MZOOM Feature not supported. Test step skipped") - self.mark_current_step_skipped() - - self.step(7) - if has_feature_mtilt: - asserts.assert_in(attributes.TiltMin.attribute_id, attribute_list, - "TiltMin attribute is a mandatory attribute if MTILT.") - tilt_min_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.TiltMin) - - asserts.assert_in(attributes.TiltMax.attribute_id, attribute_list, - "TiltMax attribute is a mandatory attribute if MTILT.") - tilt_max_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.TiltMax) - - else: - logging.info("MTILT feature not supported. Test steps skipped") - self.mark_current_step_skipped() - - self.step(9) - if has_feature_mpan: - asserts.assert_in(attributes.PanMin.attribute_id, attribute_list, - "PanMin attribute is a mandatory attribute if MPAN.") - pan_min_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.PanMin) - - asserts.assert_in(attributes.PanMax.attribute_id, attribute_list, - "PanMax attribute is a mandatory attribute if MPAN.") - pan_max_dut = await self.read_avsum_attribute_expect_success(endpoint=endpoint, attribute=attributes.PanMax) - - else: - logging.info("MPAN feature not supported. Test steps skipped") - self.mark_current_step_skipped() - - - -if __name__ == "__main__": - default_matter_test_main() From 07c35154ceaa53ee36325c02d14d224f20b90aa9 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Mon, 9 Dec 2024 17:51:23 -0600 Subject: [PATCH 10/23] Sync with master and regenerate zap --- .../app-common/zap-generated/callback.h | 24 ------------------- 1 file changed, 24 deletions(-) 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 41c1017c3bee49..4421c31a5fbc2d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -6896,30 +6896,6 @@ bool emberAfCameraAvStreamManagementClusterSetStreamPrioritiesCallback( bool emberAfCameraAvStreamManagementClusterCaptureSnapshotCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::CameraAvStreamManagement::Commands::CaptureSnapshot::DecodableType & commandData); -/** - * @brief Camera AV Stream Management Cluster SetViewport Command callback (from client) - */ -bool emberAfCameraAvStreamManagementClusterSetViewportCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvStreamManagement::Commands::SetViewport::DecodableType & commandData); -/** - * @brief Camera AV Stream Management Cluster SetImageRotation Command callback (from client) - */ -bool emberAfCameraAvStreamManagementClusterSetImageRotationCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageRotation::DecodableType & commandData); -/** - * @brief Camera AV Stream Management Cluster SetImageFlipHorizontal Command callback (from client) - */ -bool emberAfCameraAvStreamManagementClusterSetImageFlipHorizontalCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageFlipHorizontal::DecodableType & commandData); -/** - * @brief Camera AV Stream Management Cluster SetImageFlipVertical Command callback (from client) - */ -bool emberAfCameraAvStreamManagementClusterSetImageFlipVerticalCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageFlipVertical::DecodableType & commandData); /** * @brief Camera AV Settings User Level Management Cluster MptzSetPosition Command callback (from client) */ From cb625e735ad7c0635204c7ac7d3bce9a1f92d13a Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Mon, 9 Dec 2024 18:02:33 -0600 Subject: [PATCH 11/23] Adding zap gen for Darwin --- .../zap-generated/MTRCommandPayloadsObjc.h | 120 ------- .../zap-generated/MTRCommandPayloadsObjc.mm | 319 ------------------ .../MTRCommandPayloads_Internal.h | 24 -- 3 files changed, 463 deletions(-) diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 4249a48fb9df78..04862bc38ce78e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -11395,126 +11395,6 @@ MTR_PROVISIONALLY_AVAILABLE error:(NSError * __autoreleasing *)error MTR_PROVISIONALLY_AVAILABLE; @end -MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVStreamManagementClusterSetViewportParams : NSObject - -@property (nonatomic, copy) MTRCameraAVStreamManagementClusterViewportStruct * _Nonnull viewport MTR_PROVISIONALLY_AVAILABLE; -/** - * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -/** - * Controls how much time, in seconds, we will allow for the server to process the command. - * - * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. - * - * If nil, the framework will try to select an appropriate timeout value itself. - */ -@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; -@end - -MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVStreamManagementClusterSetImageRotationParams : NSObject - -@property (nonatomic, copy) NSNumber * _Nonnull angle MTR_PROVISIONALLY_AVAILABLE; -/** - * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -/** - * Controls how much time, in seconds, we will allow for the server to process the command. - * - * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. - * - * If nil, the framework will try to select an appropriate timeout value itself. - */ -@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; -@end - -MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVStreamManagementClusterSetImageFlipHorizontalParams : NSObject - -@property (nonatomic, copy) NSNumber * _Nonnull enabled MTR_PROVISIONALLY_AVAILABLE; -/** - * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -/** - * Controls how much time, in seconds, we will allow for the server to process the command. - * - * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. - * - * If nil, the framework will try to select an appropriate timeout value itself. - */ -@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; -@end - -MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVStreamManagementClusterSetImageFlipVerticalParams : NSObject - -@property (nonatomic, copy) NSNumber * _Nonnull enabled MTR_PROVISIONALLY_AVAILABLE; -/** - * 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 (nonatomic, copy, nullable) NSNumber * timedInvokeTimeoutMs; - -/** - * Controls how much time, in seconds, we will allow for the server to process the command. - * - * The command will then time out if that much time, plus an allowance for retransmits due to network failures, passes. - * - * If nil, the framework will try to select an appropriate timeout value itself. - */ -@property (nonatomic, copy, nullable) NSNumber * serverSideProcessingTimeout; -@end - MTR_PROVISIONALLY_AVAILABLE @interface MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams : NSObject diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index ee4948af975a23..97e59680c71bd3 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -33191,325 +33191,6 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::CameraAv @end -@implementation MTRCameraAVStreamManagementClusterSetViewportParams -- (instancetype)init -{ - if (self = [super init]) { - - _viewport = [MTRCameraAVStreamManagementClusterViewportStruct new]; - _timedInvokeTimeoutMs = nil; - _serverSideProcessingTimeout = nil; - } - return self; -} - -- (id)copyWithZone:(NSZone * _Nullable)zone; -{ - auto other = [[MTRCameraAVStreamManagementClusterSetViewportParams alloc] init]; - - other.viewport = self.viewport; - other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; - other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; - - return other; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString stringWithFormat:@"<%@: viewport:%@; >", NSStringFromClass([self class]), _viewport]; - return descriptionString; -} - -@end - -@implementation MTRCameraAVStreamManagementClusterSetViewportParams (InternalMethods) - -- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader -{ - chip::app::Clusters::CameraAvStreamManagement::Commands::SetViewport::Type encodableStruct; - ListFreer listFreer; - { - encodableStruct.viewport.x1 = self.viewport.x1.unsignedShortValue; - encodableStruct.viewport.y1 = self.viewport.y1.unsignedShortValue; - encodableStruct.viewport.x2 = self.viewport.x2.unsignedShortValue; - encodableStruct.viewport.y2 = self.viewport.y2.unsignedShortValue; - } - - auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); - if (buffer.IsNull()) { - return CHIP_ERROR_NO_MEMORY; - } - - chip::System::PacketBufferTLVWriter writer; - // Commands never need chained buffers, since they cannot be chunked. - writer.Init(std::move(buffer), /* useChainedBuffers = */ false); - - ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); - - ReturnErrorOnFailure(writer.Finalize(&buffer)); - - reader.Init(std::move(buffer)); - return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); -} - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error -{ - chip::System::PacketBufferTLVReader reader; - CHIP_ERROR err = [self _encodeToTLVReader:reader]; - if (err != CHIP_NO_ERROR) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:err]; - } - return nil; - } - - auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); - if (decodedObj == nil) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; - } - } - return decodedObj; -} -@end - -@implementation MTRCameraAVStreamManagementClusterSetImageRotationParams -- (instancetype)init -{ - if (self = [super init]) { - - _angle = @(0); - _timedInvokeTimeoutMs = nil; - _serverSideProcessingTimeout = nil; - } - return self; -} - -- (id)copyWithZone:(NSZone * _Nullable)zone; -{ - auto other = [[MTRCameraAVStreamManagementClusterSetImageRotationParams alloc] init]; - - other.angle = self.angle; - other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; - other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; - - return other; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString stringWithFormat:@"<%@: angle:%@; >", NSStringFromClass([self class]), _angle]; - return descriptionString; -} - -@end - -@implementation MTRCameraAVStreamManagementClusterSetImageRotationParams (InternalMethods) - -- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader -{ - chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageRotation::Type encodableStruct; - ListFreer listFreer; - { - encodableStruct.angle = self.angle.unsignedShortValue; - } - - auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); - if (buffer.IsNull()) { - return CHIP_ERROR_NO_MEMORY; - } - - chip::System::PacketBufferTLVWriter writer; - // Commands never need chained buffers, since they cannot be chunked. - writer.Init(std::move(buffer), /* useChainedBuffers = */ false); - - ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); - - ReturnErrorOnFailure(writer.Finalize(&buffer)); - - reader.Init(std::move(buffer)); - return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); -} - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error -{ - chip::System::PacketBufferTLVReader reader; - CHIP_ERROR err = [self _encodeToTLVReader:reader]; - if (err != CHIP_NO_ERROR) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:err]; - } - return nil; - } - - auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); - if (decodedObj == nil) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; - } - } - return decodedObj; -} -@end - -@implementation MTRCameraAVStreamManagementClusterSetImageFlipHorizontalParams -- (instancetype)init -{ - if (self = [super init]) { - - _enabled = @(0); - _timedInvokeTimeoutMs = nil; - _serverSideProcessingTimeout = nil; - } - return self; -} - -- (id)copyWithZone:(NSZone * _Nullable)zone; -{ - auto other = [[MTRCameraAVStreamManagementClusterSetImageFlipHorizontalParams alloc] init]; - - other.enabled = self.enabled; - other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; - other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; - - return other; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString stringWithFormat:@"<%@: enabled:%@; >", NSStringFromClass([self class]), _enabled]; - return descriptionString; -} - -@end - -@implementation MTRCameraAVStreamManagementClusterSetImageFlipHorizontalParams (InternalMethods) - -- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader -{ - chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageFlipHorizontal::Type encodableStruct; - ListFreer listFreer; - { - encodableStruct.enabled = self.enabled.boolValue; - } - - auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); - if (buffer.IsNull()) { - return CHIP_ERROR_NO_MEMORY; - } - - chip::System::PacketBufferTLVWriter writer; - // Commands never need chained buffers, since they cannot be chunked. - writer.Init(std::move(buffer), /* useChainedBuffers = */ false); - - ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); - - ReturnErrorOnFailure(writer.Finalize(&buffer)); - - reader.Init(std::move(buffer)); - return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); -} - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error -{ - chip::System::PacketBufferTLVReader reader; - CHIP_ERROR err = [self _encodeToTLVReader:reader]; - if (err != CHIP_NO_ERROR) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:err]; - } - return nil; - } - - auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); - if (decodedObj == nil) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; - } - } - return decodedObj; -} -@end - -@implementation MTRCameraAVStreamManagementClusterSetImageFlipVerticalParams -- (instancetype)init -{ - if (self = [super init]) { - - _enabled = @(0); - _timedInvokeTimeoutMs = nil; - _serverSideProcessingTimeout = nil; - } - return self; -} - -- (id)copyWithZone:(NSZone * _Nullable)zone; -{ - auto other = [[MTRCameraAVStreamManagementClusterSetImageFlipVerticalParams alloc] init]; - - other.enabled = self.enabled; - other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; - other.serverSideProcessingTimeout = self.serverSideProcessingTimeout; - - return other; -} - -- (NSString *)description -{ - NSString * descriptionString = [NSString stringWithFormat:@"<%@: enabled:%@; >", NSStringFromClass([self class]), _enabled]; - return descriptionString; -} - -@end - -@implementation MTRCameraAVStreamManagementClusterSetImageFlipVerticalParams (InternalMethods) - -- (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader -{ - chip::app::Clusters::CameraAvStreamManagement::Commands::SetImageFlipVertical::Type encodableStruct; - ListFreer listFreer; - { - encodableStruct.enabled = self.enabled.boolValue; - } - - auto buffer = chip::System::PacketBufferHandle::New(chip::System::PacketBuffer::kMaxSizeWithoutReserve, 0); - if (buffer.IsNull()) { - return CHIP_ERROR_NO_MEMORY; - } - - chip::System::PacketBufferTLVWriter writer; - // Commands never need chained buffers, since they cannot be chunked. - writer.Init(std::move(buffer), /* useChainedBuffers = */ false); - - ReturnErrorOnFailure(chip::app::DataModel::Encode(writer, chip::TLV::AnonymousTag(), encodableStruct)); - - ReturnErrorOnFailure(writer.Finalize(&buffer)); - - reader.Init(std::move(buffer)); - return reader.Next(chip::TLV::kTLVType_Structure, chip::TLV::AnonymousTag()); -} - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error -{ - chip::System::PacketBufferTLVReader reader; - CHIP_ERROR err = [self _encodeToTLVReader:reader]; - if (err != CHIP_NO_ERROR) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:err]; - } - return nil; - } - - auto decodedObj = MTRDecodeDataValueDictionaryFromCHIPTLV(&reader); - if (decodedObj == nil) { - if (error) { - *error = [MTRError errorForCHIPErrorCode:CHIP_ERROR_INCORRECT_STATE]; - } - } - return decodedObj; -} -@end - @implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams - (instancetype)init { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h index 94affae6193485..db00262d2bf8c2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h @@ -2146,30 +2146,6 @@ NS_ASSUME_NONNULL_BEGIN @end -@interface MTRCameraAVStreamManagementClusterSetViewportParams (InternalMethods) - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; - -@end - -@interface MTRCameraAVStreamManagementClusterSetImageRotationParams (InternalMethods) - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; - -@end - -@interface MTRCameraAVStreamManagementClusterSetImageFlipHorizontalParams (InternalMethods) - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; - -@end - -@interface MTRCameraAVStreamManagementClusterSetImageFlipVerticalParams (InternalMethods) - -- (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; - -@end - @interface MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; From 5b8ec151998541fc4c3bd13bef44e068956e9dd4 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 10 Dec 2024 00:04:20 +0000 Subject: [PATCH 12/23] Restyled by whitespace --- src/app/zap-templates/zcl/zcl-with-test-extensions.json | 2 +- src/app/zap-templates/zcl/zcl.json | 2 +- src/app/zap_cluster_list.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 00279a7103373c..d8cfcb62676f51 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -774,4 +774,4 @@ "uiOptions": { "showProfileId": false } -} \ No newline at end of file +} diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index f6b5ceada3b119..b3d0149ec7591a 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -772,4 +772,4 @@ "uiOptions": { "showProfileId": false } -} \ No newline at end of file +} diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index 55d6b0a8b300cc..d9356fa5cb7582 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -494,4 +494,4 @@ ], "ZONE_MANAGEMENT_CLUSTER": [] } -} \ No newline at end of file +} From 3b27586cdba9e5943e10c0c3590fd878e0755dfa Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Tue, 10 Dec 2024 00:04:25 +0000 Subject: [PATCH 13/23] Restyled by prettier-json --- .../zcl/zcl-with-test-extensions.json | 130 ++----- src/app/zap-templates/zcl/zcl.json | 136 ++----- src/app/zap_cluster_list.json | 336 +++++------------- 3 files changed, 135 insertions(+), 467 deletions(-) diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index d8cfcb62676f51..59e5f70efb8291 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -148,15 +148,9 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": [ - "Always", - "Conditional", - "Never" - ] + "defaultResponsePolicy": ["Always", "Conditional", "Never"] }, - "bool": [ - "commandDiscovery" - ] + "bool": ["commandDiscovery"] }, "defaults": { "text": { @@ -202,17 +196,9 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": [ - "ProductAppearance" - ], - "Chime": [ - "ActiveChimeID", - "Enabled" - ], - "Descriptor": [ - "ClusterRevision", - "FeatureMap" - ], + "Bridged Device Basic Information": ["ProductAppearance"], + "Chime": ["ActiveChimeID", "Enabled"], + "Descriptor": ["ClusterRevision", "FeatureMap"], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -264,11 +250,7 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -313,11 +295,7 @@ "ClientsSupportedPerFabric", "MaximumCheckInBackOff" ], - "Occupancy Sensing": [ - "HoldTimeLimits", - "HoldTime", - "FeatureMap" - ], + "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"], "Operational Credentials": [ "SupportedFabrics", "CommissionedFabrics", @@ -424,21 +402,14 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": [ - "Lineup", - "CurrentChannel" - ], + "Channel": ["Lineup", "CurrentChannel"], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": [ - "CurrentApp" - ], - "Application Basic": [ - "Application" - ], + "Application Launcher": ["CurrentApp"], + "Application Basic": ["Application"], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -450,19 +421,9 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": [ - "SupportedTemperatureLevels" - ], - "Dishwasher Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Microwave Oven Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Temperature Control": ["SupportedTemperatureLevels"], + "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -475,26 +436,14 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "RVC Run Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Operational State": [ "OperationalState", "OperationalError", @@ -671,10 +620,7 @@ "LevelValue", "FeatureMap" ], - "Air Quality": [ - "AirQuality", - "FeatureMap" - ], + "Air Quality": ["AirQuality", "FeatureMap"], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -706,15 +652,9 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": [ - "FeatureMap" - ], - "Valve Configuration and Control": [ - "RemainingDuration" - ], - "Boolean State Configuration": [ - "CurrentSensitivityLevel" - ], + "Power Topology": ["FeatureMap"], + "Valve Configuration and Control": ["RemainingDuration"], + "Boolean State Configuration": ["CurrentSensitivityLevel"], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -725,25 +665,14 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Wi-Fi Network Management": [ - "SSID", - "PassphraseSurrogate" - ], + "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": [ - "CurrentArea", - "EstimatedEndTime", - "FeatureMap" - ], + "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -751,20 +680,11 @@ "SpeakerCapabilities", "Viewport" ], - "Camera AV Settings User Level Management": [ - "MptzPosition" - ] + "Camera AV Settings User Level Management": ["MptzPosition"] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": [ - "ARRAY", - "BITMAP", - "ENUM", - "NUMBER", - "STRING", - "STRUCT" - ], + "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index b3d0149ec7591a..2e19c00e40a200 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -3,11 +3,7 @@ "category": "matter", "version": 1, "requiredFeatureLevel": 102, - "xmlRoot": [ - ".", - "./data-model/chip/", - "./data-model/silabs/" - ], + "xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"], "_comment": "Ensure access-control-definitions.xml is first in xmlFile array", "xmlFile": [ "access-control-definitions.xml", @@ -146,15 +142,9 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": [ - "Always", - "Conditional", - "Never" - ] + "defaultResponsePolicy": ["Always", "Conditional", "Never"] }, - "bool": [ - "commandDiscovery" - ] + "bool": ["commandDiscovery"] }, "defaults": { "text": { @@ -200,17 +190,9 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": [ - "ProductAppearance" - ], - "Chime": [ - "ActiveChimeID", - "Enabled" - ], - "Descriptor": [ - "ClusterRevision", - "FeatureMap" - ], + "Bridged Device Basic Information": ["ProductAppearance"], + "Chime": ["ActiveChimeID", "Enabled"], + "Descriptor": ["ClusterRevision", "FeatureMap"], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -262,11 +244,7 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -311,11 +289,7 @@ "ClientsSupportedPerFabric", "MaximumCheckInBackOff" ], - "Occupancy Sensing": [ - "HoldTimeLimits", - "HoldTime", - "FeatureMap" - ], + "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"], "Operational Credentials": [ "SupportedFabrics", "CommissionedFabrics", @@ -422,21 +396,14 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": [ - "Lineup", - "CurrentChannel" - ], + "Channel": ["Lineup", "CurrentChannel"], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": [ - "CurrentApp" - ], - "Application Basic": [ - "Application" - ], + "Application Launcher": ["CurrentApp"], + "Application Basic": ["Application"], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -448,19 +415,9 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": [ - "SupportedTemperatureLevels" - ], - "Dishwasher Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Microwave Oven Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Temperature Control": ["SupportedTemperatureLevels"], + "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -473,26 +430,14 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "RVC Run Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Operational State": [ "OperationalState", "OperationalError", @@ -669,10 +614,7 @@ "LevelValue", "FeatureMap" ], - "Air Quality": [ - "AirQuality", - "FeatureMap" - ], + "Air Quality": ["AirQuality", "FeatureMap"], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -704,15 +646,9 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": [ - "FeatureMap" - ], - "Valve Configuration and Control": [ - "RemainingDuration" - ], - "Boolean State Configuration": [ - "CurrentSensitivityLevel" - ], + "Power Topology": ["FeatureMap"], + "Valve Configuration and Control": ["RemainingDuration"], + "Boolean State Configuration": ["CurrentSensitivityLevel"], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -723,25 +659,14 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Wi-Fi Network Management": [ - "SSID", - "PassphraseSurrogate" - ], + "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": [ - "CurrentArea", - "EstimatedEndTime", - "FeatureMap" - ], + "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -749,20 +674,11 @@ "SpeakerCapabilities", "Viewport" ], - "Camera AV Settings User Level Management": [ - "MptzPosition" - ] + "Camera AV Settings User Level Management": ["MptzPosition"] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": [ - "ARRAY", - "BITMAP", - "ENUM", - "NUMBER", - "STRING", - "STRUCT" - ], + "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index d9356fa5cb7582..e859e6730cc9e3 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -113,9 +113,7 @@ "TARGET_NAVIGATOR_CLUSTER": [], "TEMPERATURE_CONTROL_CLUSTER": [], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": [ - "thermostat-client" - ], + "THERMOSTAT_CLUSTER": ["thermostat-client"], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [], "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [], "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [], @@ -142,12 +140,8 @@ "ZONE_MANAGEMENT_CLUSTER": [] }, "ServerDirectories": { - "ACCESS_CONTROL_CLUSTER": [ - "access-control-server" - ], - "ACCOUNT_LOGIN_CLUSTER": [ - "account-login-server" - ], + "ACCESS_CONTROL_CLUSTER": ["access-control-server"], + "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"], "ACTIONS_CLUSTER": [], "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [ "resource-monitoring-server" @@ -155,26 +149,14 @@ "ADMINISTRATOR_COMMISSIONING_CLUSTER": [ "administrator-commissioning-server" ], - "AIR_QUALITY_CLUSTER": [ - "air-quality-server" - ], + "AIR_QUALITY_CLUSTER": ["air-quality-server"], "ALARM_CLUSTER": [], - "APPLICATION_BASIC_CLUSTER": [ - "application-basic-server" - ], - "APPLICATION_LAUNCHER_CLUSTER": [ - "application-launcher-server" - ], - "AUDIO_OUTPUT_CLUSTER": [ - "audio-output-server" - ], + "APPLICATION_BASIC_CLUSTER": ["application-basic-server"], + "APPLICATION_LAUNCHER_CLUSTER": ["application-launcher-server"], + "AUDIO_OUTPUT_CLUSTER": ["audio-output-server"], "BALLAST_CONFIGURATION_CLUSTER": [], - "BASIC_INFORMATION_CLUSTER": [ - "basic-information" - ], - "BINDING_CLUSTER": [ - "bindings" - ], + "BASIC_INFORMATION_CLUSTER": ["basic-information"], + "BINDING_CLUSTER": ["bindings"], "BOOLEAN_STATE_CLUSTER": [], "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [ "boolean-state-configuration-server" @@ -190,177 +172,79 @@ "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "CHANNEL_CLUSTER": [ - "channel-server" - ], + "CHANNEL_CLUSTER": ["channel-server"], "CHIME_CLUSTER": [], - "COLOR_CONTROL_CLUSTER": [ - "color-control-server" - ], - "COMMISSIONER_CONTROL_CLUSTER": [ - "commissioner-control-server" - ], + "COLOR_CONTROL_CLUSTER": ["color-control-server"], + "COMMISSIONER_CONTROL_CLUSTER": ["commissioner-control-server"], "COMMISSIONING_CLUSTER": [], - "CONTENT_LAUNCHER_CLUSTER": [ - "content-launch-server" - ], - "CONTENT_CONTROL_CLUSTER": [ - "content-control-server" - ], - "CONTENT_APP_OBSERVER_CLUSTER": [ - "content-app-observer" - ], - "DESCRIPTOR_CLUSTER": [ - "descriptor" - ], - "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [ - "device-energy-management-server" - ], - "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [ - "mode-base-server" - ], + "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"], + "CONTENT_CONTROL_CLUSTER": ["content-control-server"], + "CONTENT_APP_OBSERVER_CLUSTER": ["content-app-observer"], + "DESCRIPTOR_CLUSTER": ["descriptor"], + "DEVICE_ENERGY_MANAGEMENT_CLUSTER": ["device-energy-management-server"], + "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": ["mode-base-server"], "DEVICE_TEMP_CLUSTER": [], - "DIAGNOSTIC_LOGS_CLUSTER": [ - "diagnostic-logs-server" - ], - "DISHWASHER_ALARM_CLUSTER": [ - "dishwasher-alarm-server" - ], - "DISHWASHER_MODE_CLUSTER": [ - "mode-base-server" - ], - "MICROWAVE_OVEN_MODE_CLUSTER": [ - "mode-base-server" - ], - "DOOR_LOCK_CLUSTER": [ - "door-lock-server" - ], - "ECOSYSTEM_INFORMATION_CLUSTER": [ - "ecosystem-information-server" - ], + "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"], + "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"], + "DISHWASHER_MODE_CLUSTER": ["mode-base-server"], + "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"], + "DOOR_LOCK_CLUSTER": ["door-lock-server"], + "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"], "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [ "electrical-energy-measurement-server" ], "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [ "electrical-power-measurement-server" ], - "ENERGY_EVSE_CLUSTER": [ - "energy-evse-server" - ], - "ENERGY_EVSE_MODE_CLUSTER": [ - "mode-base-server" - ], + "ENERGY_EVSE_CLUSTER": ["energy-evse-server"], + "ENERGY_EVSE_MODE_CLUSTER": ["mode-base-server"], "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [ "ethernet-network-diagnostics-server" ], - "ENERGY_PREFERENCE_CLUSTER": [ - "energy-preference-server" - ], - "FAN_CONTROL_CLUSTER": [ - "fan-control-server" - ], - "FAULT_INJECTION_CLUSTER": [ - "fault-injection-server" - ], - "FIXED_LABEL_CLUSTER": [ - "fixed-label-server" - ], + "ENERGY_PREFERENCE_CLUSTER": ["energy-preference-server"], + "FAN_CONTROL_CLUSTER": ["fan-control-server"], + "FAULT_INJECTION_CLUSTER": ["fault-injection-server"], + "FIXED_LABEL_CLUSTER": ["fixed-label-server"], "FLOW_MEASUREMENT_CLUSTER": [], "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "GENERAL_COMMISSIONING_CLUSTER": [ - "general-commissioning-server" - ], - "GENERAL_DIAGNOSTICS_CLUSTER": [ - "general-diagnostics-server" - ], - "GROUPS_CLUSTER": [ - "groups-server" - ], - "HEPA_FILTER_MONITORING_CLUSTER": [ - "resource-monitoring-server" - ], - "GROUP_KEY_MANAGEMENT_CLUSTER": [ - "group-key-mgmt-server" - ], - "ICD_MANAGEMENT_CLUSTER": [ - "icd-management-server" - ], - "IDENTIFY_CLUSTER": [ - "identify-server" - ], + "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"], + "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"], + "GROUPS_CLUSTER": ["groups-server"], + "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"], + "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"], + "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"], + "IDENTIFY_CLUSTER": ["identify-server"], "ILLUMINANCE_MEASUREMENT_CLUSTER": [], - "KEYPAD_INPUT_CLUSTER": [ - "keypad-input-server" - ], - "LAUNDRY_WASHER_MODE_CLUSTER": [ - "mode-base-server" - ], - "LEVEL_CONTROL_CLUSTER": [ - "level-control" - ], + "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"], + "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-base-server"], + "LEVEL_CONTROL_CLUSTER": ["level-control"], "LOCALIZATION_CONFIGURATION_CLUSTER": [ "localization-configuration-server" ], - "LOW_POWER_CLUSTER": [ - "low-power-server" - ], - "MEDIA_INPUT_CLUSTER": [ - "media-input-server" - ], - "MEDIA_PLAYBACK_CLUSTER": [ - "media-playback-server" - ], - "MICROWAVE_OVEN_CONTROL_CLUSTER": [ - "microwave-oven-control-server" - ], - "MESSAGES_CLUSTER": [ - "messages-server" - ], - "MODE_SELECT_CLUSTER": [ - "mode-select-server" - ], - "NETWORK_COMMISSIONING_CLUSTER": [ - "network-commissioning" - ], + "LOW_POWER_CLUSTER": ["low-power-server"], + "MEDIA_INPUT_CLUSTER": ["media-input-server"], + "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"], + "MICROWAVE_OVEN_CONTROL_CLUSTER": ["microwave-oven-control-server"], + "MESSAGES_CLUSTER": ["messages-server"], + "MODE_SELECT_CLUSTER": ["mode-select-server"], + "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"], "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "SAMPLE_MEI_CLUSTER": [ - "sample-mei-server" - ], - "OCCUPANCY_SENSING_CLUSTER": [ - "occupancy-sensor-server" - ], - "ON_OFF_CLUSTER": [ - "on-off-server" - ], - "POWER_TOPOLOGY_CLUSTER": [ - "power-topology-server" - ], - "OPERATIONAL_CREDENTIALS_CLUSTER": [ - "operational-credentials-server" - ], - "OPERATIONAL_STATE_CLUSTER": [ - "operational-state-server" - ], - "OPERATIONAL_STATE_OVEN_CLUSTER": [ - "operational-state-server" - ], - "OPERATIONAL_STATE_RVC_CLUSTER": [ - "operational-state-server" - ], + "SAMPLE_MEI_CLUSTER": ["sample-mei-server"], + "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"], + "ON_OFF_CLUSTER": ["on-off-server"], + "POWER_TOPOLOGY_CLUSTER": ["power-topology-server"], + "OPERATIONAL_CREDENTIALS_CLUSTER": ["operational-credentials-server"], + "OPERATIONAL_STATE_CLUSTER": ["operational-state-server"], + "OPERATIONAL_STATE_OVEN_CLUSTER": ["operational-state-server"], + "OPERATIONAL_STATE_RVC_CLUSTER": ["operational-state-server"], "OTA_BOOTLOAD_CLUSTER": [], - "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [ - "ota-provider" - ], - "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [ - "ota-requestor" - ], - "OVEN_MODE_CLUSTER": [ - "mode-base-server" - ], + "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"], + "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"], + "OVEN_MODE_CLUSTER": ["mode-base-server"], "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], @@ -376,9 +260,7 @@ "POLL_CONTROL_CLUSTER": [], "POWER_CONFIG_CLUSTER": [], "POWER_PROFILE_CLUSTER": [], - "POWER_SOURCE_CLUSTER": [ - "power-source-server" - ], + "POWER_SOURCE_CLUSTER": ["power-source-server"], "POWER_SOURCE_CONFIGURATION_CLUSTER": [ "power-source-configuration-server" ], @@ -393,44 +275,22 @@ "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "REFRIGERATOR_ALARM_CLUSTER": [ - "refrigerator-alarm-server" - ], + "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"], "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [ "mode-base-server" ], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_MODE_CLUSTER": [ - "mode-base-server" - ], - "RVC_RUN_MODE_CLUSTER": [ - "mode-base-server" - ], - "SCENES_CLUSTER": [ - "scenes-server" - ], - "SERVICE_AREA_CLUSTER": [ - "service-area-server" - ], - "SMOKE_CO_ALARM_CLUSTER": [ - "smoke-co-alarm-server" - ], - "SOFTWARE_DIAGNOSTICS_CLUSTER": [ - "software-diagnostics-server" - ], - "SWITCH_CLUSTER": [ - "switch-server" - ], - "TARGET_NAVIGATOR_CLUSTER": [ - "target-navigator-server" - ], - "TEMPERATURE_CONTROL_CLUSTER": [ - "temperature-control-server" - ], + "RVC_CLEAN_MODE_CLUSTER": ["mode-base-server"], + "RVC_RUN_MODE_CLUSTER": ["mode-base-server"], + "SCENES_CLUSTER": ["scenes-server"], + "SERVICE_AREA_CLUSTER": ["service-area-server"], + "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"], + "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"], + "SWITCH_CLUSTER": ["switch-server"], + "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"], + "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": [ - "thermostat-server" - ], + "THERMOSTAT_CLUSTER": ["thermostat-server"], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [ "thermostat-user-interface-configuration-server" ], @@ -440,58 +300,30 @@ "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [ "thread-network-diagnostics-server" ], - "THREAD_NETWORK_DIRECTORY_CLUSTER": [ - "thread-network-directory-server" - ], + "THREAD_NETWORK_DIRECTORY_CLUSTER": ["thread-network-directory-server"], "TIME_CLUSTER": [], - "TIME_FORMAT_LOCALIZATION_CLUSTER": [ - "time-format-localization-server" - ], - "TIME_SYNCHRONIZATION_CLUSTER": [ - "time-synchronization-server" - ], - "TIMER_CLUSTER": [ - "timer-server" - ], + "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"], + "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"], + "TIMER_CLUSTER": ["timer-server"], "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], "UNIT_LOCALIZATION_CLUSTER": [], - "UNIT_TESTING_CLUSTER": [ - "test-cluster-server" - ], - "USER_LABEL_CLUSTER": [ - "user-label-server" - ], + "UNIT_TESTING_CLUSTER": ["test-cluster-server"], + "USER_LABEL_CLUSTER": ["user-label-server"], "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [ "valve-configuration-and-control-server" ], - "WAKE_ON_LAN_CLUSTER": [ - "wake-on-lan-server" - ], - "LAUNDRY_WASHER_CONTROLS_CLUSTER": [ - "laundry-washer-controls-server" - ], - "LAUNDRY_DRYER_CONTROLS_CLUSTER": [ - "laundry-dryer-controls-server" - ], + "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"], + "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"], + "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"], "WEB_RTC_PROVIDER_CLUSTER": [], "WEBRTC_REQUESTOR_CLUSTER": [], - "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [ - "wifi-network-diagnostics-server" - ], - "WIFI_NETWORK_MANAGEMENT_CLUSTER": [ - "wifi-network-management-server" - ], - "WINDOW_COVERING_CLUSTER": [ - "window-covering-server" - ], - "WATER_HEATER_MANAGEMENT_CLUSTER": [ - "water-heater-management-server" - ], - "WATER_HEATER_MODE_CLUSTER": [ - "mode-base-server" - ], + "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"], + "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"], + "WINDOW_COVERING_CLUSTER": ["window-covering-server"], + "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"], + "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"], "ZONE_MANAGEMENT_CLUSTER": [] } } From 2342079daacbf8588e01f60e41693a85a0a976ea Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Fri, 13 Dec 2024 12:34:13 -0600 Subject: [PATCH 14/23] CChange struct field name from values -> presets --- ...settings-user-level-management-cluster.xml | 2 +- .../data_model/controller-clusters.matter | 2 +- .../chip/devicecontroller/ChipStructs.java | 22 ++--- ...rLevelManagementClusterMPTZPresetStruct.kt | 14 ++-- ...rLevelManagementClusterMPTZPresetStruct.kt | 14 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 80 +++++++++---------- .../python/chip/clusters/Objects.py | 4 +- .../MTRAttributeTLVValueDecoder.mm | 20 ++--- .../CHIP/zap-generated/MTRStructsObjc.h | 2 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 6 +- .../zap-generated/cluster-objects.cpp | 6 +- .../zap-generated/cluster-objects.h | 4 +- .../cluster/ComplexArgumentParser.cpp | 11 +-- .../cluster/logging/DataModelLogger.cpp | 4 +- 14 files changed, 96 insertions(+), 95 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index 584b5c67344023..a174ba6658f37d 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -26,7 +26,7 @@ Git: 1.4-267-gc3d95b5c9 - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 3a23b00418254f..03216c639cacb9 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9859,7 +9859,7 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { struct MPTZPresetStruct { int8u presetID = 0; char_string<32> name = 1; - MPTZStruct values = 2; + MPTZStruct presets = 2; } struct ViewportStruct { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index 4ccfed9afbe295..4ffb58d5205f30 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -14181,26 +14181,26 @@ public String toString() { public static class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct { public Integer presetID; public String name; - public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values; + public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets; private static final long PRESET_ID_ID = 0L; private static final long NAME_ID = 1L; - private static final long VALUES_ID = 2L; + private static final long PRESETS_ID = 2L; public CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( Integer presetID, String name, - ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets ) { this.presetID = presetID; this.name = name; - this.values = values; + this.presets = presets; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(PRESET_ID_ID, new UIntType(presetID))); values.add(new StructElement(NAME_ID, new StringType(name))); - values.add(new StructElement(VALUES_ID, values.encodeTlv())); + values.add(new StructElement(PRESETS_ID, presets.encodeTlv())); return new StructType(values); } @@ -14211,7 +14211,7 @@ public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeT } Integer presetID = null; String name = null; - ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct values = null; + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == PRESET_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -14223,17 +14223,17 @@ public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeT StringType castingValue = element.value(StringType.class); name = castingValue.value(String.class); } - } else if (element.contextTagNum() == VALUES_ID) { + } else if (element.contextTagNum() == PRESETS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - values = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); + presets = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); } } } return new CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( presetID, name, - values + presets ); } @@ -14247,8 +14247,8 @@ public String toString() { output.append("\tname: "); output.append(name); output.append("\n"); - output.append("\tvalues: "); - output.append(values); + output.append("\tpresets: "); + output.append(presets); output.append("\n"); output.append("}\n"); return output.toString(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt index 766c02742ca5f6..01b0cbb49a8fde 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -25,13 +25,13 @@ import matter.tlv.TlvWriter class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( val presetID: UInt, val name: String, - val values: CameraAvSettingsUserLevelManagementClusterMPTZStruct, + val presets: CameraAvSettingsUserLevelManagementClusterMPTZStruct, ) { override fun toString(): String = buildString { append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") append("\tpresetID : $presetID\n") append("\tname : $name\n") - append("\tvalues : $values\n") + append("\tpresets : $presets\n") append("}\n") } @@ -40,7 +40,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( startStructure(tlvTag) put(ContextSpecificTag(TAG_PRESET_ID), presetID) put(ContextSpecificTag(TAG_NAME), name) - values.toTlv(ContextSpecificTag(TAG_VALUES), this) + presets.toTlv(ContextSpecificTag(TAG_PRESETS), this) endStructure() } } @@ -48,7 +48,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( companion object { private const val TAG_PRESET_ID = 0 private const val TAG_NAME = 1 - private const val TAG_VALUES = 2 + private const val TAG_PRESETS = 2 fun fromTlv( tlvTag: Tag, @@ -57,15 +57,15 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( tlvReader.enterStructure(tlvTag) val presetID = tlvReader.getUInt(ContextSpecificTag(TAG_PRESET_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) - val values = + val presets = CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( - ContextSpecificTag(TAG_VALUES), + ContextSpecificTag(TAG_PRESETS), tlvReader, ) tlvReader.exitContainer() - return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, values) + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, presets) } } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt index 5831e0cac5c6a6..09c9b75b22e09b 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -25,13 +25,13 @@ import matter.tlv.TlvWriter class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( val presetID: UByte, val name: String, - val values: CameraAvSettingsUserLevelManagementClusterMPTZStruct, + val presets: CameraAvSettingsUserLevelManagementClusterMPTZStruct, ) { override fun toString(): String = buildString { append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") append("\tpresetID : $presetID\n") append("\tname : $name\n") - append("\tvalues : $values\n") + append("\tpresets : $presets\n") append("}\n") } @@ -40,7 +40,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( startStructure(tlvTag) put(ContextSpecificTag(TAG_PRESET_ID), presetID) put(ContextSpecificTag(TAG_NAME), name) - values.toTlv(ContextSpecificTag(TAG_VALUES), this) + presets.toTlv(ContextSpecificTag(TAG_PRESETS), this) endStructure() } } @@ -48,7 +48,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( companion object { private const val TAG_PRESET_ID = 0 private const val TAG_NAME = 1 - private const val TAG_VALUES = 2 + private const val TAG_PRESETS = 2 fun fromTlv( tlvTag: Tag, @@ -57,15 +57,15 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( tlvReader.enterStructure(tlvTag) val presetID = tlvReader.getUByte(ContextSpecificTag(TAG_PRESET_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) - val values = + val presets = CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( - ContextSpecificTag(TAG_VALUES), + ContextSpecificTag(TAG_PRESETS), tlvReader, ) tlvReader.exitContainer() - return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, values) + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, presets) } } } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 902ea029a0b64d..d39889772d53e9 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -41709,60 +41709,60 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jninewElement_0_presetID, newElement_0_presetID); jobject newElement_0_name; LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name)); - jobject newElement_0_values; - jobject newElement_0_values_pan; - if (!entry_0.values.pan.HasValue()) + jobject newElement_0_presets; + jobject newElement_0_presets_pan; + if (!entry_0.presets.pan.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_pan); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_pan); } else { - jobject newElement_0_values_panInsideOptional; - std::string newElement_0_values_panInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_values_panInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_values_panInsideOptional = static_cast(entry_0.values.pan.Value()); + jobject newElement_0_presets_panInsideOptional; + std::string newElement_0_presets_panInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_presets_panInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_presets_panInsideOptional = static_cast(entry_0.presets.pan.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_values_panInsideOptionalClassName.c_str(), - newElement_0_values_panInsideOptionalCtorSignature.c_str(), jninewElement_0_values_panInsideOptional, - newElement_0_values_panInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_panInsideOptional, - newElement_0_values_pan); + newElement_0_presets_panInsideOptionalClassName.c_str(), + newElement_0_presets_panInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_panInsideOptional, + newElement_0_presets_panInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_panInsideOptional, + newElement_0_presets_pan); } - jobject newElement_0_values_tilt; - if (!entry_0.values.tilt.HasValue()) + jobject newElement_0_presets_tilt; + if (!entry_0.presets.tilt.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_tilt); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_tilt); } else { - jobject newElement_0_values_tiltInsideOptional; - std::string newElement_0_values_tiltInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_values_tiltInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_values_tiltInsideOptional = static_cast(entry_0.values.tilt.Value()); + jobject newElement_0_presets_tiltInsideOptional; + std::string newElement_0_presets_tiltInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_presets_tiltInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_presets_tiltInsideOptional = static_cast(entry_0.presets.tilt.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_values_tiltInsideOptionalClassName.c_str(), - newElement_0_values_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_values_tiltInsideOptional, - newElement_0_values_tiltInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_tiltInsideOptional, - newElement_0_values_tilt); + newElement_0_presets_tiltInsideOptionalClassName.c_str(), + newElement_0_presets_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_tiltInsideOptional, + newElement_0_presets_tiltInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_tiltInsideOptional, + newElement_0_presets_tilt); } - jobject newElement_0_values_zoom; - if (!entry_0.values.zoom.HasValue()) + jobject newElement_0_presets_zoom; + if (!entry_0.presets.zoom.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_values_zoom); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_zoom); } else { - jobject newElement_0_values_zoomInsideOptional; - std::string newElement_0_values_zoomInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_values_zoomInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_values_zoomInsideOptional = static_cast(entry_0.values.zoom.Value()); + jobject newElement_0_presets_zoomInsideOptional; + std::string newElement_0_presets_zoomInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_presets_zoomInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_presets_zoomInsideOptional = static_cast(entry_0.presets.zoom.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_values_zoomInsideOptionalClassName.c_str(), - newElement_0_values_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_values_zoomInsideOptional, - newElement_0_values_zoomInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_values_zoomInsideOptional, - newElement_0_values_zoom); + newElement_0_presets_zoomInsideOptionalClassName.c_str(), + newElement_0_presets_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_zoomInsideOptional, + newElement_0_presets_zoomInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_zoomInsideOptional, + newElement_0_presets_zoom); } { @@ -41787,8 +41787,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } - newElement_0_values = env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_values_pan, - newElement_0_values_tilt, newElement_0_values_zoom); + newElement_0_presets = env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_presets_pan, + newElement_0_presets_tilt, newElement_0_presets_zoom); } { @@ -41818,7 +41818,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } newElement_0 = env->NewObject(MPTZPresetStructStructClass_1, MPTZPresetStructStructCtor_1, - newElement_0_presetID, newElement_0_name, newElement_0_values); + newElement_0_presetID, newElement_0_name, newElement_0_presets); } chip::JniReferences::GetInstance().AddToList(value, newElement_0); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 56de1cf8ab0c72..52ea2b53db791e 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -46302,12 +46302,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="values", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), + ClusterObjectFieldDescriptor(Label="presets", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), ]) presetID: 'uint' = 0 name: 'str' = "" - values: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) + presets: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) @dataclass class ViewportStruct(ClusterObject): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 215a146b3bbbb4..c554b28dca1c88 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -17703,21 +17703,21 @@ static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCl *aError = err; return nil; } - newElement_0.values = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; - if (entry_0.values.pan.HasValue()) { - newElement_0.values.pan = [NSNumber numberWithShort:entry_0.values.pan.Value()]; + newElement_0.presets = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + if (entry_0.presets.pan.HasValue()) { + newElement_0.presets.pan = [NSNumber numberWithShort:entry_0.presets.pan.Value()]; } else { - newElement_0.values.pan = nil; + newElement_0.presets.pan = nil; } - if (entry_0.values.tilt.HasValue()) { - newElement_0.values.tilt = [NSNumber numberWithShort:entry_0.values.tilt.Value()]; + if (entry_0.presets.tilt.HasValue()) { + newElement_0.presets.tilt = [NSNumber numberWithShort:entry_0.presets.tilt.Value()]; } else { - newElement_0.values.tilt = nil; + newElement_0.presets.tilt = nil; } - if (entry_0.values.zoom.HasValue()) { - newElement_0.values.zoom = [NSNumber numberWithUnsignedChar:entry_0.values.zoom.Value()]; + if (entry_0.presets.zoom.HasValue()) { + newElement_0.presets.zoom = [NSNumber numberWithUnsignedChar:entry_0.presets.zoom.Value()]; } else { - newElement_0.values.zoom = nil; + newElement_0.presets.zoom = nil; } [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index cc38b0deab1ba5..c77c43889bf6b8 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -2294,7 +2294,7 @@ MTR_PROVISIONALLY_AVAILABLE @interface MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull values MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull presets MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index c1940e66ff4c51..60cc927c362100 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -9524,7 +9524,7 @@ - (instancetype)init _name = @""; - _values = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + _presets = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; } return self; } @@ -9535,14 +9535,14 @@ - (id)copyWithZone:(NSZone * _Nullable)zone other.presetID = self.presetID; other.name = self.name; - other.values = self.values; + other.presets = self.presets; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; values:%@; >", NSStringFromClass([self class]), _presetID, _name, _values]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; presets:%@; >", NSStringFromClass([self class]), _presetID, _name, _presets]; return descriptionString; } 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 a38c2ba9336771..791203370f737d 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 @@ -30367,7 +30367,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kPresetID), presetID); encoder.Encode(to_underlying(Fields::kName), name); - encoder.Encode(to_underlying(Fields::kValues), values); + encoder.Encode(to_underlying(Fields::kPresets), presets); return encoder.Finalize(); } @@ -30393,9 +30393,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, name); } - else if (__context_tag == to_underlying(Fields::kValues)) + else if (__context_tag == to_underlying(Fields::kPresets)) { - err = DataModel::Decode(reader, values); + err = DataModel::Decode(reader, presets); } else { 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 069d1027d78de3..9daec21249d52f 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 @@ -42557,7 +42557,7 @@ enum class Fields : uint8_t { kPresetID = 0, kName = 1, - kValues = 2, + kPresets = 2, }; struct Type @@ -42565,7 +42565,7 @@ struct Type public: uint8_t presetID = static_cast(0); chip::CharSpan name; - Structs::MPTZStruct::Type values; + Structs::MPTZStruct::Type presets; CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 376ea2fdd9d7ab..8c5568e9cec40b 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -6532,7 +6532,8 @@ ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure( ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presetID", "presetID", value.isMember("presetID"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.name", "name", value.isMember("name"))); - ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.values", "values", value.isMember("values"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presets", "presets", value.isMember("presets"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presetID"); @@ -6543,9 +6544,9 @@ ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"])); valueCopy.removeMember("name"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "values"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.values, value["values"])); - valueCopy.removeMember("values"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presets"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.presets, value["presets"])); + valueCopy.removeMember("presets"); return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } @@ -6555,7 +6556,7 @@ void ComplexArgumentParser::Finalize( { ComplexArgumentParser::Finalize(request.presetID); ComplexArgumentParser::Finalize(request.name); - ComplexArgumentParser::Finalize(request.values); + ComplexArgumentParser::Finalize(request.presets); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, 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 864e25d34b9118..ada271d1922c3d 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5808,10 +5808,10 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("Values", indent + 1, value.values); + CHIP_ERROR err = LogValue("Presets", indent + 1, value.presets); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Values'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Presets'"); return err; } } From 55729839ca81e65fc1aa90c96227d64094f4be30 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Tue, 17 Dec 2024 11:45:03 -0600 Subject: [PATCH 15/23] Rename of attribute to Settings to reflect the requested changes to the matching Spec PR. --- ...settings-user-level-management-cluster.xml | 2 +- .../data_model/controller-clusters.matter | 2 +- .../chip/devicecontroller/ChipStructs.java | 22 ++--- ...rLevelManagementClusterMPTZPresetStruct.kt | 14 ++-- ...rLevelManagementClusterMPTZPresetStruct.kt | 14 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 81 ++++++++++--------- .../python/chip/clusters/Objects.py | 4 +- .../MTRAttributeTLVValueDecoder.mm | 20 ++--- .../CHIP/zap-generated/MTRStructsObjc.h | 2 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 6 +- .../zap-generated/cluster-objects.cpp | 6 +- .../zap-generated/cluster-objects.h | 4 +- .../cluster/ComplexArgumentParser.cpp | 10 +-- .../cluster/logging/DataModelLogger.cpp | 4 +- 14 files changed, 96 insertions(+), 95 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index a174ba6658f37d..7edf910b2940dc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -26,7 +26,7 @@ Git: 1.4-267-gc3d95b5c9 - + diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 03216c639cacb9..46aa6987a1b8e2 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9859,7 +9859,7 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { struct MPTZPresetStruct { int8u presetID = 0; char_string<32> name = 1; - MPTZStruct presets = 2; + MPTZStruct settings = 2; } struct ViewportStruct { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index 4ffb58d5205f30..0598ae01b00192 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -14181,26 +14181,26 @@ public String toString() { public static class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct { public Integer presetID; public String name; - public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets; + public ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct settings; private static final long PRESET_ID_ID = 0L; private static final long NAME_ID = 1L; - private static final long PRESETS_ID = 2L; + private static final long SETTINGS_ID = 2L; public CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( Integer presetID, String name, - ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct settings ) { this.presetID = presetID; this.name = name; - this.presets = presets; + this.settings = settings; } public StructType encodeTlv() { ArrayList values = new ArrayList<>(); values.add(new StructElement(PRESET_ID_ID, new UIntType(presetID))); values.add(new StructElement(NAME_ID, new StringType(name))); - values.add(new StructElement(PRESETS_ID, presets.encodeTlv())); + values.add(new StructElement(SETTINGS_ID, settings.encodeTlv())); return new StructType(values); } @@ -14211,7 +14211,7 @@ public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeT } Integer presetID = null; String name = null; - ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct presets = null; + ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct settings = null; for (StructElement element: ((StructType)tlvValue).value()) { if (element.contextTagNum() == PRESET_ID_ID) { if (element.value(BaseTLVType.class).type() == TLVType.UInt) { @@ -14223,17 +14223,17 @@ public static CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct decodeT StringType castingValue = element.value(StringType.class); name = castingValue.value(String.class); } - } else if (element.contextTagNum() == PRESETS_ID) { + } else if (element.contextTagNum() == SETTINGS_ID) { if (element.value(BaseTLVType.class).type() == TLVType.Struct) { StructType castingValue = element.value(StructType.class); - presets = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); + settings = ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct.decodeTlv(castingValue); } } } return new CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( presetID, name, - presets + settings ); } @@ -14247,8 +14247,8 @@ public String toString() { output.append("\tname: "); output.append(name); output.append("\n"); - output.append("\tpresets: "); - output.append(presets); + output.append("\tsettings: "); + output.append(settings); output.append("\n"); output.append("}\n"); return output.toString(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt index 01b0cbb49a8fde..a4c276576836d0 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -25,13 +25,13 @@ import matter.tlv.TlvWriter class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( val presetID: UInt, val name: String, - val presets: CameraAvSettingsUserLevelManagementClusterMPTZStruct, + val settings: CameraAvSettingsUserLevelManagementClusterMPTZStruct, ) { override fun toString(): String = buildString { append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") append("\tpresetID : $presetID\n") append("\tname : $name\n") - append("\tpresets : $presets\n") + append("\tsettings : $settings\n") append("}\n") } @@ -40,7 +40,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( startStructure(tlvTag) put(ContextSpecificTag(TAG_PRESET_ID), presetID) put(ContextSpecificTag(TAG_NAME), name) - presets.toTlv(ContextSpecificTag(TAG_PRESETS), this) + settings.toTlv(ContextSpecificTag(TAG_SETTINGS), this) endStructure() } } @@ -48,7 +48,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( companion object { private const val TAG_PRESET_ID = 0 private const val TAG_NAME = 1 - private const val TAG_PRESETS = 2 + private const val TAG_SETTINGS = 2 fun fromTlv( tlvTag: Tag, @@ -57,15 +57,15 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( tlvReader.enterStructure(tlvTag) val presetID = tlvReader.getUInt(ContextSpecificTag(TAG_PRESET_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) - val presets = + val settings = CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( - ContextSpecificTag(TAG_PRESETS), + ContextSpecificTag(TAG_SETTINGS), tlvReader, ) tlvReader.exitContainer() - return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, presets) + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, settings) } } } diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt index 09c9b75b22e09b..20d67ca5c4c51a 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct.kt @@ -25,13 +25,13 @@ import matter.tlv.TlvWriter class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( val presetID: UByte, val name: String, - val presets: CameraAvSettingsUserLevelManagementClusterMPTZStruct, + val settings: CameraAvSettingsUserLevelManagementClusterMPTZStruct, ) { override fun toString(): String = buildString { append("CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct {\n") append("\tpresetID : $presetID\n") append("\tname : $name\n") - append("\tpresets : $presets\n") + append("\tsettings : $settings\n") append("}\n") } @@ -40,7 +40,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( startStructure(tlvTag) put(ContextSpecificTag(TAG_PRESET_ID), presetID) put(ContextSpecificTag(TAG_NAME), name) - presets.toTlv(ContextSpecificTag(TAG_PRESETS), this) + settings.toTlv(ContextSpecificTag(TAG_SETTINGS), this) endStructure() } } @@ -48,7 +48,7 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( companion object { private const val TAG_PRESET_ID = 0 private const val TAG_NAME = 1 - private const val TAG_PRESETS = 2 + private const val TAG_SETTINGS = 2 fun fromTlv( tlvTag: Tag, @@ -57,15 +57,15 @@ class CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct( tlvReader.enterStructure(tlvTag) val presetID = tlvReader.getUByte(ContextSpecificTag(TAG_PRESET_ID)) val name = tlvReader.getString(ContextSpecificTag(TAG_NAME)) - val presets = + val settings = CameraAvSettingsUserLevelManagementClusterMPTZStruct.fromTlv( - ContextSpecificTag(TAG_PRESETS), + ContextSpecificTag(TAG_SETTINGS), tlvReader, ) tlvReader.exitContainer() - return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, presets) + return CameraAvSettingsUserLevelManagementClusterMPTZPresetStruct(presetID, name, settings) } } } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index d39889772d53e9..fa4a320f221e2f 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -41709,60 +41709,60 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jninewElement_0_presetID, newElement_0_presetID); jobject newElement_0_name; LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_0.name, newElement_0_name)); - jobject newElement_0_presets; - jobject newElement_0_presets_pan; - if (!entry_0.presets.pan.HasValue()) + jobject newElement_0_settings; + jobject newElement_0_settings_pan; + if (!entry_0.settings.pan.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_pan); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_settings_pan); } else { - jobject newElement_0_presets_panInsideOptional; - std::string newElement_0_presets_panInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_presets_panInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_presets_panInsideOptional = static_cast(entry_0.presets.pan.Value()); + jobject newElement_0_settings_panInsideOptional; + std::string newElement_0_settings_panInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_settings_panInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_settings_panInsideOptional = static_cast(entry_0.settings.pan.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_presets_panInsideOptionalClassName.c_str(), - newElement_0_presets_panInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_panInsideOptional, - newElement_0_presets_panInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_panInsideOptional, - newElement_0_presets_pan); + newElement_0_settings_panInsideOptionalClassName.c_str(), + newElement_0_settings_panInsideOptionalCtorSignature.c_str(), jninewElement_0_settings_panInsideOptional, + newElement_0_settings_panInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_settings_panInsideOptional, + newElement_0_settings_pan); } - jobject newElement_0_presets_tilt; - if (!entry_0.presets.tilt.HasValue()) + jobject newElement_0_settings_tilt; + if (!entry_0.settings.tilt.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_tilt); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_settings_tilt); } else { - jobject newElement_0_presets_tiltInsideOptional; - std::string newElement_0_presets_tiltInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_presets_tiltInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_presets_tiltInsideOptional = static_cast(entry_0.presets.tilt.Value()); + jobject newElement_0_settings_tiltInsideOptional; + std::string newElement_0_settings_tiltInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_settings_tiltInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_settings_tiltInsideOptional = static_cast(entry_0.settings.tilt.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_presets_tiltInsideOptionalClassName.c_str(), - newElement_0_presets_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_tiltInsideOptional, - newElement_0_presets_tiltInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_tiltInsideOptional, - newElement_0_presets_tilt); + newElement_0_settings_tiltInsideOptionalClassName.c_str(), + newElement_0_settings_tiltInsideOptionalCtorSignature.c_str(), jninewElement_0_settings_tiltInsideOptional, + newElement_0_settings_tiltInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_settings_tiltInsideOptional, + newElement_0_settings_tilt); } - jobject newElement_0_presets_zoom; - if (!entry_0.presets.zoom.HasValue()) + jobject newElement_0_settings_zoom; + if (!entry_0.settings.zoom.HasValue()) { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_presets_zoom); + chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_0_settings_zoom); } else { - jobject newElement_0_presets_zoomInsideOptional; - std::string newElement_0_presets_zoomInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_0_presets_zoomInsideOptionalCtorSignature = "(I)V"; - jint jninewElement_0_presets_zoomInsideOptional = static_cast(entry_0.presets.zoom.Value()); + jobject newElement_0_settings_zoomInsideOptional; + std::string newElement_0_settings_zoomInsideOptionalClassName = "java/lang/Integer"; + std::string newElement_0_settings_zoomInsideOptionalCtorSignature = "(I)V"; + jint jninewElement_0_settings_zoomInsideOptional = static_cast(entry_0.settings.zoom.Value()); chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_0_presets_zoomInsideOptionalClassName.c_str(), - newElement_0_presets_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_presets_zoomInsideOptional, - newElement_0_presets_zoomInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_0_presets_zoomInsideOptional, - newElement_0_presets_zoom); + newElement_0_settings_zoomInsideOptionalClassName.c_str(), + newElement_0_settings_zoomInsideOptionalCtorSignature.c_str(), jninewElement_0_settings_zoomInsideOptional, + newElement_0_settings_zoomInsideOptional); + chip::JniReferences::GetInstance().CreateOptional(newElement_0_settings_zoomInsideOptional, + newElement_0_settings_zoom); } { @@ -41787,8 +41787,9 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR return nullptr; } - newElement_0_presets = env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_presets_pan, - newElement_0_presets_tilt, newElement_0_presets_zoom); + newElement_0_settings = + env->NewObject(MPTZStructStructClass_2, MPTZStructStructCtor_2, newElement_0_settings_pan, + newElement_0_settings_tilt, newElement_0_settings_zoom); } { @@ -41818,7 +41819,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } newElement_0 = env->NewObject(MPTZPresetStructStructClass_1, MPTZPresetStructStructCtor_1, - newElement_0_presetID, newElement_0_name, newElement_0_presets); + newElement_0_presetID, newElement_0_name, newElement_0_settings); } chip::JniReferences::GetInstance().AddToList(value, newElement_0); } diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 52ea2b53db791e..5eca374931e9d7 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -46302,12 +46302,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="presetID", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="name", Tag=1, Type=str), - ClusterObjectFieldDescriptor(Label="presets", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), + ClusterObjectFieldDescriptor(Label="settings", Tag=2, Type=CameraAvSettingsUserLevelManagement.Structs.MPTZStruct), ]) presetID: 'uint' = 0 name: 'str' = "" - presets: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) + settings: 'CameraAvSettingsUserLevelManagement.Structs.MPTZStruct' = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.MPTZStruct()) @dataclass class ViewportStruct(ClusterObject): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index c554b28dca1c88..c63624c7f38a22 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -17703,21 +17703,21 @@ static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCl *aError = err; return nil; } - newElement_0.presets = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; - if (entry_0.presets.pan.HasValue()) { - newElement_0.presets.pan = [NSNumber numberWithShort:entry_0.presets.pan.Value()]; + newElement_0.settings = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + if (entry_0.settings.pan.HasValue()) { + newElement_0.settings.pan = [NSNumber numberWithShort:entry_0.settings.pan.Value()]; } else { - newElement_0.presets.pan = nil; + newElement_0.settings.pan = nil; } - if (entry_0.presets.tilt.HasValue()) { - newElement_0.presets.tilt = [NSNumber numberWithShort:entry_0.presets.tilt.Value()]; + if (entry_0.settings.tilt.HasValue()) { + newElement_0.settings.tilt = [NSNumber numberWithShort:entry_0.settings.tilt.Value()]; } else { - newElement_0.presets.tilt = nil; + newElement_0.settings.tilt = nil; } - if (entry_0.presets.zoom.HasValue()) { - newElement_0.presets.zoom = [NSNumber numberWithUnsignedChar:entry_0.presets.zoom.Value()]; + if (entry_0.settings.zoom.HasValue()) { + newElement_0.settings.zoom = [NSNumber numberWithUnsignedChar:entry_0.settings.zoom.Value()]; } else { - newElement_0.presets.zoom = nil; + newElement_0.settings.zoom = nil; } [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index c77c43889bf6b8..780d40f351fbde 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -2294,7 +2294,7 @@ MTR_PROVISIONALLY_AVAILABLE @interface MTRCameraAVSettingsUserLevelManagementClusterMPTZPresetStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nonnull name MTR_PROVISIONALLY_AVAILABLE; -@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull presets MTR_PROVISIONALLY_AVAILABLE; +@property (nonatomic, copy) MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nonnull settings MTR_PROVISIONALLY_AVAILABLE; @end MTR_PROVISIONALLY_AVAILABLE diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 60cc927c362100..ee6518964c3768 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -9524,7 +9524,7 @@ - (instancetype)init _name = @""; - _presets = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; + _settings = [MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct new]; } return self; } @@ -9535,14 +9535,14 @@ - (id)copyWithZone:(NSZone * _Nullable)zone other.presetID = self.presetID; other.name = self.name; - other.presets = self.presets; + other.settings = self.settings; return other; } - (NSString *)description { - NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; presets:%@; >", NSStringFromClass([self class]), _presetID, _name, _presets]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: presetID:%@; name:%@; settings:%@; >", NSStringFromClass([self class]), _presetID, _name, _settings]; return descriptionString; } 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 791203370f737d..c30d0e734ecb99 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 @@ -30367,7 +30367,7 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; encoder.Encode(to_underlying(Fields::kPresetID), presetID); encoder.Encode(to_underlying(Fields::kName), name); - encoder.Encode(to_underlying(Fields::kPresets), presets); + encoder.Encode(to_underlying(Fields::kSettings), settings); return encoder.Finalize(); } @@ -30393,9 +30393,9 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) { err = DataModel::Decode(reader, name); } - else if (__context_tag == to_underlying(Fields::kPresets)) + else if (__context_tag == to_underlying(Fields::kSettings)) { - err = DataModel::Decode(reader, presets); + err = DataModel::Decode(reader, settings); } else { 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 9daec21249d52f..1020bcc49ba8a1 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 @@ -42557,7 +42557,7 @@ enum class Fields : uint8_t { kPresetID = 0, kName = 1, - kPresets = 2, + kSettings = 2, }; struct Type @@ -42565,7 +42565,7 @@ struct Type public: uint8_t presetID = static_cast(0); chip::CharSpan name; - Structs::MPTZStruct::Type presets; + Structs::MPTZStruct::Type settings; CHIP_ERROR Decode(TLV::TLVReader & reader); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp index 8c5568e9cec40b..042b8535d10b15 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -6533,7 +6533,7 @@ ComplexArgumentParser::Setup(const char * label, ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presetID", "presetID", value.isMember("presetID"))); ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.name", "name", value.isMember("name"))); ReturnErrorOnFailure( - ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.presets", "presets", value.isMember("presets"))); + ComplexArgumentParser::EnsureMemberExist("MPTZPresetStruct.settings", "settings", value.isMember("settings"))); char labelWithMember[kMaxLabelLength]; snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presetID"); @@ -6544,9 +6544,9 @@ ComplexArgumentParser::Setup(const char * label, ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.name, value["name"])); valueCopy.removeMember("name"); - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "presets"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.presets, value["presets"])); - valueCopy.removeMember("presets"); + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "settings"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.settings, value["settings"])); + valueCopy.removeMember("settings"); return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } @@ -6556,7 +6556,7 @@ void ComplexArgumentParser::Finalize( { ComplexArgumentParser::Finalize(request.presetID); ComplexArgumentParser::Finalize(request.name); - ComplexArgumentParser::Finalize(request.presets); + ComplexArgumentParser::Finalize(request.settings); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::Chime::Structs::ChimeSoundStruct::Type & request, 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 ada271d1922c3d..869e0a5f79f484 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -5808,10 +5808,10 @@ CHIP_ERROR DataModelLogger::LogValue( } } { - CHIP_ERROR err = LogValue("Presets", indent + 1, value.presets); + CHIP_ERROR err = LogValue("Settings", indent + 1, value.settings); if (err != CHIP_NO_ERROR) { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Presets'"); + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Settings'"); return err; } } From 383209bfb4dcfa4fff0fd2d4d29a30cd0cc71980 Mon Sep 17 00:00:00 2001 From: Mark Trayer Date: Wed, 18 Dec 2024 15:12:04 -0600 Subject: [PATCH 16/23] New alchemy version of the XML following spec updates to normalize use of case in attribute and field names for acronyms. --- ...settings-user-level-management-cluster.xml | 116 +++++++++++++++--- 1 file changed, 97 insertions(+), 19 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index 7edf910b2940dc..a541695c50a0f0 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -16,9 +16,9 @@ limitations under the License. --> @@ -68,57 +68,135 @@ Git: 1.4-267-gc3d95b5c9 true - MptzPosition - MaxPresets - MptzPresets - DptzRelativeMove - ZoomMax - TiltMin - TiltMax - PanMin - PanMax - + + MPTZPosition + + + + + + + + + + MaxPresets + + + + + + MPTZPresets + + + + + + DPTZRelativeMove + + + + + + ZoomMax + + + + + + TiltMin + + + + + + TiltMax + + + + + + PanMin + + + + + + PanMax + + + + + This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. + + + + + + + - + This command SHALL move the device by the delta values relative to the currently defined position. + + + + + + + - + This command SHALL move the camera to the positions specified by the Preset passed. + + + - + This command allows creating a new preset or updating the values of an existing one. + + + - + This command SHALL remove a preset entry from the PresetMptzTable. + + + - + This command allows for setting the digital viewport for a specific Video Stream. + + + - + This command SHALL change the viewports location by the amount specified in a relative fashion. + + + From 15e2c58f71d666fe79024277e2f53715e6478f86 Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Wed, 18 Dec 2024 15:25:53 -0600 Subject: [PATCH 17/23] Zap regen for Alchemy generated updated XML tracking Spec PR in flight --- .../zcl/zcl-with-test-extensions.json | 132 +++++++-- src/app/zap-templates/zcl/zcl.json | 138 ++++++++-- .../data_model/controller-clusters.matter | 34 +-- .../chip/devicecontroller/ChipClusters.java | 72 ++--- .../devicecontroller/ClusterIDMapping.java | 76 +++--- .../devicecontroller/ClusterInfoMapping.java | 136 +++++----- .../devicecontroller/ClusterReadMapping.java | 28 +- ...eraAvSettingsUserLevelManagementCluster.kt | 86 +++--- .../CHIPAttributeTLVValueDecoder.cpp | 12 +- .../python/chip/clusters/CHIPClusters.py | 20 +- .../python/chip/clusters/Objects.py | 32 +-- .../MTRAttributeSpecifiedCheck.mm | 6 +- .../MTRAttributeTLVValueDecoder.mm | 12 +- .../CHIP/zap-generated/MTRBaseClusters.h | 50 ++-- .../CHIP/zap-generated/MTRBaseClusters.mm | 86 +++--- .../CHIP/zap-generated/MTRClusterConstants.h | 20 +- .../CHIP/zap-generated/MTRClusterNames.mm | 40 +-- .../CHIP/zap-generated/MTRClusters.h | 24 +- .../CHIP/zap-generated/MTRClusters.mm | 62 ++--- .../zap-generated/MTRCommandPayloadsObjc.h | 14 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 56 ++-- .../MTRCommandPayloads_Internal.h | 14 +- .../app-common/zap-generated/callback.h | 42 +-- .../zap-generated/cluster-objects.cpp | 40 +-- .../zap-generated/cluster-objects.h | 108 ++++---- .../app-common/zap-generated/ids/Attributes.h | 12 +- .../app-common/zap-generated/ids/Commands.h | 28 +- .../zap-generated/cluster/Commands.h | 150 +++++------ .../cluster/logging/DataModelLogger.cpp | 12 +- .../cluster/logging/EntryToText.cpp | 40 +-- .../zap-generated/cluster/Commands.h | 254 +++++++++--------- 31 files changed, 1000 insertions(+), 836 deletions(-) diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 59e5f70efb8291..f80f44f27ce98b 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -148,9 +148,15 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": ["Always", "Conditional", "Never"] + "defaultResponsePolicy": [ + "Always", + "Conditional", + "Never" + ] }, - "bool": ["commandDiscovery"] + "bool": [ + "commandDiscovery" + ] }, "defaults": { "text": { @@ -196,9 +202,17 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": ["ProductAppearance"], - "Chime": ["ActiveChimeID", "Enabled"], - "Descriptor": ["ClusterRevision", "FeatureMap"], + "Bridged Device Basic Information": [ + "ProductAppearance" + ], + "Chime": [ + "ActiveChimeID", + "Enabled" + ], + "Descriptor": [ + "ClusterRevision", + "FeatureMap" + ], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -250,7 +264,11 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Energy EVSE Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -295,7 +313,11 @@ "ClientsSupportedPerFabric", "MaximumCheckInBackOff" ], - "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"], + "Occupancy Sensing": [ + "HoldTimeLimits", + "HoldTime", + "FeatureMap" + ], "Operational Credentials": [ "SupportedFabrics", "CommissionedFabrics", @@ -402,14 +424,21 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": ["Lineup", "CurrentChannel"], + "Channel": [ + "Lineup", + "CurrentChannel" + ], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": ["CurrentApp"], - "Application Basic": ["Application"], + "Application Launcher": [ + "CurrentApp" + ], + "Application Basic": [ + "Application" + ], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -421,9 +450,19 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": ["SupportedTemperatureLevels"], - "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Temperature Control": [ + "SupportedTemperatureLevels" + ], + "Dishwasher Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Microwave Oven Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -436,14 +475,26 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Laundry Washer Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Clean Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "RVC Run Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Operational State": [ "OperationalState", "OperationalError", @@ -620,7 +671,10 @@ "LevelValue", "FeatureMap" ], - "Air Quality": ["AirQuality", "FeatureMap"], + "Air Quality": [ + "AirQuality", + "FeatureMap" + ], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -652,9 +706,15 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": ["FeatureMap"], - "Valve Configuration and Control": ["RemainingDuration"], - "Boolean State Configuration": ["CurrentSensitivityLevel"], + "Power Topology": [ + "FeatureMap" + ], + "Valve Configuration and Control": [ + "RemainingDuration" + ], + "Boolean State Configuration": [ + "CurrentSensitivityLevel" + ], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -665,14 +725,25 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], + "Water Heater Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Wi-Fi Network Management": [ + "SSID", + "PassphraseSurrogate" + ], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], + "Service Area": [ + "CurrentArea", + "EstimatedEndTime", + "FeatureMap" + ], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -680,11 +751,20 @@ "SpeakerCapabilities", "Viewport" ], - "Camera AV Settings User Level Management": ["MptzPosition"] + "Camera AV Settings User Level Management": [ + "MPTZPosition" + ] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], + "ZCLDataTypes": [ + "ARRAY", + "BITMAP", + "ENUM", + "NUMBER", + "STRING", + "STRUCT" + ], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, @@ -694,4 +774,4 @@ "uiOptions": { "showProfileId": false } -} +} \ No newline at end of file diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 2e19c00e40a200..77585024cb6c69 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -3,7 +3,11 @@ "category": "matter", "version": 1, "requiredFeatureLevel": 102, - "xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"], + "xmlRoot": [ + ".", + "./data-model/chip/", + "./data-model/silabs/" + ], "_comment": "Ensure access-control-definitions.xml is first in xmlFile array", "xmlFile": [ "access-control-definitions.xml", @@ -142,9 +146,15 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": ["Always", "Conditional", "Never"] + "defaultResponsePolicy": [ + "Always", + "Conditional", + "Never" + ] }, - "bool": ["commandDiscovery"] + "bool": [ + "commandDiscovery" + ] }, "defaults": { "text": { @@ -190,9 +200,17 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": ["ProductAppearance"], - "Chime": ["ActiveChimeID", "Enabled"], - "Descriptor": ["ClusterRevision", "FeatureMap"], + "Bridged Device Basic Information": [ + "ProductAppearance" + ], + "Chime": [ + "ActiveChimeID", + "Enabled" + ], + "Descriptor": [ + "ClusterRevision", + "FeatureMap" + ], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -244,7 +262,11 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Energy EVSE Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -289,7 +311,11 @@ "ClientsSupportedPerFabric", "MaximumCheckInBackOff" ], - "Occupancy Sensing": ["HoldTimeLimits", "HoldTime", "FeatureMap"], + "Occupancy Sensing": [ + "HoldTimeLimits", + "HoldTime", + "FeatureMap" + ], "Operational Credentials": [ "SupportedFabrics", "CommissionedFabrics", @@ -396,14 +422,21 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": ["Lineup", "CurrentChannel"], + "Channel": [ + "Lineup", + "CurrentChannel" + ], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": ["CurrentApp"], - "Application Basic": ["Application"], + "Application Launcher": [ + "CurrentApp" + ], + "Application Basic": [ + "Application" + ], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -415,9 +448,19 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": ["SupportedTemperatureLevels"], - "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Temperature Control": [ + "SupportedTemperatureLevels" + ], + "Dishwasher Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Microwave Oven Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -430,14 +473,26 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Laundry Washer Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Clean Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "RVC Run Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], "Operational State": [ "OperationalState", "OperationalError", @@ -614,7 +669,10 @@ "LevelValue", "FeatureMap" ], - "Air Quality": ["AirQuality", "FeatureMap"], + "Air Quality": [ + "AirQuality", + "FeatureMap" + ], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -646,9 +704,15 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": ["FeatureMap"], - "Valve Configuration and Control": ["RemainingDuration"], - "Boolean State Configuration": ["CurrentSensitivityLevel"], + "Power Topology": [ + "FeatureMap" + ], + "Valve Configuration and Control": [ + "RemainingDuration" + ], + "Boolean State Configuration": [ + "CurrentSensitivityLevel" + ], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -659,14 +723,25 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], - "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], + "Water Heater Mode": [ + "SupportedModes", + "CurrentMode", + "FeatureMap" + ], + "Wi-Fi Network Management": [ + "SSID", + "PassphraseSurrogate" + ], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], + "Service Area": [ + "CurrentArea", + "EstimatedEndTime", + "FeatureMap" + ], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -674,11 +749,20 @@ "SpeakerCapabilities", "Viewport" ], - "Camera AV Settings User Level Management": ["MptzPosition"] + "Camera AV Settings User Level Management": [ + "MPTZPosition" + ] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], + "ZCLDataTypes": [ + "ARRAY", + "BITMAP", + "ENUM", + "NUMBER", + "STRING", + "STRUCT" + ], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, @@ -688,4 +772,4 @@ "uiOptions": { "showProfileId": false } -} +} \ No newline at end of file diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 46aa6987a1b8e2..814d67bdd4d419 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9869,10 +9869,10 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { int16u y2 = 3; } - readonly attribute optional MPTZStruct mptzPosition = 0; + readonly attribute optional MPTZStruct MPTZPosition = 0; readonly attribute optional int8u maxPresets = 1; - readonly attribute optional MPTZPresetStruct mptzPresets[] = 2; - readonly attribute optional int16u dptzRelativeMove[] = 3; + readonly attribute optional MPTZPresetStruct MPTZPresets[] = 2; + readonly attribute optional int16u DPTZRelativeMove[] = 3; readonly attribute optional int8u zoomMax = 4; readonly attribute optional int16s tiltMin = 5; readonly attribute optional int16s tiltMax = 6; @@ -9885,37 +9885,37 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; - request struct MptzSetPositionRequest { + request struct MPTZSetPositionRequest { optional int16s pan = 0; optional int16s tilt = 1; optional int8u zoom = 2; } - request struct MptzRelativeMoveRequest { + request struct MPTZRelativeMoveRequest { optional int16s panDelta = 0; optional int16s tiltDelta = 1; optional int8s zoomDelta = 2; } - request struct MptzMoveToPresetRequest { + request struct MPTZMoveToPresetRequest { int8u presetID = 0; } - request struct MptzSavePresetRequest { + request struct MPTZSavePresetRequest { optional int8u presetID = 0; char_string<32> name = 1; } - request struct MptzRemovePresetRequest { + request struct MPTZRemovePresetRequest { int8u presetID = 0; } - request struct DptzSetViewportRequest { + request struct DPTZSetViewportRequest { int16u videoStreamID = 0; ViewportStruct viewport = 1; } - request struct DptzRelativeMoveRequest { + request struct DPTZRelativeMoveRequest { int16u videoStreamID = 0; optional int16s deltaX = 1; optional int16s deltaY = 2; @@ -9923,19 +9923,19 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { } /** This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. */ - command MptzSetPosition(MptzSetPositionRequest): DefaultSuccess = 0; + command MPTZSetPosition(MPTZSetPositionRequest): DefaultSuccess = 0; /** This command SHALL move the device by the delta values relative to the currently defined position. */ - command MptzRelativeMove(MptzRelativeMoveRequest): DefaultSuccess = 1; + command MPTZRelativeMove(MPTZRelativeMoveRequest): DefaultSuccess = 1; /** This command SHALL move the camera to the positions specified by the Preset passed. */ - command MptzMoveToPreset(MptzMoveToPresetRequest): DefaultSuccess = 2; + command MPTZMoveToPreset(MPTZMoveToPresetRequest): DefaultSuccess = 2; /** This command allows creating a new preset or updating the values of an existing one. */ - command MptzSavePreset(MptzSavePresetRequest): DefaultSuccess = 3; + command MPTZSavePreset(MPTZSavePresetRequest): DefaultSuccess = 3; /** This command SHALL remove a preset entry from the PresetMptzTable. */ - command MptzRemovePreset(MptzRemovePresetRequest): DefaultSuccess = 4; + command MPTZRemovePreset(MPTZRemovePresetRequest): DefaultSuccess = 4; /** This command allows for setting the digital viewport for a specific Video Stream. */ - command DptzSetViewport(DptzSetViewportRequest): DefaultSuccess = 5; + command DPTZSetViewport(DPTZSetViewportRequest): DefaultSuccess = 5; /** This command SHALL change the viewports location by the amount specified in a relative fashion. */ - command DptzRelativeMove(DptzRelativeMoveRequest): DefaultSuccess = 6; + command DPTZRelativeMove(DPTZRelativeMoveRequest): DefaultSuccess = 6; } /** The WebRTC transport provider cluster provides a way for stream providers (e.g. Cameras) to stream or receive their data through WebRTC. */ diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java index df4a321d661102..0ba5e7686ac545 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java @@ -61582,11 +61582,11 @@ public long initWithDevice(long devicePtr, int endpointId) { return 0L; } - public void mptzSetPosition(DefaultClusterCallback callback, Optional pan, Optional tilt, Optional zoom) { - mptzSetPosition(callback, pan, tilt, zoom, 0); + public void MPTZSetPosition(DefaultClusterCallback callback, Optional pan, Optional tilt, Optional zoom) { + MPTZSetPosition(callback, pan, tilt, zoom, 0); } - public void mptzSetPosition(DefaultClusterCallback callback, Optional pan, Optional tilt, Optional zoom, int timedInvokeTimeoutMs) { + public void MPTZSetPosition(DefaultClusterCallback callback, Optional pan, Optional tilt, Optional zoom, int timedInvokeTimeoutMs) { final long commandId = 0L; ArrayList elements = new ArrayList<>(); @@ -61610,11 +61610,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void mptzRelativeMove(DefaultClusterCallback callback, Optional panDelta, Optional tiltDelta, Optional zoomDelta) { - mptzRelativeMove(callback, panDelta, tiltDelta, zoomDelta, 0); + public void MPTZRelativeMove(DefaultClusterCallback callback, Optional panDelta, Optional tiltDelta, Optional zoomDelta) { + MPTZRelativeMove(callback, panDelta, tiltDelta, zoomDelta, 0); } - public void mptzRelativeMove(DefaultClusterCallback callback, Optional panDelta, Optional tiltDelta, Optional zoomDelta, int timedInvokeTimeoutMs) { + public void MPTZRelativeMove(DefaultClusterCallback callback, Optional panDelta, Optional tiltDelta, Optional zoomDelta, int timedInvokeTimeoutMs) { final long commandId = 1L; ArrayList elements = new ArrayList<>(); @@ -61638,11 +61638,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void mptzMoveToPreset(DefaultClusterCallback callback, Integer presetID) { - mptzMoveToPreset(callback, presetID, 0); + public void MPTZMoveToPreset(DefaultClusterCallback callback, Integer presetID) { + MPTZMoveToPreset(callback, presetID, 0); } - public void mptzMoveToPreset(DefaultClusterCallback callback, Integer presetID, int timedInvokeTimeoutMs) { + public void MPTZMoveToPreset(DefaultClusterCallback callback, Integer presetID, int timedInvokeTimeoutMs) { final long commandId = 2L; ArrayList elements = new ArrayList<>(); @@ -61658,11 +61658,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void mptzSavePreset(DefaultClusterCallback callback, Optional presetID, String name) { - mptzSavePreset(callback, presetID, name, 0); + public void MPTZSavePreset(DefaultClusterCallback callback, Optional presetID, String name) { + MPTZSavePreset(callback, presetID, name, 0); } - public void mptzSavePreset(DefaultClusterCallback callback, Optional presetID, String name, int timedInvokeTimeoutMs) { + public void MPTZSavePreset(DefaultClusterCallback callback, Optional presetID, String name, int timedInvokeTimeoutMs) { final long commandId = 3L; ArrayList elements = new ArrayList<>(); @@ -61682,11 +61682,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void mptzRemovePreset(DefaultClusterCallback callback, Integer presetID) { - mptzRemovePreset(callback, presetID, 0); + public void MPTZRemovePreset(DefaultClusterCallback callback, Integer presetID) { + MPTZRemovePreset(callback, presetID, 0); } - public void mptzRemovePreset(DefaultClusterCallback callback, Integer presetID, int timedInvokeTimeoutMs) { + public void MPTZRemovePreset(DefaultClusterCallback callback, Integer presetID, int timedInvokeTimeoutMs) { final long commandId = 4L; ArrayList elements = new ArrayList<>(); @@ -61702,11 +61702,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void dptzSetViewport(DefaultClusterCallback callback, Integer videoStreamID, ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct viewport) { - dptzSetViewport(callback, videoStreamID, viewport, 0); + public void DPTZSetViewport(DefaultClusterCallback callback, Integer videoStreamID, ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct viewport) { + DPTZSetViewport(callback, videoStreamID, viewport, 0); } - public void dptzSetViewport(DefaultClusterCallback callback, Integer videoStreamID, ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct viewport, int timedInvokeTimeoutMs) { + public void DPTZSetViewport(DefaultClusterCallback callback, Integer videoStreamID, ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct viewport, int timedInvokeTimeoutMs) { final long commandId = 5L; ArrayList elements = new ArrayList<>(); @@ -61726,11 +61726,11 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public void dptzRelativeMove(DefaultClusterCallback callback, Integer videoStreamID, Optional deltaX, Optional deltaY, Optional zoomDelta) { - dptzRelativeMove(callback, videoStreamID, deltaX, deltaY, zoomDelta, 0); + public void DPTZRelativeMove(DefaultClusterCallback callback, Integer videoStreamID, Optional deltaX, Optional deltaY, Optional zoomDelta) { + DPTZRelativeMove(callback, videoStreamID, deltaX, deltaY, zoomDelta, 0); } - public void dptzRelativeMove(DefaultClusterCallback callback, Integer videoStreamID, Optional deltaX, Optional deltaY, Optional zoomDelta, int timedInvokeTimeoutMs) { + public void DPTZRelativeMove(DefaultClusterCallback callback, Integer videoStreamID, Optional deltaX, Optional deltaY, Optional zoomDelta, int timedInvokeTimeoutMs) { final long commandId = 6L; ArrayList elements = new ArrayList<>(); @@ -61758,15 +61758,15 @@ public void onResponse(StructType invokeStructValue) { }}, commandId, commandArgs, timedInvokeTimeoutMs); } - public interface MptzPositionAttributeCallback extends BaseAttributeCallback { + public interface MPTZPositionAttributeCallback extends BaseAttributeCallback { void onSuccess(ChipStructs.CameraAvSettingsUserLevelManagementClusterMPTZStruct value); } - public interface MptzPresetsAttributeCallback extends BaseAttributeCallback { + public interface MPTZPresetsAttributeCallback extends BaseAttributeCallback { void onSuccess(List value); } - public interface DptzRelativeMoveAttributeCallback extends BaseAttributeCallback { + public interface DPTZRelativeMoveAttributeCallback extends BaseAttributeCallback { void onSuccess(List value); } @@ -61786,8 +61786,8 @@ public interface AttributeListAttributeCallback extends BaseAttributeCallback { void onSuccess(List value); } - public void readMptzPositionAttribute( - MptzPositionAttributeCallback callback) { + public void readMPTZPositionAttribute( + MPTZPositionAttributeCallback callback) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_POSITION_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @@ -61799,8 +61799,8 @@ public void onSuccess(byte[] tlv) { }, MPTZ_POSITION_ATTRIBUTE_ID, true); } - public void subscribeMptzPositionAttribute( - MptzPositionAttributeCallback callback, int minInterval, int maxInterval) { + public void subscribeMPTZPositionAttribute( + MPTZPositionAttributeCallback callback, int minInterval, int maxInterval) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_POSITION_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @@ -61838,8 +61838,8 @@ public void onSuccess(byte[] tlv) { }, MAX_PRESETS_ATTRIBUTE_ID, minInterval, maxInterval); } - public void readMptzPresetsAttribute( - MptzPresetsAttributeCallback callback) { + public void readMPTZPresetsAttribute( + MPTZPresetsAttributeCallback callback) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_PRESETS_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @@ -61851,8 +61851,8 @@ public void onSuccess(byte[] tlv) { }, MPTZ_PRESETS_ATTRIBUTE_ID, true); } - public void subscribeMptzPresetsAttribute( - MptzPresetsAttributeCallback callback, int minInterval, int maxInterval) { + public void subscribeMPTZPresetsAttribute( + MPTZPresetsAttributeCallback callback, int minInterval, int maxInterval) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, MPTZ_PRESETS_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { @@ -61864,8 +61864,8 @@ public void onSuccess(byte[] tlv) { }, MPTZ_PRESETS_ATTRIBUTE_ID, minInterval, maxInterval); } - public void readDptzRelativeMoveAttribute( - DptzRelativeMoveAttributeCallback callback) { + public void readDPTZRelativeMoveAttribute( + DPTZRelativeMoveAttributeCallback callback) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID); readAttribute(new ReportCallbackImpl(callback, path) { @@ -61877,8 +61877,8 @@ public void onSuccess(byte[] tlv) { }, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID, true); } - public void subscribeDptzRelativeMoveAttribute( - DptzRelativeMoveAttributeCallback callback, int minInterval, int maxInterval) { + public void subscribeDPTZRelativeMoveAttribute( + DPTZRelativeMoveAttributeCallback callback, int minInterval, int maxInterval) { ChipAttributePath path = ChipAttributePath.newInstance(endpointId, clusterId, DPTZ_RELATIVE_MOVE_ATTRIBUTE_ID); subscribeAttribute(new ReportCallbackImpl(callback, path) { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index 44cb9bfbac41b2..ff6f04df727d95 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -17382,10 +17382,10 @@ public long getID() { } public enum Attribute { - MptzPosition(0L), + MPTZPosition(0L), MaxPresets(1L), - MptzPresets(2L), - DptzRelativeMove(3L), + MPTZPresets(2L), + DPTZRelativeMove(3L), ZoomMax(4L), TiltMin(5L), TiltMax(6L), @@ -17437,13 +17437,13 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - MptzSetPosition(0L), - MptzRelativeMove(1L), - MptzMoveToPreset(2L), - MptzSavePreset(3L), - MptzRemovePreset(4L), - DptzSetViewport(5L), - DptzRelativeMove(6L),; + MPTZSetPosition(0L), + MPTZRelativeMove(1L), + MPTZMoveToPreset(2L), + MPTZSavePreset(3L), + MPTZRemovePreset(4L), + DPTZSetViewport(5L), + DPTZRelativeMove(6L),; private final long id; Command(long id) { this.id = id; @@ -17461,119 +17461,119 @@ public static Command value(long id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum MptzSetPositionCommandField {Pan(0),Tilt(1),Zoom(2),; + }public enum MPTZSetPositionCommandField {Pan(0),Tilt(1),Zoom(2),; private final int id; - MptzSetPositionCommandField(int id) { + MPTZSetPositionCommandField(int id) { this.id = id; } public int getID() { return id; } - public static MptzSetPositionCommandField value(int id) throws NoSuchFieldError { - for (MptzSetPositionCommandField field : MptzSetPositionCommandField.values()) { + public static MPTZSetPositionCommandField value(int id) throws NoSuchFieldError { + for (MPTZSetPositionCommandField field : MPTZSetPositionCommandField.values()) { if (field.getID() == id) { return field; } } throw new NoSuchFieldError(); } - }public enum MptzRelativeMoveCommandField {PanDelta(0),TiltDelta(1),ZoomDelta(2),; + }public enum MPTZRelativeMoveCommandField {PanDelta(0),TiltDelta(1),ZoomDelta(2),; private final int id; - MptzRelativeMoveCommandField(int id) { + MPTZRelativeMoveCommandField(int id) { this.id = id; } public int getID() { return id; } - public static MptzRelativeMoveCommandField value(int id) throws NoSuchFieldError { - for (MptzRelativeMoveCommandField field : MptzRelativeMoveCommandField.values()) { + public static MPTZRelativeMoveCommandField value(int id) throws NoSuchFieldError { + for (MPTZRelativeMoveCommandField field : MPTZRelativeMoveCommandField.values()) { if (field.getID() == id) { return field; } } throw new NoSuchFieldError(); } - }public enum MptzMoveToPresetCommandField {PresetID(0),; + }public enum MPTZMoveToPresetCommandField {PresetID(0),; private final int id; - MptzMoveToPresetCommandField(int id) { + MPTZMoveToPresetCommandField(int id) { this.id = id; } public int getID() { return id; } - public static MptzMoveToPresetCommandField value(int id) throws NoSuchFieldError { - for (MptzMoveToPresetCommandField field : MptzMoveToPresetCommandField.values()) { + public static MPTZMoveToPresetCommandField value(int id) throws NoSuchFieldError { + for (MPTZMoveToPresetCommandField field : MPTZMoveToPresetCommandField.values()) { if (field.getID() == id) { return field; } } throw new NoSuchFieldError(); } - }public enum MptzSavePresetCommandField {PresetID(0),Name(1),; + }public enum MPTZSavePresetCommandField {PresetID(0),Name(1),; private final int id; - MptzSavePresetCommandField(int id) { + MPTZSavePresetCommandField(int id) { this.id = id; } public int getID() { return id; } - public static MptzSavePresetCommandField value(int id) throws NoSuchFieldError { - for (MptzSavePresetCommandField field : MptzSavePresetCommandField.values()) { + public static MPTZSavePresetCommandField value(int id) throws NoSuchFieldError { + for (MPTZSavePresetCommandField field : MPTZSavePresetCommandField.values()) { if (field.getID() == id) { return field; } } throw new NoSuchFieldError(); } - }public enum MptzRemovePresetCommandField {PresetID(0),; + }public enum MPTZRemovePresetCommandField {PresetID(0),; private final int id; - MptzRemovePresetCommandField(int id) { + MPTZRemovePresetCommandField(int id) { this.id = id; } public int getID() { return id; } - public static MptzRemovePresetCommandField value(int id) throws NoSuchFieldError { - for (MptzRemovePresetCommandField field : MptzRemovePresetCommandField.values()) { + public static MPTZRemovePresetCommandField value(int id) throws NoSuchFieldError { + for (MPTZRemovePresetCommandField field : MPTZRemovePresetCommandField.values()) { if (field.getID() == id) { return field; } } throw new NoSuchFieldError(); } - }public enum DptzSetViewportCommandField {VideoStreamID(0),Viewport(1),; + }public enum DPTZSetViewportCommandField {VideoStreamID(0),Viewport(1),; private final int id; - DptzSetViewportCommandField(int id) { + DPTZSetViewportCommandField(int id) { this.id = id; } public int getID() { return id; } - public static DptzSetViewportCommandField value(int id) throws NoSuchFieldError { - for (DptzSetViewportCommandField field : DptzSetViewportCommandField.values()) { + public static DPTZSetViewportCommandField value(int id) throws NoSuchFieldError { + for (DPTZSetViewportCommandField field : DPTZSetViewportCommandField.values()) { if (field.getID() == id) { return field; } } throw new NoSuchFieldError(); } - }public enum DptzRelativeMoveCommandField {VideoStreamID(0),DeltaX(1),DeltaY(2),ZoomDelta(3),; + }public enum DPTZRelativeMoveCommandField {VideoStreamID(0),DeltaX(1),DeltaY(2),ZoomDelta(3),; private final int id; - DptzRelativeMoveCommandField(int id) { + DPTZRelativeMoveCommandField(int id) { this.id = id; } public int getID() { return id; } - public static DptzRelativeMoveCommandField value(int id) throws NoSuchFieldError { - for (DptzRelativeMoveCommandField field : DptzRelativeMoveCommandField.values()) { + public static DPTZRelativeMoveCommandField value(int id) throws NoSuchFieldError { + for (DPTZRelativeMoveCommandField field : DPTZRelativeMoveCommandField.values()) { if (field.getID() == id) { return field; } diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java index d77b086b0a9312..86d8533bc5f1cb 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java @@ -20462,7 +20462,7 @@ public void onError(Exception ex) { } } - public static class DelegatedCameraAvSettingsUserLevelManagementClusterMptzPositionAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.MptzPositionAttributeCallback, DelegatedClusterCallback { + public static class DelegatedCameraAvSettingsUserLevelManagementClusterMPTZPositionAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.MPTZPositionAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -20483,7 +20483,7 @@ public void onError(Exception ex) { } } - public static class DelegatedCameraAvSettingsUserLevelManagementClusterMptzPresetsAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.MptzPresetsAttributeCallback, DelegatedClusterCallback { + public static class DelegatedCameraAvSettingsUserLevelManagementClusterMPTZPresetsAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.MPTZPresetsAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -20504,7 +20504,7 @@ public void onError(Exception ex) { } } - public static class DelegatedCameraAvSettingsUserLevelManagementClusterDptzRelativeMoveAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.DptzRelativeMoveAttributeCallback, DelegatedClusterCallback { + public static class DelegatedCameraAvSettingsUserLevelManagementClusterDPTZRelativeMoveAttributeCallback implements ChipClusters.CameraAvSettingsUserLevelManagementCluster.DPTZRelativeMoveAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -30014,20 +30014,20 @@ public Map> getCommandMap() { Map cameraAvSettingsUserLevelManagementClusterInteractionInfoMap = new LinkedHashMap<>(); - Map cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementMPTZSetPositionCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSetPositionpanCommandParameterInfo = new CommandParameterInfo("pan", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams.put("pan",cameraAvSettingsUserLevelManagementmptzSetPositionpanCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZSetPositionpanCommandParameterInfo = new CommandParameterInfo("pan", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZSetPositionCommandParams.put("pan",cameraAvSettingsUserLevelManagementMPTZSetPositionpanCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSetPositiontiltCommandParameterInfo = new CommandParameterInfo("tilt", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams.put("tilt",cameraAvSettingsUserLevelManagementmptzSetPositiontiltCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZSetPositiontiltCommandParameterInfo = new CommandParameterInfo("tilt", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZSetPositionCommandParams.put("tilt",cameraAvSettingsUserLevelManagementMPTZSetPositiontiltCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSetPositionzoomCommandParameterInfo = new CommandParameterInfo("zoom", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams.put("zoom",cameraAvSettingsUserLevelManagementmptzSetPositionzoomCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementmptzSetPositionInteractionInfo = new InteractionInfo( + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZSetPositionzoomCommandParameterInfo = new CommandParameterInfo("zoom", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZSetPositionCommandParams.put("zoom",cameraAvSettingsUserLevelManagementMPTZSetPositionzoomCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementMPTZSetPositionInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .mptzSetPosition((DefaultClusterCallback) callback + .MPTZSetPosition((DefaultClusterCallback) callback , (Optional) commandArguments.get("pan") , (Optional) @@ -30037,24 +30037,24 @@ public Map> getCommandMap() { ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementmptzSetPositionCommandParams + cameraAvSettingsUserLevelManagementMPTZSetPositionCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzSetPosition", cameraAvSettingsUserLevelManagementmptzSetPositionInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("MPTZSetPosition", cameraAvSettingsUserLevelManagementMPTZSetPositionInteractionInfo); - Map cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementMPTZRelativeMoveCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRelativeMovepanDeltaCommandParameterInfo = new CommandParameterInfo("panDelta", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams.put("panDelta",cameraAvSettingsUserLevelManagementmptzRelativeMovepanDeltaCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZRelativeMovepanDeltaCommandParameterInfo = new CommandParameterInfo("panDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZRelativeMoveCommandParams.put("panDelta",cameraAvSettingsUserLevelManagementMPTZRelativeMovepanDeltaCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRelativeMovetiltDeltaCommandParameterInfo = new CommandParameterInfo("tiltDelta", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams.put("tiltDelta",cameraAvSettingsUserLevelManagementmptzRelativeMovetiltDeltaCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZRelativeMovetiltDeltaCommandParameterInfo = new CommandParameterInfo("tiltDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZRelativeMoveCommandParams.put("tiltDelta",cameraAvSettingsUserLevelManagementMPTZRelativeMovetiltDeltaCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRelativeMovezoomDeltaCommandParameterInfo = new CommandParameterInfo("zoomDelta", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams.put("zoomDelta",cameraAvSettingsUserLevelManagementmptzRelativeMovezoomDeltaCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementmptzRelativeMoveInteractionInfo = new InteractionInfo( + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZRelativeMovezoomDeltaCommandParameterInfo = new CommandParameterInfo("zoomDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZRelativeMoveCommandParams.put("zoomDelta",cameraAvSettingsUserLevelManagementMPTZRelativeMovezoomDeltaCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementMPTZRelativeMoveInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .mptzRelativeMove((DefaultClusterCallback) callback + .MPTZRelativeMove((DefaultClusterCallback) callback , (Optional) commandArguments.get("panDelta") , (Optional) @@ -30064,38 +30064,38 @@ public Map> getCommandMap() { ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementmptzRelativeMoveCommandParams + cameraAvSettingsUserLevelManagementMPTZRelativeMoveCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzRelativeMove", cameraAvSettingsUserLevelManagementmptzRelativeMoveInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("MPTZRelativeMove", cameraAvSettingsUserLevelManagementMPTZRelativeMoveInteractionInfo); - Map cameraAvSettingsUserLevelManagementmptzMoveToPresetCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementMPTZMoveToPresetCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzMoveToPresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Integer.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzMoveToPresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementmptzMoveToPresetpresetIDCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementmptzMoveToPresetInteractionInfo = new InteractionInfo( + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZMoveToPresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZMoveToPresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementMPTZMoveToPresetpresetIDCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementMPTZMoveToPresetInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .mptzMoveToPreset((DefaultClusterCallback) callback + .MPTZMoveToPreset((DefaultClusterCallback) callback , (Integer) commandArguments.get("presetID") ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementmptzMoveToPresetCommandParams + cameraAvSettingsUserLevelManagementMPTZMoveToPresetCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzMoveToPreset", cameraAvSettingsUserLevelManagementmptzMoveToPresetInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("MPTZMoveToPreset", cameraAvSettingsUserLevelManagementMPTZMoveToPresetInteractionInfo); - Map cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementMPTZSavePresetCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSavePresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementmptzSavePresetpresetIDCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZSavePresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZSavePresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementMPTZSavePresetpresetIDCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzSavePresetnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class); - cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams.put("name",cameraAvSettingsUserLevelManagementmptzSavePresetnameCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementmptzSavePresetInteractionInfo = new InteractionInfo( + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZSavePresetnameCommandParameterInfo = new CommandParameterInfo("name", String.class, String.class); + cameraAvSettingsUserLevelManagementMPTZSavePresetCommandParams.put("name",cameraAvSettingsUserLevelManagementMPTZSavePresetnameCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementMPTZSavePresetInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .mptzSavePreset((DefaultClusterCallback) callback + .MPTZSavePreset((DefaultClusterCallback) callback , (Optional) commandArguments.get("presetID") , (String) @@ -30103,36 +30103,36 @@ public Map> getCommandMap() { ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementmptzSavePresetCommandParams + cameraAvSettingsUserLevelManagementMPTZSavePresetCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzSavePreset", cameraAvSettingsUserLevelManagementmptzSavePresetInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("MPTZSavePreset", cameraAvSettingsUserLevelManagementMPTZSavePresetInteractionInfo); - Map cameraAvSettingsUserLevelManagementmptzRemovePresetCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementMPTZRemovePresetCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementmptzRemovePresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Integer.class, Integer.class); - cameraAvSettingsUserLevelManagementmptzRemovePresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementmptzRemovePresetpresetIDCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementmptzRemovePresetInteractionInfo = new InteractionInfo( + CommandParameterInfo cameraAvSettingsUserLevelManagementMPTZRemovePresetpresetIDCommandParameterInfo = new CommandParameterInfo("presetID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementMPTZRemovePresetCommandParams.put("presetID",cameraAvSettingsUserLevelManagementMPTZRemovePresetpresetIDCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementMPTZRemovePresetInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .mptzRemovePreset((DefaultClusterCallback) callback + .MPTZRemovePreset((DefaultClusterCallback) callback , (Integer) commandArguments.get("presetID") ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementmptzRemovePresetCommandParams + cameraAvSettingsUserLevelManagementMPTZRemovePresetCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("mptzRemovePreset", cameraAvSettingsUserLevelManagementmptzRemovePresetInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("MPTZRemovePreset", cameraAvSettingsUserLevelManagementMPTZRemovePresetInteractionInfo); - Map cameraAvSettingsUserLevelManagementdptzSetViewportCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementDPTZSetViewportCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementdptzSetViewportvideoStreamIDCommandParameterInfo = new CommandParameterInfo("videoStreamID", Integer.class, Integer.class); - cameraAvSettingsUserLevelManagementdptzSetViewportCommandParams.put("videoStreamID",cameraAvSettingsUserLevelManagementdptzSetViewportvideoStreamIDCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementDPTZSetViewportvideoStreamIDCommandParameterInfo = new CommandParameterInfo("videoStreamID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementDPTZSetViewportCommandParams.put("videoStreamID",cameraAvSettingsUserLevelManagementDPTZSetViewportvideoStreamIDCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementdptzSetViewportInteractionInfo = new InteractionInfo( + InteractionInfo cameraAvSettingsUserLevelManagementDPTZSetViewportInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .dptzSetViewport((DefaultClusterCallback) callback + .DPTZSetViewport((DefaultClusterCallback) callback , (Integer) commandArguments.get("videoStreamID") , (ChipStructs.CameraAvSettingsUserLevelManagementClusterViewportStruct) @@ -30140,27 +30140,27 @@ public Map> getCommandMap() { ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementdptzSetViewportCommandParams + cameraAvSettingsUserLevelManagementDPTZSetViewportCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("dptzSetViewport", cameraAvSettingsUserLevelManagementdptzSetViewportInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("DPTZSetViewport", cameraAvSettingsUserLevelManagementDPTZSetViewportInteractionInfo); - Map cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams = new LinkedHashMap(); + Map cameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams = new LinkedHashMap(); - CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovevideoStreamIDCommandParameterInfo = new CommandParameterInfo("videoStreamID", Integer.class, Integer.class); - cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("videoStreamID",cameraAvSettingsUserLevelManagementdptzRelativeMovevideoStreamIDCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementDPTZRelativeMovevideoStreamIDCommandParameterInfo = new CommandParameterInfo("videoStreamID", Integer.class, Integer.class); + cameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams.put("videoStreamID",cameraAvSettingsUserLevelManagementDPTZRelativeMovevideoStreamIDCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaXCommandParameterInfo = new CommandParameterInfo("deltaX", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("deltaX",cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaXCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementDPTZRelativeMovedeltaXCommandParameterInfo = new CommandParameterInfo("deltaX", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams.put("deltaX",cameraAvSettingsUserLevelManagementDPTZRelativeMovedeltaXCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaYCommandParameterInfo = new CommandParameterInfo("deltaY", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("deltaY",cameraAvSettingsUserLevelManagementdptzRelativeMovedeltaYCommandParameterInfo); + CommandParameterInfo cameraAvSettingsUserLevelManagementDPTZRelativeMovedeltaYCommandParameterInfo = new CommandParameterInfo("deltaY", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams.put("deltaY",cameraAvSettingsUserLevelManagementDPTZRelativeMovedeltaYCommandParameterInfo); - CommandParameterInfo cameraAvSettingsUserLevelManagementdptzRelativeMovezoomDeltaCommandParameterInfo = new CommandParameterInfo("zoomDelta", Optional.class, Integer.class); - cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams.put("zoomDelta",cameraAvSettingsUserLevelManagementdptzRelativeMovezoomDeltaCommandParameterInfo); - InteractionInfo cameraAvSettingsUserLevelManagementdptzRelativeMoveInteractionInfo = new InteractionInfo( + CommandParameterInfo cameraAvSettingsUserLevelManagementDPTZRelativeMovezoomDeltaCommandParameterInfo = new CommandParameterInfo("zoomDelta", Optional.class, Integer.class); + cameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams.put("zoomDelta",cameraAvSettingsUserLevelManagementDPTZRelativeMovezoomDeltaCommandParameterInfo); + InteractionInfo cameraAvSettingsUserLevelManagementDPTZRelativeMoveInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster) - .dptzRelativeMove((DefaultClusterCallback) callback + .DPTZRelativeMove((DefaultClusterCallback) callback , (Integer) commandArguments.get("videoStreamID") , (Optional) @@ -30172,9 +30172,9 @@ public Map> getCommandMap() { ); }, () -> new DelegatedDefaultClusterCallback(), - cameraAvSettingsUserLevelManagementdptzRelativeMoveCommandParams + cameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams ); - cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("dptzRelativeMove", cameraAvSettingsUserLevelManagementdptzRelativeMoveInteractionInfo); + cameraAvSettingsUserLevelManagementClusterInteractionInfoMap.put("DPTZRelativeMove", cameraAvSettingsUserLevelManagementDPTZRelativeMoveInteractionInfo); commandMap.put("cameraAvSettingsUserLevelManagement", cameraAvSettingsUserLevelManagementClusterInteractionInfoMap); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index e74a348943b2ed..3323ad5632be1d 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -18773,28 +18773,28 @@ private static Map readCameraAvSettingsUserLevelManagem readCameraAvSettingsUserLevelManagementMaxPresetsCommandParams ); result.put("readMaxPresetsAttribute", readCameraAvSettingsUserLevelManagementMaxPresetsAttributeInteractionInfo); - Map readCameraAvSettingsUserLevelManagementMptzPresetsCommandParams = new LinkedHashMap(); - InteractionInfo readCameraAvSettingsUserLevelManagementMptzPresetsAttributeInteractionInfo = new InteractionInfo( + Map readCameraAvSettingsUserLevelManagementMPTZPresetsCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementMPTZPresetsAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readMptzPresetsAttribute( - (ChipClusters.CameraAvSettingsUserLevelManagementCluster.MptzPresetsAttributeCallback) callback + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readMPTZPresetsAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.MPTZPresetsAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterMptzPresetsAttributeCallback(), - readCameraAvSettingsUserLevelManagementMptzPresetsCommandParams + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterMPTZPresetsAttributeCallback(), + readCameraAvSettingsUserLevelManagementMPTZPresetsCommandParams ); - result.put("readMptzPresetsAttribute", readCameraAvSettingsUserLevelManagementMptzPresetsAttributeInteractionInfo); - Map readCameraAvSettingsUserLevelManagementDptzRelativeMoveCommandParams = new LinkedHashMap(); - InteractionInfo readCameraAvSettingsUserLevelManagementDptzRelativeMoveAttributeInteractionInfo = new InteractionInfo( + result.put("readMPTZPresetsAttribute", readCameraAvSettingsUserLevelManagementMPTZPresetsAttributeInteractionInfo); + Map readCameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams = new LinkedHashMap(); + InteractionInfo readCameraAvSettingsUserLevelManagementDPTZRelativeMoveAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readDptzRelativeMoveAttribute( - (ChipClusters.CameraAvSettingsUserLevelManagementCluster.DptzRelativeMoveAttributeCallback) callback + ((ChipClusters.CameraAvSettingsUserLevelManagementCluster) cluster).readDPTZRelativeMoveAttribute( + (ChipClusters.CameraAvSettingsUserLevelManagementCluster.DPTZRelativeMoveAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterDptzRelativeMoveAttributeCallback(), - readCameraAvSettingsUserLevelManagementDptzRelativeMoveCommandParams + () -> new ClusterInfoMapping.DelegatedCameraAvSettingsUserLevelManagementClusterDPTZRelativeMoveAttributeCallback(), + readCameraAvSettingsUserLevelManagementDPTZRelativeMoveCommandParams ); - result.put("readDptzRelativeMoveAttribute", readCameraAvSettingsUserLevelManagementDptzRelativeMoveAttributeInteractionInfo); + result.put("readDPTZRelativeMoveAttribute", readCameraAvSettingsUserLevelManagementDPTZRelativeMoveAttributeInteractionInfo); Map readCameraAvSettingsUserLevelManagementZoomMaxCommandParams = new LinkedHashMap(); InteractionInfo readCameraAvSettingsUserLevelManagementZoomMaxAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { diff --git a/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt index 62217a5680f8b7..fd33f9ae8fd592 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CameraAvSettingsUserLevelManagementCluster.kt @@ -45,39 +45,39 @@ class CameraAvSettingsUserLevelManagementCluster( private val controller: MatterController, private val endpointId: UShort, ) { - class MptzPositionAttribute(val value: CameraAvSettingsUserLevelManagementClusterMPTZStruct?) + class MPTZPositionAttribute(val value: CameraAvSettingsUserLevelManagementClusterMPTZStruct?) - sealed class MptzPositionAttributeSubscriptionState { + sealed class MPTZPositionAttributeSubscriptionState { data class Success(val value: CameraAvSettingsUserLevelManagementClusterMPTZStruct?) : - MptzPositionAttributeSubscriptionState() + MPTZPositionAttributeSubscriptionState() - data class Error(val exception: Exception) : MptzPositionAttributeSubscriptionState() + data class Error(val exception: Exception) : MPTZPositionAttributeSubscriptionState() - object SubscriptionEstablished : MptzPositionAttributeSubscriptionState() + object SubscriptionEstablished : MPTZPositionAttributeSubscriptionState() } - class MptzPresetsAttribute( + class MPTZPresetsAttribute( val value: List? ) - sealed class MptzPresetsAttributeSubscriptionState { + sealed class MPTZPresetsAttributeSubscriptionState { data class Success( val value: List? - ) : MptzPresetsAttributeSubscriptionState() + ) : MPTZPresetsAttributeSubscriptionState() - data class Error(val exception: Exception) : MptzPresetsAttributeSubscriptionState() + data class Error(val exception: Exception) : MPTZPresetsAttributeSubscriptionState() - object SubscriptionEstablished : MptzPresetsAttributeSubscriptionState() + object SubscriptionEstablished : MPTZPresetsAttributeSubscriptionState() } - class DptzRelativeMoveAttribute(val value: List?) + class DPTZRelativeMoveAttribute(val value: List?) - sealed class DptzRelativeMoveAttributeSubscriptionState { - data class Success(val value: List?) : DptzRelativeMoveAttributeSubscriptionState() + sealed class DPTZRelativeMoveAttributeSubscriptionState { + data class Success(val value: List?) : DPTZRelativeMoveAttributeSubscriptionState() - data class Error(val exception: Exception) : DptzRelativeMoveAttributeSubscriptionState() + data class Error(val exception: Exception) : DPTZRelativeMoveAttributeSubscriptionState() - object SubscriptionEstablished : DptzRelativeMoveAttributeSubscriptionState() + object SubscriptionEstablished : DPTZRelativeMoveAttributeSubscriptionState() } class GeneratedCommandListAttribute(val value: List) @@ -120,7 +120,7 @@ class CameraAvSettingsUserLevelManagementCluster( object SubscriptionEstablished : AttributeListAttributeSubscriptionState() } - suspend fun mptzSetPosition( + suspend fun MPTZSetPosition( pan: Short?, tilt: Short?, zoom: UByte?, @@ -152,7 +152,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun mptzRelativeMove( + suspend fun MPTZRelativeMove( panDelta: Short?, tiltDelta: Short?, zoomDelta: Byte?, @@ -184,7 +184,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun mptzMoveToPreset(presetID: UByte, timedInvokeTimeout: Duration? = null) { + suspend fun MPTZMoveToPreset(presetID: UByte, timedInvokeTimeout: Duration? = null) { val commandId: UInt = 2u val tlvWriter = TlvWriter() @@ -205,7 +205,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun mptzSavePreset(presetID: UByte?, name: String, timedInvokeTimeout: Duration? = null) { + suspend fun MPTZSavePreset(presetID: UByte?, name: String, timedInvokeTimeout: Duration? = null) { val commandId: UInt = 3u val tlvWriter = TlvWriter() @@ -229,7 +229,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun mptzRemovePreset(presetID: UByte, timedInvokeTimeout: Duration? = null) { + suspend fun MPTZRemovePreset(presetID: UByte, timedInvokeTimeout: Duration? = null) { val commandId: UInt = 4u val tlvWriter = TlvWriter() @@ -250,7 +250,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun dptzSetViewport( + suspend fun DPTZSetViewport( videoStreamID: UShort, viewport: CameraAvSettingsUserLevelManagementClusterViewportStruct, timedInvokeTimeout: Duration? = null, @@ -278,7 +278,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun dptzRelativeMove( + suspend fun DPTZRelativeMove( videoStreamID: UShort, deltaX: Short?, deltaY: Short?, @@ -314,7 +314,7 @@ class CameraAvSettingsUserLevelManagementCluster( logger.log(Level.FINE, "Invoke command succeeded: ${response}") } - suspend fun readMptzPositionAttribute(): MptzPositionAttribute { + suspend fun readMPTZPositionAttribute(): MPTZPositionAttribute { val ATTRIBUTE_ID: UInt = 0u val attributePath = @@ -347,13 +347,13 @@ class CameraAvSettingsUserLevelManagementCluster( null } - return MptzPositionAttribute(decodedValue) + return MPTZPositionAttribute(decodedValue) } - suspend fun subscribeMptzPositionAttribute( + suspend fun subscribeMPTZPositionAttribute( minInterval: Int, maxInterval: Int, - ): Flow { + ): Flow { val ATTRIBUTE_ID: UInt = 0u val attributePaths = listOf( @@ -372,7 +372,7 @@ class CameraAvSettingsUserLevelManagementCluster( when (subscriptionState) { is SubscriptionState.SubscriptionErrorNotification -> { emit( - MptzPositionAttributeSubscriptionState.Error( + MPTZPositionAttributeSubscriptionState.Error( Exception( "Subscription terminated with error code: ${subscriptionState.terminationCause}" ) @@ -396,10 +396,10 @@ class CameraAvSettingsUserLevelManagementCluster( null } - decodedValue?.let { emit(MptzPositionAttributeSubscriptionState.Success(it)) } + decodedValue?.let { emit(MPTZPositionAttributeSubscriptionState.Success(it)) } } SubscriptionState.SubscriptionEstablished -> { - emit(MptzPositionAttributeSubscriptionState.SubscriptionEstablished) + emit(MPTZPositionAttributeSubscriptionState.SubscriptionEstablished) } } } @@ -496,7 +496,7 @@ class CameraAvSettingsUserLevelManagementCluster( } } - suspend fun readMptzPresetsAttribute(): MptzPresetsAttribute { + suspend fun readMPTZPresetsAttribute(): MPTZPresetsAttribute { val ATTRIBUTE_ID: UInt = 2u val attributePath = @@ -540,13 +540,13 @@ class CameraAvSettingsUserLevelManagementCluster( null } - return MptzPresetsAttribute(decodedValue) + return MPTZPresetsAttribute(decodedValue) } - suspend fun subscribeMptzPresetsAttribute( + suspend fun subscribeMPTZPresetsAttribute( minInterval: Int, maxInterval: Int, - ): Flow { + ): Flow { val ATTRIBUTE_ID: UInt = 2u val attributePaths = listOf( @@ -565,7 +565,7 @@ class CameraAvSettingsUserLevelManagementCluster( when (subscriptionState) { is SubscriptionState.SubscriptionErrorNotification -> { emit( - MptzPresetsAttributeSubscriptionState.Error( + MPTZPresetsAttributeSubscriptionState.Error( Exception( "Subscription terminated with error code: ${subscriptionState.terminationCause}" ) @@ -600,16 +600,16 @@ class CameraAvSettingsUserLevelManagementCluster( null } - decodedValue?.let { emit(MptzPresetsAttributeSubscriptionState.Success(it)) } + decodedValue?.let { emit(MPTZPresetsAttributeSubscriptionState.Success(it)) } } SubscriptionState.SubscriptionEstablished -> { - emit(MptzPresetsAttributeSubscriptionState.SubscriptionEstablished) + emit(MPTZPresetsAttributeSubscriptionState.SubscriptionEstablished) } } } } - suspend fun readDptzRelativeMoveAttribute(): DptzRelativeMoveAttribute { + suspend fun readDPTZRelativeMoveAttribute(): DPTZRelativeMoveAttribute { val ATTRIBUTE_ID: UInt = 3u val attributePath = @@ -648,13 +648,13 @@ class CameraAvSettingsUserLevelManagementCluster( null } - return DptzRelativeMoveAttribute(decodedValue) + return DPTZRelativeMoveAttribute(decodedValue) } - suspend fun subscribeDptzRelativeMoveAttribute( + suspend fun subscribeDPTZRelativeMoveAttribute( minInterval: Int, maxInterval: Int, - ): Flow { + ): Flow { val ATTRIBUTE_ID: UInt = 3u val attributePaths = listOf( @@ -673,7 +673,7 @@ class CameraAvSettingsUserLevelManagementCluster( when (subscriptionState) { is SubscriptionState.SubscriptionErrorNotification -> { emit( - DptzRelativeMoveAttributeSubscriptionState.Error( + DPTZRelativeMoveAttributeSubscriptionState.Error( Exception( "Subscription terminated with error code: ${subscriptionState.terminationCause}" ) @@ -705,10 +705,10 @@ class CameraAvSettingsUserLevelManagementCluster( null } - decodedValue?.let { emit(DptzRelativeMoveAttributeSubscriptionState.Success(it)) } + decodedValue?.let { emit(DPTZRelativeMoveAttributeSubscriptionState.Success(it)) } } SubscriptionState.SubscriptionEstablished -> { - emit(DptzRelativeMoveAttributeSubscriptionState.SubscriptionEstablished) + emit(DPTZRelativeMoveAttributeSubscriptionState.SubscriptionEstablished) } } } diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index fa4a320f221e2f..86d86baf9f68ae 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -41584,8 +41584,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR using namespace app::Clusters::CameraAvSettingsUserLevelManagement; switch (aPath.mAttributeId) { - case Attributes::MptzPosition::Id: { - using TypeInfo = Attributes::MptzPosition::TypeInfo; + case Attributes::MPTZPosition::Id: { + using TypeInfo = Attributes::MPTZPosition::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) @@ -41684,8 +41684,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR value); return value; } - case Attributes::MptzPresets::Id: { - using TypeInfo = Attributes::MptzPresets::TypeInfo; + case Attributes::MPTZPresets::Id: { + using TypeInfo = Attributes::MPTZPresets::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) @@ -41825,8 +41825,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } return value; } - case Attributes::DptzRelativeMove::Id: { - using TypeInfo = Attributes::DptzRelativeMove::TypeInfo; + case Attributes::DPTZRelativeMove::Id: { + using TypeInfo = Attributes::DPTZRelativeMove::TypeInfo; TypeInfo::DecodableType cppValue; *aError = app::DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 8e742814ce1455..6c8b953593f8d9 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -12780,7 +12780,7 @@ class ChipClusters: "commands": { 0x00000000: { "commandId": 0x00000000, - "commandName": "MptzSetPosition", + "commandName": "MPTZSetPosition", "args": { "pan": "int", "tilt": "int", @@ -12789,7 +12789,7 @@ class ChipClusters: }, 0x00000001: { "commandId": 0x00000001, - "commandName": "MptzRelativeMove", + "commandName": "MPTZRelativeMove", "args": { "panDelta": "int", "tiltDelta": "int", @@ -12798,14 +12798,14 @@ class ChipClusters: }, 0x00000002: { "commandId": 0x00000002, - "commandName": "MptzMoveToPreset", + "commandName": "MPTZMoveToPreset", "args": { "presetID": "int", }, }, 0x00000003: { "commandId": 0x00000003, - "commandName": "MptzSavePreset", + "commandName": "MPTZSavePreset", "args": { "presetID": "int", "name": "str", @@ -12813,14 +12813,14 @@ class ChipClusters: }, 0x00000004: { "commandId": 0x00000004, - "commandName": "MptzRemovePreset", + "commandName": "MPTZRemovePreset", "args": { "presetID": "int", }, }, 0x00000005: { "commandId": 0x00000005, - "commandName": "DptzSetViewport", + "commandName": "DPTZSetViewport", "args": { "videoStreamID": "int", "viewport": "ViewportStruct", @@ -12828,7 +12828,7 @@ class ChipClusters: }, 0x00000006: { "commandId": 0x00000006, - "commandName": "DptzRelativeMove", + "commandName": "DPTZRelativeMove", "args": { "videoStreamID": "int", "deltaX": "int", @@ -12839,7 +12839,7 @@ class ChipClusters: }, "attributes": { 0x00000000: { - "attributeName": "MptzPosition", + "attributeName": "MPTZPosition", "attributeId": 0x00000000, "type": "", "reportable": True, @@ -12851,13 +12851,13 @@ class ChipClusters: "reportable": True, }, 0x00000002: { - "attributeName": "MptzPresets", + "attributeName": "MPTZPresets", "attributeId": 0x00000002, "type": "", "reportable": True, }, 0x00000003: { - "attributeName": "DptzRelativeMove", + "attributeName": "DPTZRelativeMove", "attributeId": 0x00000003, "type": "int", "reportable": True, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 5eca374931e9d7..42d54c051c2cfa 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -46239,10 +46239,10 @@ class CameraAvSettingsUserLevelManagement(Cluster): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="mptzPosition", Tag=0x00000000, Type=typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct]), + ClusterObjectFieldDescriptor(Label="MPTZPosition", Tag=0x00000000, Type=typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct]), ClusterObjectFieldDescriptor(Label="maxPresets", Tag=0x00000001, Type=typing.Optional[uint]), - ClusterObjectFieldDescriptor(Label="mptzPresets", Tag=0x00000002, Type=typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]]), - ClusterObjectFieldDescriptor(Label="dptzRelativeMove", Tag=0x00000003, Type=typing.Optional[typing.List[uint]]), + ClusterObjectFieldDescriptor(Label="MPTZPresets", Tag=0x00000002, Type=typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]]), + ClusterObjectFieldDescriptor(Label="DPTZRelativeMove", Tag=0x00000003, Type=typing.Optional[typing.List[uint]]), ClusterObjectFieldDescriptor(Label="zoomMax", Tag=0x00000004, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="tiltMin", Tag=0x00000005, Type=typing.Optional[int]), ClusterObjectFieldDescriptor(Label="tiltMax", Tag=0x00000006, Type=typing.Optional[int]), @@ -46255,10 +46255,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - mptzPosition: typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct] = None + MPTZPosition: typing.Optional[CameraAvSettingsUserLevelManagement.Structs.MPTZStruct] = None maxPresets: typing.Optional[uint] = None - mptzPresets: typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]] = None - dptzRelativeMove: typing.Optional[typing.List[uint]] = None + MPTZPresets: typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]] = None + DPTZRelativeMove: typing.Optional[typing.List[uint]] = None zoomMax: typing.Optional[uint] = None tiltMin: typing.Optional[int] = None tiltMax: typing.Optional[int] = None @@ -46328,7 +46328,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Commands: @dataclass - class MptzSetPosition(ClusterCommand): + class MPTZSetPosition(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True @@ -46348,7 +46348,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: zoom: typing.Optional[uint] = None @dataclass - class MptzRelativeMove(ClusterCommand): + class MPTZRelativeMove(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = True @@ -46368,7 +46368,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: zoomDelta: typing.Optional[int] = None @dataclass - class MptzMoveToPreset(ClusterCommand): + class MPTZMoveToPreset(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000002 is_client: typing.ClassVar[bool] = True @@ -46384,7 +46384,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: presetID: uint = 0 @dataclass - class MptzSavePreset(ClusterCommand): + class MPTZSavePreset(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000003 is_client: typing.ClassVar[bool] = True @@ -46402,7 +46402,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: name: str = "" @dataclass - class MptzRemovePreset(ClusterCommand): + class MPTZRemovePreset(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000004 is_client: typing.ClassVar[bool] = True @@ -46418,7 +46418,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: presetID: uint = 0 @dataclass - class DptzSetViewport(ClusterCommand): + class DPTZSetViewport(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000005 is_client: typing.ClassVar[bool] = True @@ -46436,7 +46436,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: viewport: CameraAvSettingsUserLevelManagement.Structs.ViewportStruct = field(default_factory=lambda: CameraAvSettingsUserLevelManagement.Structs.ViewportStruct()) @dataclass - class DptzRelativeMove(ClusterCommand): + class DPTZRelativeMove(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x00000552 command_id: typing.ClassVar[int] = 0x00000006 is_client: typing.ClassVar[bool] = True @@ -46459,7 +46459,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: class Attributes: @dataclass - class MptzPosition(ClusterAttributeDescriptor): + class MPTZPosition(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x00000552 @@ -46491,7 +46491,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: typing.Optional[uint] = None @dataclass - class MptzPresets(ClusterAttributeDescriptor): + class MPTZPresets(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x00000552 @@ -46507,7 +46507,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: typing.Optional[typing.List[CameraAvSettingsUserLevelManagement.Structs.MPTZPresetStruct]] = None @dataclass - class DptzRelativeMove(ClusterAttributeDescriptor): + class DPTZRelativeMove(ClusterAttributeDescriptor): @ChipUtility.classproperty def cluster_id(cls) -> int: return 0x00000552 diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm index 2a69ec79cf55c6..8e68ee28cdc8e9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm @@ -5742,16 +5742,16 @@ static BOOL AttributeIsSpecifiedInCameraAVSettingsUserLevelManagementCluster(Att { using namespace Clusters::CameraAvSettingsUserLevelManagement; switch (aAttributeId) { - case Attributes::MptzPosition::Id: { + case Attributes::MPTZPosition::Id: { return YES; } case Attributes::MaxPresets::Id: { return YES; } - case Attributes::MptzPresets::Id: { + case Attributes::MPTZPresets::Id: { return YES; } - case Attributes::DptzRelativeMove::Id: { + case Attributes::DPTZRelativeMove::Id: { return YES; } case Attributes::ZoomMax::Id: { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index c63624c7f38a22..95d1097b6e97a2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -17644,8 +17644,8 @@ static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCl { using namespace Clusters::CameraAvSettingsUserLevelManagement; switch (aAttributeId) { - case Attributes::MptzPosition::Id: { - using TypeInfo = Attributes::MptzPosition::TypeInfo; + case Attributes::MPTZPosition::Id: { + using TypeInfo = Attributes::MPTZPosition::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -17681,8 +17681,8 @@ static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCl value = [NSNumber numberWithUnsignedChar:cppValue]; return value; } - case Attributes::MptzPresets::Id: { - using TypeInfo = Attributes::MptzPresets::TypeInfo; + case Attributes::MPTZPresets::Id: { + using TypeInfo = Attributes::MPTZPresets::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { @@ -17730,8 +17730,8 @@ static id _Nullable DecodeAttributeValueForCameraAVSettingsUserLevelManagementCl } return value; } - case Attributes::DptzRelativeMove::Id: { - using TypeInfo = Attributes::DptzRelativeMove::TypeInfo; + case Attributes::DPTZRelativeMove::Id: { + using TypeInfo = Attributes::DPTZRelativeMove::TypeInfo; TypeInfo::DecodableType cppValue; *aError = DataModel::Decode(aReader, cppValue); if (*aError != CHIP_NO_ERROR) { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 21f63fc099553a..eeb44a0960be3e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -14538,57 +14538,57 @@ MTR_PROVISIONALLY_AVAILABLE @interface MTRBaseClusterCameraAVSettingsUserLevelManagement : MTRGenericBaseCluster /** - * Command MptzSetPosition + * Command MPTZSetPosition * * This command SHALL set the values for the pan, tilt, and zoom in the mechanical PTZ. */ -- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzSetPositionWithCompletion:(MTRStatusCompletion)completion +- (void)MPTZSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZSetPositionWithCompletion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command MptzRelativeMove + * Command MPTZRelativeMove * * This command SHALL move the device by the delta values relative to the currently defined position. */ -- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzRelativeMoveWithCompletion:(MTRStatusCompletion)completion +- (void)MPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams * _Nullable)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZRelativeMoveWithCompletion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command MptzMoveToPreset + * Command MPTZMoveToPreset * * This command SHALL move the camera to the positions specified by the Preset passed. */ -- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command MptzSavePreset + * Command MPTZSavePreset * * This command allows creating a new preset or updating the values of an existing one. */ -- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command MptzRemovePreset + * Command MPTZRemovePreset * * This command SHALL remove a preset entry from the PresetMptzTable. */ -- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command DptzSetViewport + * Command DPTZSetViewport * * This command allows for setting the digital viewport for a specific Video Stream. */ -- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)DPTZSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; /** - * Command DptzRelativeMove + * Command DPTZRelativeMove * * This command SHALL change the viewports location by the amount specified in a relative fashion. */ -- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)DPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams *)params completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeMptzPositionWithCompletion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeMptzPositionWithParams:(MTRSubscribeParams *)params +- (void)readAttributeMPTZPositionWithCompletion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeMPTZPositionWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeMptzPositionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeMPTZPositionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeMaxPresetsWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeMaxPresetsWithParams:(MTRSubscribeParams *)params @@ -14596,17 +14596,17 @@ MTR_PROVISIONALLY_AVAILABLE reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; + (void)readAttributeMaxPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeMptzPresetsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeMptzPresetsWithParams:(MTRSubscribeParams *)params +- (void)readAttributeMPTZPresetsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeMPTZPresetsWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeMptzPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeMPTZPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)readAttributeDptzRelativeMoveWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; -- (void)subscribeAttributeDptzRelativeMoveWithParams:(MTRSubscribeParams *)params +- (void)readAttributeDPTZRelativeMoveWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; +- (void)subscribeAttributeDPTZRelativeMoveWithParams:(MTRSubscribeParams *)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler MTR_PROVISIONALLY_AVAILABLE; -+ (void)readAttributeDptzRelativeMoveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; ++ (void)readAttributeDPTZRelativeMoveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)readAttributeZoomMaxWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion MTR_PROVISIONALLY_AVAILABLE; - (void)subscribeAttributeZoomMaxWithParams:(MTRSubscribeParams *)params diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index 8927d8b75498cc..5c698e95738adb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -100515,14 +100515,14 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC @implementation MTRBaseClusterCameraAVSettingsUserLevelManagement -- (void)mptzSetPositionWithCompletion:(MTRStatusCompletion)completion +- (void)MPTZSetPositionWithCompletion:(MTRStatusCompletion)completion { - [self mptzSetPositionWithParams:nil completion:completion]; + [self MPTZSetPositionWithParams:nil completion:completion]; } -- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params completion:(MTRStatusCompletion)completion +- (void)MPTZSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams * _Nullable)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams alloc] init]; } @@ -100532,7 +100532,7 @@ - (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementCluster auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100543,14 +100543,14 @@ - (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementCluster queue:self.callbackQueue completion:responseHandler]; } -- (void)mptzRelativeMoveWithCompletion:(MTRStatusCompletion)completion +- (void)MPTZRelativeMoveWithCompletion:(MTRStatusCompletion)completion { - [self mptzRelativeMoveWithParams:nil completion:completion]; + [self MPTZRelativeMoveWithParams:nil completion:completion]; } -- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params completion:(MTRStatusCompletion)completion +- (void)MPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams * _Nullable)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams alloc] init]; } @@ -100560,7 +100560,7 @@ - (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100571,10 +100571,10 @@ - (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste queue:self.callbackQueue completion:responseHandler]; } -- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params completion:(MTRStatusCompletion)completion +- (void)MPTZMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams *)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams alloc] init]; } @@ -100584,7 +100584,7 @@ - (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100595,10 +100595,10 @@ - (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste queue:self.callbackQueue completion:responseHandler]; } -- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params completion:(MTRStatusCompletion)completion +- (void)MPTZSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams *)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams alloc] init]; } @@ -100608,7 +100608,7 @@ - (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterM auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100619,10 +100619,10 @@ - (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterM queue:self.callbackQueue completion:responseHandler]; } -- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params completion:(MTRStatusCompletion)completion +- (void)MPTZRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams *)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams alloc] init]; } @@ -100632,7 +100632,7 @@ - (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100643,10 +100643,10 @@ - (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste queue:self.callbackQueue completion:responseHandler]; } -- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params completion:(MTRStatusCompletion)completion +- (void)DPTZSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams *)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams alloc] init]; } @@ -100656,7 +100656,7 @@ - (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementCluster auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100667,10 +100667,10 @@ - (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementCluster queue:self.callbackQueue completion:responseHandler]; } -- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params completion:(MTRStatusCompletion)completion +- (void)DPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams *)params completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams alloc] init]; } @@ -100680,7 +100680,7 @@ - (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -100692,9 +100692,9 @@ - (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste completion:responseHandler]; } -- (void)readAttributeMptzPositionWithCompletion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeMPTZPositionWithCompletion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::TypeInfo; [self.device _readKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -100703,11 +100703,11 @@ - (void)readAttributeMptzPositionWithCompletion:(void (^)(MTRCameraAVSettingsUse completion:completion]; } -- (void)subscribeAttributeMptzPositionWithParams:(MTRSubscribeParams * _Nonnull)params +- (void)subscribeAttributeMPTZPositionWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::TypeInfo; [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -100717,9 +100717,9 @@ - (void)subscribeAttributeMptzPositionWithParams:(MTRSubscribeParams * _Nonnull) subscriptionEstablished:subscriptionEstablished]; } -+ (void)readAttributeMptzPositionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeMPTZPositionWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::TypeInfo; [clusterStateCacheContainer _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) clusterID:TypeInfo::GetClusterId() @@ -100764,9 +100764,9 @@ + (void)readAttributeMaxPresetsWithClusterStateCache:(MTRClusterStateCacheContai completion:completion]; } -- (void)readAttributeMptzPresetsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeMPTZPresetsWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::TypeInfo; [self.device _readKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -100775,11 +100775,11 @@ - (void)readAttributeMptzPresetsWithCompletion:(void (^)(NSArray * _Nullable val completion:completion]; } -- (void)subscribeAttributeMptzPresetsWithParams:(MTRSubscribeParams * _Nonnull)params +- (void)subscribeAttributeMPTZPresetsWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::TypeInfo; [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -100789,9 +100789,9 @@ - (void)subscribeAttributeMptzPresetsWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:subscriptionEstablished]; } -+ (void)readAttributeMptzPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeMPTZPresetsWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::TypeInfo; [clusterStateCacheContainer _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) clusterID:TypeInfo::GetClusterId() @@ -100800,9 +100800,9 @@ + (void)readAttributeMptzPresetsWithClusterStateCache:(MTRClusterStateCacheConta completion:completion]; } -- (void)readAttributeDptzRelativeMoveWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion +- (void)readAttributeDPTZRelativeMoveWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::TypeInfo; [self.device _readKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -100811,11 +100811,11 @@ - (void)readAttributeDptzRelativeMoveWithCompletion:(void (^)(NSArray * _Nullabl completion:completion]; } -- (void)subscribeAttributeDptzRelativeMoveWithParams:(MTRSubscribeParams * _Nonnull)params +- (void)subscribeAttributeDPTZRelativeMoveWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::TypeInfo; [self.device _subscribeToKnownAttributeWithEndpointID:self.endpointID clusterID:@(TypeInfo::GetClusterId()) attributeID:@(TypeInfo::GetAttributeId()) @@ -100825,9 +100825,9 @@ - (void)subscribeAttributeDptzRelativeMoveWithParams:(MTRSubscribeParams * _Nonn subscriptionEstablished:subscriptionEstablished]; } -+ (void)readAttributeDptzRelativeMoveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion ++ (void)readAttributeDPTZRelativeMoveWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer endpoint:(NSNumber *)endpoint queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::TypeInfo; + using TypeInfo = CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::TypeInfo; [clusterStateCacheContainer _readKnownCachedAttributeWithEndpointID:static_cast([endpoint unsignedShortValue]) clusterID:TypeInfo::GetClusterId() diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index d937f54e40a621..6333e0ac57a72d 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -4684,10 +4684,10 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterCameraAVStreamManagementAttributeClusterRevisionID MTR_PROVISIONALLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, // Cluster CameraAVSettingsUserLevelManagement attributes - MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPositionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMPTZPositionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMaxPresetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, - MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPresetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, - MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDptzRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMPTZPresetsID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDPTZRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeZoomMaxID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMinID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeTiltMaxID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, @@ -6938,13 +6938,13 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { MTRCommandIDTypeClusterCameraAVStreamManagementCommandCaptureSnapshotResponseID MTR_PROVISIONALLY_AVAILABLE = 0x0000000C, // Cluster CameraAVSettingsUserLevelManagement commands - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSetPositionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzMoveToPresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSavePresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRemovePresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzSetViewportID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, - MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZSetPositionID MTR_PROVISIONALLY_AVAILABLE = 0x00000000, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZMoveToPresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000002, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZSavePresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000003, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZRemovePresetID MTR_PROVISIONALLY_AVAILABLE = 0x00000004, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDPTZSetViewportID MTR_PROVISIONALLY_AVAILABLE = 0x00000005, + MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDPTZRelativeMoveID MTR_PROVISIONALLY_AVAILABLE = 0x00000006, // Cluster WebRTCTransportProvider commands MTRCommandIDTypeClusterWebRTCTransportProviderCommandSolicitOfferID MTR_PROVISIONALLY_AVAILABLE = 0x00000001, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm index 90bc5e514f7786..c08830faa9cff0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm @@ -7925,20 +7925,20 @@ switch (attributeID) { // Cluster CameraAVSettingsUserLevelManagement attributes - case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPositionID: - result = @"MptzPosition"; + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMPTZPositionID: + result = @"MPTZPosition"; break; case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMaxPresetsID: result = @"MaxPresets"; break; - case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPresetsID: - result = @"MptzPresets"; + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMPTZPresetsID: + result = @"MPTZPresets"; break; - case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDptzRelativeMoveID: - result = @"DptzRelativeMove"; + case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDPTZRelativeMoveID: + result = @"DPTZRelativeMove"; break; case MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeZoomMaxID: @@ -10888,32 +10888,32 @@ switch (commandID) { - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSetPositionID: - result = @"MptzSetPosition"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZSetPositionID: + result = @"MPTZSetPosition"; break; - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRelativeMoveID: - result = @"MptzRelativeMove"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZRelativeMoveID: + result = @"MPTZRelativeMove"; break; - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzMoveToPresetID: - result = @"MptzMoveToPreset"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZMoveToPresetID: + result = @"MPTZMoveToPreset"; break; - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzSavePresetID: - result = @"MptzSavePreset"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZSavePresetID: + result = @"MPTZSavePreset"; break; - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMptzRemovePresetID: - result = @"MptzRemovePreset"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandMPTZRemovePresetID: + result = @"MPTZRemovePreset"; break; - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzSetViewportID: - result = @"DptzSetViewport"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDPTZSetViewportID: + result = @"DPTZSetViewport"; break; - case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDptzRelativeMoveID: - result = @"DptzRelativeMove"; + case MTRCommandIDTypeClusterCameraAVSettingsUserLevelManagementCommandDPTZRelativeMoveID: + result = @"DPTZRelativeMove"; break; default: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index 72cd00c30a9c75..c042213c20fddb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -6796,25 +6796,25 @@ MTR_PROVISIONALLY_AVAILABLE MTR_PROVISIONALLY_AVAILABLE @interface MTRClusterCameraAVSettingsUserLevelManagement : MTRGenericCluster -- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzSetPositionWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZSetPositionWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzRelativeMoveWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZRelativeMoveWithExpectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)MPTZRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)DPTZSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; +- (void)DPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeMptzPositionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; +- (NSDictionary * _Nullable)readAttributeMPTZPositionWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeMaxPresetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeMptzPresetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; +- (NSDictionary * _Nullable)readAttributeMPTZPresetsWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; -- (NSDictionary * _Nullable)readAttributeDptzRelativeMoveWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; +- (NSDictionary * _Nullable)readAttributeDPTZRelativeMoveWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; - (NSDictionary * _Nullable)readAttributeZoomMaxWithParams:(MTRReadParams * _Nullable)params MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 0324593c64e892..546ec00e82b32f 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -19748,14 +19748,14 @@ - (void)writeAttributeStatusLightBrightnessWithValue:(NSDictionary *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZSetPositionWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { - [self mptzSetPositionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; + [self MPTZSetPositionWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; } -- (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams alloc] init]; } @@ -19765,7 +19765,7 @@ - (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementCluster auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19779,14 +19779,14 @@ - (void)mptzSetPositionWithParams:(MTRCameraAVSettingsUserLevelManagementCluster completion:responseHandler]; } -- (void)mptzRelativeMoveWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZRelativeMoveWithExpectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { - [self mptzRelativeMoveWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; + [self MPTZRelativeMoveWithParams:nil expectedValues:expectedValues expectedValueInterval:expectedValueIntervalMs completion:completion]; } -- (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams * _Nullable)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams alloc] init]; } @@ -19796,7 +19796,7 @@ - (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19810,10 +19810,10 @@ - (void)mptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste completion:responseHandler]; } -- (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams alloc] init]; } @@ -19823,7 +19823,7 @@ - (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19837,10 +19837,10 @@ - (void)mptzMoveToPresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste completion:responseHandler]; } -- (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams alloc] init]; } @@ -19850,7 +19850,7 @@ - (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterM auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19864,10 +19864,10 @@ - (void)mptzSavePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterM completion:responseHandler]; } -- (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)MPTZRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams alloc] init]; } @@ -19877,7 +19877,7 @@ - (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19891,10 +19891,10 @@ - (void)mptzRemovePresetWithParams:(MTRCameraAVSettingsUserLevelManagementCluste completion:responseHandler]; } -- (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)DPTZSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams alloc] init]; } @@ -19904,7 +19904,7 @@ - (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementCluster auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19918,10 +19918,10 @@ - (void)dptzSetViewportWithParams:(MTRCameraAVSettingsUserLevelManagementCluster completion:responseHandler]; } -- (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion +- (void)DPTZRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams *)params expectedValues:(NSArray *> * _Nullable)expectedValues expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { if (params == nil) { - params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams + params = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams alloc] init]; } @@ -19931,7 +19931,7 @@ - (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste auto * timedInvokeTimeoutMs = params.timedInvokeTimeoutMs; - using RequestType = CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type; + using RequestType = CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Type; [self.device _invokeKnownCommandWithEndpointID:self.endpointID clusterID:@(RequestType::GetClusterId()) commandID:@(RequestType::GetCommandId()) @@ -19945,9 +19945,9 @@ - (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste completion:responseHandler]; } -- (NSDictionary * _Nullable)readAttributeMptzPositionWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary * _Nullable)readAttributeMPTZPositionWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPositionID) params:params]; + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMPTZPositionID) params:params]; } - (NSDictionary * _Nullable)readAttributeMaxPresetsWithParams:(MTRReadParams * _Nullable)params @@ -19955,14 +19955,14 @@ - (void)dptzRelativeMoveWithParams:(MTRCameraAVSettingsUserLevelManagementCluste return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMaxPresetsID) params:params]; } -- (NSDictionary * _Nullable)readAttributeMptzPresetsWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary * _Nullable)readAttributeMPTZPresetsWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMptzPresetsID) params:params]; + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeMPTZPresetsID) params:params]; } -- (NSDictionary * _Nullable)readAttributeDptzRelativeMoveWithParams:(MTRReadParams * _Nullable)params +- (NSDictionary * _Nullable)readAttributeDPTZRelativeMoveWithParams:(MTRReadParams * _Nullable)params { - return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDptzRelativeMoveID) params:params]; + return [self.device readAttributeWithEndpointID:self.endpointID clusterID:@(MTRClusterIDTypeCameraAVSettingsUserLevelManagementID) attributeID:@(MTRAttributeIDTypeClusterCameraAVSettingsUserLevelManagementAttributeDPTZRelativeMoveID) params:params]; } - (NSDictionary * _Nullable)readAttributeZoomMaxWithParams:(MTRReadParams * _Nullable)params diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 04862bc38ce78e..0b2727990daca9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -11396,7 +11396,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams : NSObject @property (nonatomic, copy) NSNumber * _Nullable pan MTR_PROVISIONALLY_AVAILABLE; @@ -11430,7 +11430,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams : NSObject @property (nonatomic, copy) NSNumber * _Nullable panDelta MTR_PROVISIONALLY_AVAILABLE; @@ -11464,7 +11464,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; /** @@ -11494,7 +11494,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams : NSObject @property (nonatomic, copy) NSNumber * _Nullable presetID MTR_PROVISIONALLY_AVAILABLE; @@ -11526,7 +11526,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull presetID MTR_PROVISIONALLY_AVAILABLE; /** @@ -11556,7 +11556,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull videoStreamID MTR_PROVISIONALLY_AVAILABLE; @@ -11588,7 +11588,7 @@ MTR_PROVISIONALLY_AVAILABLE @end MTR_PROVISIONALLY_AVAILABLE -@interface MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams : NSObject +@interface MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull videoStreamID MTR_PROVISIONALLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index 97e59680c71bd3..51377e69ca6ded 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -33191,7 +33191,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::CameraAv @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams - (instancetype)init { if (self = [super init]) { @@ -33209,7 +33209,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams alloc] init]; other.pan = self.pan; other.tilt = self.tilt; @@ -33228,11 +33228,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Type encodableStruct; ListFreer listFreer; { if (self.pan != nil) { @@ -33291,7 +33291,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams - (instancetype)init { if (self = [super init]) { @@ -33309,7 +33309,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams alloc] init]; other.panDelta = self.panDelta; other.tiltDelta = self.tiltDelta; @@ -33328,11 +33328,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Type encodableStruct; ListFreer listFreer; { if (self.panDelta != nil) { @@ -33391,7 +33391,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams - (instancetype)init { if (self = [super init]) { @@ -33405,7 +33405,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams alloc] init]; other.presetID = self.presetID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -33422,11 +33422,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Type encodableStruct; ListFreer listFreer; { encodableStruct.presetID = self.presetID.unsignedCharValue; @@ -33470,7 +33470,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams - (instancetype)init { if (self = [super init]) { @@ -33486,7 +33486,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams alloc] init]; other.presetID = self.presetID; other.name = self.name; @@ -33504,11 +33504,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Type encodableStruct; ListFreer listFreer; { if (self.presetID != nil) { @@ -33558,7 +33558,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams - (instancetype)init { if (self = [super init]) { @@ -33572,7 +33572,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams alloc] init]; other.presetID = self.presetID; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -33589,11 +33589,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Type encodableStruct; ListFreer listFreer; { encodableStruct.presetID = self.presetID.unsignedCharValue; @@ -33637,7 +33637,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams - (instancetype)init { if (self = [super init]) { @@ -33653,7 +33653,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams alloc] init]; other.videoStreamID = self.videoStreamID; other.viewport = self.viewport; @@ -33671,11 +33671,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Type encodableStruct; ListFreer listFreer; { encodableStruct.videoStreamID = self.videoStreamID.unsignedShortValue; @@ -33725,7 +33725,7 @@ - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader } @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams +@implementation MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams - (instancetype)init { if (self = [super init]) { @@ -33745,7 +33745,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams alloc] init]; + auto other = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams alloc] init]; other.videoStreamID = self.videoStreamID; other.deltaX = self.deltaX; @@ -33765,11 +33765,11 @@ - (NSString *)description @end -@implementation MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams (InternalMethods) +@implementation MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams (InternalMethods) - (CHIP_ERROR)_encodeToTLVReader:(chip::System::PacketBufferTLVReader &)reader { - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type encodableStruct; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Type encodableStruct; ListFreer listFreer; { encodableStruct.videoStreamID = self.videoStreamID.unsignedShortValue; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h index db00262d2bf8c2..13222ed57e96c0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h @@ -2146,43 +2146,43 @@ NS_ASSUME_NONNULL_BEGIN @end -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; @end -@interface MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams (InternalMethods) +@interface MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams (InternalMethods) - (NSDictionary * _Nullable)_encodeAsDataValue:(NSError * __autoreleasing *)error; 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 4421c31a5fbc2d..ebfa75e515835d 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -6897,47 +6897,47 @@ bool emberAfCameraAvStreamManagementClusterCaptureSnapshotCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::CameraAvStreamManagement::Commands::CaptureSnapshot::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster MptzSetPosition Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster MPTZSetPosition Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterMptzSetPositionCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterMPTZSetPositionCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster MptzRelativeMove Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster MPTZRelativeMove Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterMptzRelativeMoveCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterMPTZRelativeMoveCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster MptzMoveToPreset Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster MPTZMoveToPreset Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterMptzMoveToPresetCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterMPTZMoveToPresetCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster MptzSavePreset Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster MPTZSavePreset Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterMptzSavePresetCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterMPTZSavePresetCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster MptzRemovePreset Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster MPTZRemovePreset Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterMptzRemovePresetCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterMPTZRemovePresetCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster DptzSetViewport Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster DPTZSetViewport Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterDptzSetViewportCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterDPTZSetViewportCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::DecodableType & commandData); /** - * @brief Camera AV Settings User Level Management Cluster DptzRelativeMove Command callback (from client) + * @brief Camera AV Settings User Level Management Cluster DPTZRelativeMove Command callback (from client) */ -bool emberAfCameraAvSettingsUserLevelManagementClusterDptzRelativeMoveCallback( +bool emberAfCameraAvSettingsUserLevelManagementClusterDPTZRelativeMoveCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::DecodableType & commandData); + const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::DecodableType & commandData); /** * @brief WebRTC Transport Provider Cluster SolicitOffer 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 c30d0e734ecb99..e5bc38cafe1fbc 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 @@ -30409,7 +30409,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace Structs namespace Commands { -namespace MptzSetPosition { +namespace MPTZSetPosition { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30452,8 +30452,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace MptzSetPosition. -namespace MptzRelativeMove { +} // namespace MPTZSetPosition. +namespace MPTZRelativeMove { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30496,8 +30496,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace MptzRelativeMove. -namespace MptzMoveToPreset { +} // namespace MPTZRelativeMove. +namespace MPTZMoveToPreset { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30530,8 +30530,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace MptzMoveToPreset. -namespace MptzSavePreset { +} // namespace MPTZMoveToPreset. +namespace MPTZSavePreset { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30569,8 +30569,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace MptzSavePreset. -namespace MptzRemovePreset { +} // namespace MPTZSavePreset. +namespace MPTZRemovePreset { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30603,8 +30603,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace MptzRemovePreset. -namespace DptzSetViewport { +} // namespace MPTZRemovePreset. +namespace DPTZSetViewport { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30642,8 +30642,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace DptzSetViewport. -namespace DptzRelativeMove { +} // namespace DPTZSetViewport. +namespace DPTZRelativeMove { CHIP_ERROR Type::Encode(TLV::TLVWriter & aWriter, TLV::Tag aTag) const { DataModel::WrappedStructEncoder encoder{ aWriter, aTag }; @@ -30691,7 +30691,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(err); } } -} // namespace DptzRelativeMove. +} // namespace DPTZRelativeMove. } // namespace Commands namespace Attributes { @@ -30699,14 +30699,14 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::MptzPosition::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, mptzPosition); + case Attributes::MPTZPosition::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, MPTZPosition); case Attributes::MaxPresets::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, maxPresets); - case Attributes::MptzPresets::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, mptzPresets); - case Attributes::DptzRelativeMove::TypeInfo::GetAttributeId(): - return DataModel::Decode(reader, dptzRelativeMove); + case Attributes::MPTZPresets::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, MPTZPresets); + case Attributes::DPTZRelativeMove::TypeInfo::GetAttributeId(): + return DataModel::Decode(reader, DPTZRelativeMove); case Attributes::ZoomMax::TypeInfo::GetAttributeId(): return DataModel::Decode(reader, zoomMax); case Attributes::TiltMin::TypeInfo::GetAttributeId(): 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 1020bcc49ba8a1..60038888d0e7cd 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 @@ -42583,45 +42583,45 @@ namespace ViewportStruct = Clusters::detail::Structs::ViewportStruct; namespace Commands { // Forward-declarations so we can reference these later. -namespace MptzSetPosition { +namespace MPTZSetPosition { struct Type; struct DecodableType; -} // namespace MptzSetPosition +} // namespace MPTZSetPosition -namespace MptzRelativeMove { +namespace MPTZRelativeMove { struct Type; struct DecodableType; -} // namespace MptzRelativeMove +} // namespace MPTZRelativeMove -namespace MptzMoveToPreset { +namespace MPTZMoveToPreset { struct Type; struct DecodableType; -} // namespace MptzMoveToPreset +} // namespace MPTZMoveToPreset -namespace MptzSavePreset { +namespace MPTZSavePreset { struct Type; struct DecodableType; -} // namespace MptzSavePreset +} // namespace MPTZSavePreset -namespace MptzRemovePreset { +namespace MPTZRemovePreset { struct Type; struct DecodableType; -} // namespace MptzRemovePreset +} // namespace MPTZRemovePreset -namespace DptzSetViewport { +namespace DPTZSetViewport { struct Type; struct DecodableType; -} // namespace DptzSetViewport +} // namespace DPTZSetViewport -namespace DptzRelativeMove { +namespace DPTZRelativeMove { struct Type; struct DecodableType; -} // namespace DptzRelativeMove +} // namespace DPTZRelativeMove } // namespace Commands namespace Commands { -namespace MptzSetPosition { +namespace MPTZSetPosition { enum class Fields : uint8_t { kPan = 0, @@ -42633,7 +42633,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MptzSetPosition::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZSetPosition::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } Optional pan; @@ -42650,7 +42650,7 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MptzSetPosition::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZSetPosition::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } Optional pan; @@ -42658,8 +42658,8 @@ struct DecodableType Optional zoom; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MptzSetPosition -namespace MptzRelativeMove { +}; // namespace MPTZSetPosition +namespace MPTZRelativeMove { enum class Fields : uint8_t { kPanDelta = 0, @@ -42671,7 +42671,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MptzRelativeMove::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZRelativeMove::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } Optional panDelta; @@ -42688,7 +42688,7 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MptzRelativeMove::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZRelativeMove::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } Optional panDelta; @@ -42696,8 +42696,8 @@ struct DecodableType Optional zoomDelta; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MptzRelativeMove -namespace MptzMoveToPreset { +}; // namespace MPTZRelativeMove +namespace MPTZMoveToPreset { enum class Fields : uint8_t { kPresetID = 0, @@ -42707,7 +42707,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MptzMoveToPreset::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZMoveToPreset::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint8_t presetID = static_cast(0); @@ -42722,14 +42722,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MptzMoveToPreset::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZMoveToPreset::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint8_t presetID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MptzMoveToPreset -namespace MptzSavePreset { +}; // namespace MPTZMoveToPreset +namespace MPTZSavePreset { enum class Fields : uint8_t { kPresetID = 0, @@ -42740,7 +42740,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MptzSavePreset::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZSavePreset::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } Optional presetID; @@ -42756,15 +42756,15 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MptzSavePreset::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZSavePreset::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } Optional presetID; chip::CharSpan name; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MptzSavePreset -namespace MptzRemovePreset { +}; // namespace MPTZSavePreset +namespace MPTZRemovePreset { enum class Fields : uint8_t { kPresetID = 0, @@ -42774,7 +42774,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::MptzRemovePreset::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZRemovePreset::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint8_t presetID = static_cast(0); @@ -42789,14 +42789,14 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::MptzRemovePreset::Id; } + static constexpr CommandId GetCommandId() { return Commands::MPTZRemovePreset::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint8_t presetID = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace MptzRemovePreset -namespace DptzSetViewport { +}; // namespace MPTZRemovePreset +namespace DPTZSetViewport { enum class Fields : uint8_t { kVideoStreamID = 0, @@ -42807,7 +42807,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::DptzSetViewport::Id; } + static constexpr CommandId GetCommandId() { return Commands::DPTZSetViewport::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint16_t videoStreamID = static_cast(0); @@ -42823,15 +42823,15 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::DptzSetViewport::Id; } + static constexpr CommandId GetCommandId() { return Commands::DPTZSetViewport::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint16_t videoStreamID = static_cast(0); Structs::ViewportStruct::DecodableType viewport; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace DptzSetViewport -namespace DptzRelativeMove { +}; // namespace DPTZSetViewport +namespace DPTZRelativeMove { enum class Fields : uint8_t { kVideoStreamID = 0, @@ -42844,7 +42844,7 @@ struct Type { public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand - static constexpr CommandId GetCommandId() { return Commands::DptzRelativeMove::Id; } + static constexpr CommandId GetCommandId() { return Commands::DPTZRelativeMove::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint16_t videoStreamID = static_cast(0); @@ -42862,7 +42862,7 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::DptzRelativeMove::Id; } + static constexpr CommandId GetCommandId() { return Commands::DPTZRelativeMove::Id; } static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } uint16_t videoStreamID = static_cast(0); @@ -42871,12 +42871,12 @@ struct DecodableType Optional zoomDelta; CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace DptzRelativeMove +}; // namespace DPTZRelativeMove } // namespace Commands namespace Attributes { -namespace MptzPosition { +namespace MPTZPosition { struct TypeInfo { using Type = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::Type; @@ -42884,10 +42884,10 @@ struct TypeInfo using DecodableArgType = const chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType &; static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MptzPosition::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MPTZPosition::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MptzPosition +} // namespace MPTZPosition namespace MaxPresets { struct TypeInfo { @@ -42900,7 +42900,7 @@ struct TypeInfo static constexpr bool MustUseTimedWrite() { return false; } }; } // namespace MaxPresets -namespace MptzPresets { +namespace MPTZPresets { struct TypeInfo { using Type = @@ -42911,11 +42911,11 @@ struct TypeInfo chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType> &; static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::MptzPresets::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::MPTZPresets::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace MptzPresets -namespace DptzRelativeMove { +} // namespace MPTZPresets +namespace DPTZRelativeMove { struct TypeInfo { using Type = chip::app::DataModel::List; @@ -42923,10 +42923,10 @@ struct TypeInfo using DecodableArgType = const chip::app::DataModel::DecodableList &; static constexpr ClusterId GetClusterId() { return Clusters::CameraAvSettingsUserLevelManagement::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::DptzRelativeMove::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::DPTZRelativeMove::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; -} // namespace DptzRelativeMove +} // namespace DPTZRelativeMove namespace ZoomMax { struct TypeInfo { @@ -43026,10 +43026,10 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::MptzPosition::TypeInfo::DecodableType mptzPosition; + Attributes::MPTZPosition::TypeInfo::DecodableType MPTZPosition; Attributes::MaxPresets::TypeInfo::DecodableType maxPresets = static_cast(0); - Attributes::MptzPresets::TypeInfo::DecodableType mptzPresets; - Attributes::DptzRelativeMove::TypeInfo::DecodableType dptzRelativeMove; + Attributes::MPTZPresets::TypeInfo::DecodableType MPTZPresets; + Attributes::DPTZRelativeMove::TypeInfo::DecodableType DPTZRelativeMove; Attributes::ZoomMax::TypeInfo::DecodableType zoomMax = static_cast(0); Attributes::TiltMin::TypeInfo::DecodableType tiltMin = static_cast(0); Attributes::TiltMax::TypeInfo::DecodableType tiltMax = static_cast(0); diff --git a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h index 7109fa41e5f5f7..ca4444aa83cee5 100644 --- a/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h +++ b/zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h @@ -7056,21 +7056,21 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; namespace CameraAvSettingsUserLevelManagement { namespace Attributes { -namespace MptzPosition { +namespace MPTZPosition { static constexpr AttributeId Id = 0x00000000; -} // namespace MptzPosition +} // namespace MPTZPosition namespace MaxPresets { static constexpr AttributeId Id = 0x00000001; } // namespace MaxPresets -namespace MptzPresets { +namespace MPTZPresets { static constexpr AttributeId Id = 0x00000002; -} // namespace MptzPresets +} // namespace MPTZPresets -namespace DptzRelativeMove { +namespace DPTZRelativeMove { static constexpr AttributeId Id = 0x00000003; -} // namespace DptzRelativeMove +} // namespace DPTZRelativeMove namespace ZoomMax { static constexpr AttributeId Id = 0x00000004; 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 d596a0668eb318..40954ab0ea5f29 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 @@ -1894,33 +1894,33 @@ static constexpr CommandId Id = 0x0000000C; namespace CameraAvSettingsUserLevelManagement { namespace Commands { -namespace MptzSetPosition { +namespace MPTZSetPosition { static constexpr CommandId Id = 0x00000000; -} // namespace MptzSetPosition +} // namespace MPTZSetPosition -namespace MptzRelativeMove { +namespace MPTZRelativeMove { static constexpr CommandId Id = 0x00000001; -} // namespace MptzRelativeMove +} // namespace MPTZRelativeMove -namespace MptzMoveToPreset { +namespace MPTZMoveToPreset { static constexpr CommandId Id = 0x00000002; -} // namespace MptzMoveToPreset +} // namespace MPTZMoveToPreset -namespace MptzSavePreset { +namespace MPTZSavePreset { static constexpr CommandId Id = 0x00000003; -} // namespace MptzSavePreset +} // namespace MPTZSavePreset -namespace MptzRemovePreset { +namespace MPTZRemovePreset { static constexpr CommandId Id = 0x00000004; -} // namespace MptzRemovePreset +} // namespace MPTZRemovePreset -namespace DptzSetViewport { +namespace DPTZSetViewport { static constexpr CommandId Id = 0x00000005; -} // namespace DptzSetViewport +} // namespace DPTZSetViewport -namespace DptzRelativeMove { +namespace DPTZRelativeMove { static constexpr CommandId Id = 0x00000006; -} // namespace DptzRelativeMove +} // namespace DPTZRelativeMove } // namespace Commands } // namespace CameraAvSettingsUserLevelManagement diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 078708b0825999..7cb3820e61b506 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -14163,19 +14163,19 @@ class CameraAvStreamManagementCaptureSnapshot : public ClusterCommand | Cluster CameraAvSettingsUserLevelManagement | 0x0552 | |------------------------------------------------------------------------------| | Commands: | | -| * MptzSetPosition | 0x00 | -| * MptzRelativeMove | 0x01 | -| * MptzMoveToPreset | 0x02 | -| * MptzSavePreset | 0x03 | -| * MptzRemovePreset | 0x04 | -| * DptzSetViewport | 0x05 | -| * DptzRelativeMove | 0x06 | +| * MPTZSetPosition | 0x00 | +| * MPTZRelativeMove | 0x01 | +| * MPTZMoveToPreset | 0x02 | +| * MPTZSavePreset | 0x03 | +| * MPTZRemovePreset | 0x04 | +| * DPTZSetViewport | 0x05 | +| * DPTZRelativeMove | 0x06 | |------------------------------------------------------------------------------| | Attributes: | | -| * MptzPosition | 0x0000 | +| * MPTZPosition | 0x0000 | | * MaxPresets | 0x0001 | -| * MptzPresets | 0x0002 | -| * DptzRelativeMove | 0x0003 | +| * MPTZPresets | 0x0002 | +| * DPTZRelativeMove | 0x0003 | | * ZoomMax | 0x0004 | | * TiltMin | 0x0005 | | * TiltMax | 0x0006 | @@ -14191,13 +14191,13 @@ class CameraAvStreamManagementCaptureSnapshot : public ClusterCommand \*----------------------------------------------------------------------------*/ /* - * Command MptzSetPosition + * Command MPTZSetPosition */ -class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand +class CameraAvSettingsUserLevelManagementMPTZSetPosition : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzSetPosition(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("mptz-set-position", credsIssuerConfig) + CameraAvSettingsUserLevelManagementMPTZSetPosition(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptzset-position", credsIssuerConfig) { AddArgument("Pan", INT16_MIN, INT16_MAX, &mRequest.pan); AddArgument("Tilt", INT16_MIN, INT16_MAX, &mRequest.tilt); @@ -14209,7 +14209,7 @@ class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14220,7 +14220,7 @@ class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14229,17 +14229,17 @@ class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Type mRequest; }; /* - * Command MptzRelativeMove + * Command MPTZRelativeMove */ -class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterCommand +class CameraAvSettingsUserLevelManagementMPTZRelativeMove : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzRelativeMove(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("mptz-relative-move", credsIssuerConfig) + CameraAvSettingsUserLevelManagementMPTZRelativeMove(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptzrelative-move", credsIssuerConfig) { AddArgument("PanDelta", INT16_MIN, INT16_MAX, &mRequest.panDelta); AddArgument("TiltDelta", INT16_MIN, INT16_MAX, &mRequest.tiltDelta); @@ -14251,7 +14251,7 @@ class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14262,7 +14262,7 @@ class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14271,17 +14271,17 @@ class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Type mRequest; }; /* - * Command MptzMoveToPreset + * Command MPTZMoveToPreset */ -class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterCommand +class CameraAvSettingsUserLevelManagementMPTZMoveToPreset : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzMoveToPreset(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("mptz-move-to-preset", credsIssuerConfig) + CameraAvSettingsUserLevelManagementMPTZMoveToPreset(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptzmove-to-preset", credsIssuerConfig) { AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); ClusterCommand::AddArguments(); @@ -14291,7 +14291,7 @@ class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14302,7 +14302,7 @@ class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14311,17 +14311,17 @@ class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Type mRequest; }; /* - * Command MptzSavePreset + * Command MPTZSavePreset */ -class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand +class CameraAvSettingsUserLevelManagementMPTZSavePreset : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzSavePreset(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("mptz-save-preset", credsIssuerConfig) + CameraAvSettingsUserLevelManagementMPTZSavePreset(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptzsave-preset", credsIssuerConfig) { AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); AddArgument("Name", &mRequest.name); @@ -14332,7 +14332,7 @@ class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14343,7 +14343,7 @@ class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14352,17 +14352,17 @@ class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Type mRequest; }; /* - * Command MptzRemovePreset + * Command MPTZRemovePreset */ -class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterCommand +class CameraAvSettingsUserLevelManagementMPTZRemovePreset : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzRemovePreset(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("mptz-remove-preset", credsIssuerConfig) + CameraAvSettingsUserLevelManagementMPTZRemovePreset(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("mptzremove-preset", credsIssuerConfig) { AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); ClusterCommand::AddArguments(); @@ -14372,7 +14372,7 @@ class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14383,7 +14383,7 @@ class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14392,17 +14392,17 @@ class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Type mRequest; }; /* - * Command DptzSetViewport + * Command DPTZSetViewport */ -class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand +class CameraAvSettingsUserLevelManagementDPTZSetViewport : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementDptzSetViewport(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("dptz-set-viewport", credsIssuerConfig), mComplex_Viewport(&mRequest.viewport) + CameraAvSettingsUserLevelManagementDPTZSetViewport(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("dptzset-viewport", credsIssuerConfig), mComplex_Viewport(&mRequest.viewport) { AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); AddArgument("Viewport", &mComplex_Viewport); @@ -14413,7 +14413,7 @@ class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14424,7 +14424,7 @@ class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14433,18 +14433,18 @@ class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Type mRequest; TypedComplexArgument mComplex_Viewport; }; /* - * Command DptzRelativeMove + * Command DPTZRelativeMove */ -class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterCommand +class CameraAvSettingsUserLevelManagementDPTZRelativeMove : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementDptzRelativeMove(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("dptz-relative-move", credsIssuerConfig) + CameraAvSettingsUserLevelManagementDPTZRelativeMove(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("dptzrelative-move", credsIssuerConfig) { AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); AddArgument("DeltaX", INT16_MIN, INT16_MAX, &mRequest.deltaX); @@ -14457,7 +14457,7 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointIds.at(0)); @@ -14468,7 +14468,7 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; constexpr chip::CommandId commandId = - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on Group %u", clusterId, commandId, groupId); @@ -14477,7 +14477,7 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -27323,21 +27323,21 @@ void registerClusterCameraAvSettingsUserLevelManagement(Commands & commands, Cre // Commands // make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "mptz-position", Attributes::MptzPosition::Id, credsIssuerConfig), // + make_unique(Id, "mptzposition", Attributes::MPTZPosition::Id, credsIssuerConfig), // make_unique(Id, "max-presets", Attributes::MaxPresets::Id, credsIssuerConfig), // - make_unique(Id, "mptz-presets", Attributes::MptzPresets::Id, credsIssuerConfig), // - make_unique(Id, "dptz-relative-move", Attributes::DptzRelativeMove::Id, credsIssuerConfig), // + make_unique(Id, "mptzpresets", Attributes::MPTZPresets::Id, credsIssuerConfig), // + make_unique(Id, "dptzrelative-move", Attributes::DPTZRelativeMove::Id, credsIssuerConfig), // make_unique(Id, "zoom-max", Attributes::ZoomMax::Id, credsIssuerConfig), // make_unique(Id, "tilt-min", Attributes::TiltMin::Id, credsIssuerConfig), // make_unique(Id, "tilt-max", Attributes::TiltMax::Id, credsIssuerConfig), // @@ -27350,14 +27350,14 @@ void registerClusterCameraAvSettingsUserLevelManagement(Commands & commands, Cre make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // make_unique>( - Id, "mptz-position", Attributes::MptzPosition::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + Id, "mptzposition", Attributes::MPTZPosition::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "max-presets", 0, UINT8_MAX, Attributes::MaxPresets::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( - Id, "mptz-presets", Attributes::MptzPresets::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + Id, "mptzpresets", Attributes::MPTZPresets::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( - Id, "dptz-relative-move", Attributes::DptzRelativeMove::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + Id, "dptzrelative-move", Attributes::DPTZRelativeMove::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "zoom-max", 0, UINT8_MAX, Attributes::ZoomMax::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "tilt-min", INT16_MIN, INT16_MAX, Attributes::TiltMin::Id, @@ -27380,10 +27380,10 @@ void registerClusterCameraAvSettingsUserLevelManagement(Commands & commands, Cre make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "mptz-position", Attributes::MptzPosition::Id, credsIssuerConfig), // + make_unique(Id, "mptzposition", Attributes::MPTZPosition::Id, credsIssuerConfig), // make_unique(Id, "max-presets", Attributes::MaxPresets::Id, credsIssuerConfig), // - make_unique(Id, "mptz-presets", Attributes::MptzPresets::Id, credsIssuerConfig), // - make_unique(Id, "dptz-relative-move", Attributes::DptzRelativeMove::Id, credsIssuerConfig), // + make_unique(Id, "mptzpresets", Attributes::MPTZPresets::Id, credsIssuerConfig), // + make_unique(Id, "dptzrelative-move", Attributes::DPTZRelativeMove::Id, credsIssuerConfig), // make_unique(Id, "zoom-max", Attributes::ZoomMax::Id, credsIssuerConfig), // make_unique(Id, "tilt-min", Attributes::TiltMin::Id, credsIssuerConfig), // make_unique(Id, "tilt-max", Attributes::TiltMax::Id, credsIssuerConfig), // diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 869e0a5f79f484..ad33e575ff37d9 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -18803,27 +18803,27 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP case CameraAvSettingsUserLevelManagement::Id: { switch (path.mAttributeId) { - case CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id: { + case CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::Id: { chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZStruct::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("MptzPosition", 1, value); + return DataModelLogger::LogValue("MPTZPosition", 1, value); } case CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("MaxPresets", 1, value); } - case CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id: { + case CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::Id: { chip::app::DataModel::DecodableList< chip::app::Clusters::CameraAvSettingsUserLevelManagement::Structs::MPTZPresetStruct::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("MptzPresets", 1, value); + return DataModelLogger::LogValue("MPTZPresets", 1, value); } - case CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id: { + case CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("DptzRelativeMove", 1, value); + return DataModelLogger::LogValue("DPTZRelativeMove", 1, value); } case CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::Id: { uint8_t value; diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp index c1ed3fbb823601..1994301e279689 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp @@ -4270,14 +4270,14 @@ char const * AttributeIdToText(chip::ClusterId cluster, chip::AttributeId id) case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id: { switch (id) { - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id: - return "MptzPosition"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::Id: + return "MPTZPosition"; case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MaxPresets::Id: return "MaxPresets"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id: - return "MptzPresets"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id: - return "DptzRelativeMove"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::Id: + return "MPTZPresets"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::Id: + return "DPTZRelativeMove"; case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::ZoomMax::Id: return "ZoomMax"; case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::TiltMin::Id: @@ -5722,20 +5722,20 @@ char const * AcceptedCommandIdToText(chip::ClusterId cluster, chip::CommandId id case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id: { switch (id) { - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id: - return "MptzSetPosition"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id: - return "MptzRelativeMove"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id: - return "MptzMoveToPreset"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id: - return "MptzSavePreset"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id: - return "MptzRemovePreset"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id: - return "DptzSetViewport"; - case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id: - return "DptzRelativeMove"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Id: + return "MPTZSetPosition"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Id: + return "MPTZRelativeMove"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Id: + return "MPTZMoveToPreset"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Id: + return "MPTZSavePreset"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Id: + return "MPTZRemovePreset"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Id: + return "DPTZSetViewport"; + case chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Id: + return "DPTZRelativeMove"; default: return "Unknown"; } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h index a613fc48393aa2..d422915e389869 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -156060,19 +156060,19 @@ class SubscribeAttributeCameraAvStreamManagementClusterRevision : public Subscri | Cluster CameraAvSettingsUserLevelManagement | 0x0552 | |------------------------------------------------------------------------------| | Commands: | | -| * MptzSetPosition | 0x00 | -| * MptzRelativeMove | 0x01 | -| * MptzMoveToPreset | 0x02 | -| * MptzSavePreset | 0x03 | -| * MptzRemovePreset | 0x04 | -| * DptzSetViewport | 0x05 | -| * DptzRelativeMove | 0x06 | +| * MPTZSetPosition | 0x00 | +| * MPTZRelativeMove | 0x01 | +| * MPTZMoveToPreset | 0x02 | +| * MPTZSavePreset | 0x03 | +| * MPTZRemovePreset | 0x04 | +| * DPTZSetViewport | 0x05 | +| * DPTZRelativeMove | 0x06 | |------------------------------------------------------------------------------| | Attributes: | | -| * MptzPosition | 0x0000 | +| * MPTZPosition | 0x0000 | | * MaxPresets | 0x0001 | -| * MptzPresets | 0x0002 | -| * DptzRelativeMove | 0x0003 | +| * MPTZPresets | 0x0002 | +| * DPTZRelativeMove | 0x0003 | | * ZoomMax | 0x0004 | | * TiltMin | 0x0005 | | * TiltMax | 0x0006 | @@ -156089,12 +156089,12 @@ class SubscribeAttributeCameraAvStreamManagementClusterRevision : public Subscri #if MTR_ENABLE_PROVISIONAL /* - * Command MptzSetPosition + * Command MPTZSetPosition */ -class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand { +class CameraAvSettingsUserLevelManagementMPTZSetPosition : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzSetPosition() - : ClusterCommand("mptz-set-position") + CameraAvSettingsUserLevelManagementMPTZSetPosition() + : ClusterCommand("mptzset-position") { #if MTR_ENABLE_PROVISIONAL AddArgument("Pan", INT16_MIN, INT16_MAX, &mRequest.pan); @@ -156111,13 +156111,13 @@ class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSetPositionParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSetPositionParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL if (mRequest.pan.HasValue()) { @@ -156143,7 +156143,7 @@ class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster mptzSetPositionWithParams:params completion: + [cluster MPTZSetPositionWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156160,18 +156160,18 @@ class CameraAvSettingsUserLevelManagementMptzSetPosition : public ClusterCommand } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSetPosition::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSetPosition::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command MptzRelativeMove + * Command MPTZRelativeMove */ -class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterCommand { +class CameraAvSettingsUserLevelManagementMPTZRelativeMove : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzRelativeMove() - : ClusterCommand("mptz-relative-move") + CameraAvSettingsUserLevelManagementMPTZRelativeMove() + : ClusterCommand("mptzrelative-move") { #if MTR_ENABLE_PROVISIONAL AddArgument("PanDelta", INT16_MIN, INT16_MAX, &mRequest.panDelta); @@ -156188,13 +156188,13 @@ class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterComman CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRelativeMoveParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRelativeMoveParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL if (mRequest.panDelta.HasValue()) { @@ -156220,7 +156220,7 @@ class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterComman uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster mptzRelativeMoveWithParams:params completion: + [cluster MPTZRelativeMoveWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156237,18 +156237,18 @@ class CameraAvSettingsUserLevelManagementMptzRelativeMove : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRelativeMove::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRelativeMove::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command MptzMoveToPreset + * Command MPTZMoveToPreset */ -class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterCommand { +class CameraAvSettingsUserLevelManagementMPTZMoveToPreset : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzMoveToPreset() - : ClusterCommand("mptz-move-to-preset") + CameraAvSettingsUserLevelManagementMPTZMoveToPreset() + : ClusterCommand("mptzmove-to-preset") { #if MTR_ENABLE_PROVISIONAL AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); @@ -156259,13 +156259,13 @@ class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterComman CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzMoveToPresetParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZMoveToPresetParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL params.presetID = [NSNumber numberWithUnsignedChar:mRequest.presetID]; @@ -156273,7 +156273,7 @@ class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterComman uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster mptzMoveToPresetWithParams:params completion: + [cluster MPTZMoveToPresetWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156290,18 +156290,18 @@ class CameraAvSettingsUserLevelManagementMptzMoveToPreset : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzMoveToPreset::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZMoveToPreset::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command MptzSavePreset + * Command MPTZSavePreset */ -class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand { +class CameraAvSettingsUserLevelManagementMPTZSavePreset : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzSavePreset() - : ClusterCommand("mptz-save-preset") + CameraAvSettingsUserLevelManagementMPTZSavePreset() + : ClusterCommand("mptzsave-preset") { #if MTR_ENABLE_PROVISIONAL AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); @@ -156315,13 +156315,13 @@ class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzSavePresetParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZSavePresetParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL if (mRequest.presetID.HasValue()) { @@ -156336,7 +156336,7 @@ class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster mptzSavePresetWithParams:params completion: + [cluster MPTZSavePresetWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156353,18 +156353,18 @@ class CameraAvSettingsUserLevelManagementMptzSavePreset : public ClusterCommand } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzSavePreset::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZSavePreset::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command MptzRemovePreset + * Command MPTZRemovePreset */ -class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterCommand { +class CameraAvSettingsUserLevelManagementMPTZRemovePreset : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementMptzRemovePreset() - : ClusterCommand("mptz-remove-preset") + CameraAvSettingsUserLevelManagementMPTZRemovePreset() + : ClusterCommand("mptzremove-preset") { #if MTR_ENABLE_PROVISIONAL AddArgument("PresetID", 0, UINT8_MAX, &mRequest.presetID); @@ -156375,13 +156375,13 @@ class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterComman CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMptzRemovePresetParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterMPTZRemovePresetParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL params.presetID = [NSNumber numberWithUnsignedChar:mRequest.presetID]; @@ -156389,7 +156389,7 @@ class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterComman uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster mptzRemovePresetWithParams:params completion: + [cluster MPTZRemovePresetWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156406,18 +156406,18 @@ class CameraAvSettingsUserLevelManagementMptzRemovePreset : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MptzRemovePreset::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::MPTZRemovePreset::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command DptzSetViewport + * Command DPTZSetViewport */ -class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand { +class CameraAvSettingsUserLevelManagementDPTZSetViewport : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementDptzSetViewport() - : ClusterCommand("dptz-set-viewport") + CameraAvSettingsUserLevelManagementDPTZSetViewport() + : ClusterCommand("dptzset-viewport") , mComplex_Viewport(&mRequest.viewport) { #if MTR_ENABLE_PROVISIONAL @@ -156432,13 +156432,13 @@ class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzSetViewportParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZSetViewportParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL params.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.videoStreamID]; @@ -156453,7 +156453,7 @@ class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster dptzSetViewportWithParams:params completion: + [cluster DPTZSetViewportWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156470,19 +156470,19 @@ class CameraAvSettingsUserLevelManagementDptzSetViewport : public ClusterCommand } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzSetViewport::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZSetViewport::Type mRequest; TypedComplexArgument mComplex_Viewport; }; #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL /* - * Command DptzRelativeMove + * Command DPTZRelativeMove */ -class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterCommand { +class CameraAvSettingsUserLevelManagementDPTZRelativeMove : public ClusterCommand { public: - CameraAvSettingsUserLevelManagementDptzRelativeMove() - : ClusterCommand("dptz-relative-move") + CameraAvSettingsUserLevelManagementDPTZRelativeMove() + : ClusterCommand("dptzrelative-move") { #if MTR_ENABLE_PROVISIONAL AddArgument("VideoStreamID", 0, UINT16_MAX, &mRequest.videoStreamID); @@ -156502,13 +156502,13 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Id; + constexpr chip::CommandId commandId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") command (0x%08" PRIX32 ") on endpoint %u", clusterId, commandId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterDptzRelativeMoveParams alloc] init]; + __auto_type * params = [[MTRCameraAVSettingsUserLevelManagementClusterDPTZRelativeMoveParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; #if MTR_ENABLE_PROVISIONAL params.videoStreamID = [NSNumber numberWithUnsignedShort:mRequest.videoStreamID]; @@ -156537,7 +156537,7 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman uint16_t repeatCount = mRepeatCount.ValueOr(1); uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { - [cluster dptzRelativeMoveWithParams:params completion: + [cluster DPTZRelativeMoveWithParams:params completion: ^(NSError * _Nullable error) { responsesNeeded--; if (error != nil) { @@ -156554,7 +156554,7 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman } private: - chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DptzRelativeMove::Type mRequest; + chip::app::Clusters::CameraAvSettingsUserLevelManagement::Commands::DPTZRelativeMove::Type mRequest; }; #endif // MTR_ENABLE_PROVISIONAL @@ -156562,34 +156562,34 @@ class CameraAvSettingsUserLevelManagementDptzRelativeMove : public ClusterComman #if MTR_ENABLE_PROVISIONAL /* - * Attribute MptzPosition + * Attribute MPTZPosition */ -class ReadCameraAvSettingsUserLevelManagementMptzPosition : public ReadAttribute { +class ReadCameraAvSettingsUserLevelManagementMPTZPosition : public ReadAttribute { public: - ReadCameraAvSettingsUserLevelManagementMptzPosition() - : ReadAttribute("mptz-position") + ReadCameraAvSettingsUserLevelManagementMPTZPosition() + : ReadAttribute("mptzposition") { } - ~ReadCameraAvSettingsUserLevelManagementMptzPosition() + ~ReadCameraAvSettingsUserLevelManagementMPTZPosition() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeMptzPositionWithCompletion:^(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVSettingsUserLevelManagement.MptzPosition response %@", [value description]); + [cluster readAttributeMPTZPositionWithCompletion:^(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MPTZPosition response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { - LogNSError("CameraAVSettingsUserLevelManagement MptzPosition read Error", error); + LogNSError("CameraAVSettingsUserLevelManagement MPTZPosition read Error", error); RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); } SetCommandExitStatus(error); @@ -156598,21 +156598,21 @@ class ReadCameraAvSettingsUserLevelManagementMptzPosition : public ReadAttribute } }; -class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition : public SubscribeAttribute { +class SubscribeAttributeCameraAvSettingsUserLevelManagementMPTZPosition : public SubscribeAttribute { public: - SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition() - : SubscribeAttribute("mptz-position") + SubscribeAttributeCameraAvSettingsUserLevelManagementMPTZPosition() + : SubscribeAttribute("mptzposition") { } - ~SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition() + ~SubscribeAttributeCameraAvSettingsUserLevelManagementMPTZPosition() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPosition::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MPTZPosition::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); @@ -156627,10 +156627,10 @@ class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPosition : public if (mAutoResubscribe.HasValue()) { params.resubscribeAutomatically = mAutoResubscribe.Value(); } - [cluster subscribeAttributeMptzPositionWithParams:params + [cluster subscribeAttributeMPTZPositionWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(MTRCameraAVSettingsUserLevelManagementClusterMPTZStruct * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVSettingsUserLevelManagement.MptzPosition response %@", [value description]); + NSLog(@"CameraAVSettingsUserLevelManagement.MPTZPosition response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { @@ -156732,34 +156732,34 @@ class SubscribeAttributeCameraAvSettingsUserLevelManagementMaxPresets : public S #if MTR_ENABLE_PROVISIONAL /* - * Attribute MptzPresets + * Attribute MPTZPresets */ -class ReadCameraAvSettingsUserLevelManagementMptzPresets : public ReadAttribute { +class ReadCameraAvSettingsUserLevelManagementMPTZPresets : public ReadAttribute { public: - ReadCameraAvSettingsUserLevelManagementMptzPresets() - : ReadAttribute("mptz-presets") + ReadCameraAvSettingsUserLevelManagementMPTZPresets() + : ReadAttribute("mptzpresets") { } - ~ReadCameraAvSettingsUserLevelManagementMptzPresets() + ~ReadCameraAvSettingsUserLevelManagementMPTZPresets() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeMptzPresetsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVSettingsUserLevelManagement.MptzPresets response %@", [value description]); + [cluster readAttributeMPTZPresetsWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.MPTZPresets response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { - LogNSError("CameraAVSettingsUserLevelManagement MptzPresets read Error", error); + LogNSError("CameraAVSettingsUserLevelManagement MPTZPresets read Error", error); RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); } SetCommandExitStatus(error); @@ -156768,21 +156768,21 @@ class ReadCameraAvSettingsUserLevelManagementMptzPresets : public ReadAttribute } }; -class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets : public SubscribeAttribute { +class SubscribeAttributeCameraAvSettingsUserLevelManagementMPTZPresets : public SubscribeAttribute { public: - SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets() - : SubscribeAttribute("mptz-presets") + SubscribeAttributeCameraAvSettingsUserLevelManagementMPTZPresets() + : SubscribeAttribute("mptzpresets") { } - ~SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets() + ~SubscribeAttributeCameraAvSettingsUserLevelManagementMPTZPresets() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MptzPresets::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::MPTZPresets::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); @@ -156797,10 +156797,10 @@ class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets : public if (mAutoResubscribe.HasValue()) { params.resubscribeAutomatically = mAutoResubscribe.Value(); } - [cluster subscribeAttributeMptzPresetsWithParams:params + [cluster subscribeAttributeMPTZPresetsWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVSettingsUserLevelManagement.MptzPresets response %@", [value description]); + NSLog(@"CameraAVSettingsUserLevelManagement.MPTZPresets response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { @@ -156817,34 +156817,34 @@ class SubscribeAttributeCameraAvSettingsUserLevelManagementMptzPresets : public #if MTR_ENABLE_PROVISIONAL /* - * Attribute DptzRelativeMove + * Attribute DPTZRelativeMove */ -class ReadCameraAvSettingsUserLevelManagementDptzRelativeMove : public ReadAttribute { +class ReadCameraAvSettingsUserLevelManagementDPTZRelativeMove : public ReadAttribute { public: - ReadCameraAvSettingsUserLevelManagementDptzRelativeMove() - : ReadAttribute("dptz-relative-move") + ReadCameraAvSettingsUserLevelManagementDPTZRelativeMove() + : ReadAttribute("dptzrelative-move") { } - ~ReadCameraAvSettingsUserLevelManagementDptzRelativeMove() + ~ReadCameraAvSettingsUserLevelManagementDPTZRelativeMove() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id; + constexpr chip::AttributeId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReadAttribute (0x%08" PRIX32 ") on endpoint %u", endpointId, clusterId, attributeId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); __auto_type * cluster = [[MTRBaseClusterCameraAVSettingsUserLevelManagement alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - [cluster readAttributeDptzRelativeMoveWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVSettingsUserLevelManagement.DptzRelativeMove response %@", [value description]); + [cluster readAttributeDPTZRelativeMoveWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { + NSLog(@"CameraAVSettingsUserLevelManagement.DPTZRelativeMove response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { - LogNSError("CameraAVSettingsUserLevelManagement DptzRelativeMove read Error", error); + LogNSError("CameraAVSettingsUserLevelManagement DPTZRelativeMove read Error", error); RemoteDataModelLogger::LogAttributeErrorAsJSON(@(endpointId), @(clusterId), @(attributeId), error); } SetCommandExitStatus(error); @@ -156853,21 +156853,21 @@ class ReadCameraAvSettingsUserLevelManagementDptzRelativeMove : public ReadAttri } }; -class SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove : public SubscribeAttribute { +class SubscribeAttributeCameraAvSettingsUserLevelManagementDPTZRelativeMove : public SubscribeAttribute { public: - SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove() - : SubscribeAttribute("dptz-relative-move") + SubscribeAttributeCameraAvSettingsUserLevelManagementDPTZRelativeMove() + : SubscribeAttribute("dptzrelative-move") { } - ~SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove() + ~SubscribeAttributeCameraAvSettingsUserLevelManagementDPTZRelativeMove() { } CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { constexpr chip::ClusterId clusterId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Id; - constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DptzRelativeMove::Id; + constexpr chip::CommandId attributeId = chip::app::Clusters::CameraAvSettingsUserLevelManagement::Attributes::DPTZRelativeMove::Id; ChipLogProgress(chipTool, "Sending cluster (0x%08" PRIX32 ") ReportAttribute (0x%08" PRIX32 ") on endpoint %u", clusterId, attributeId, endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL_WITH_AUTORELEASE_POOL); @@ -156882,10 +156882,10 @@ class SubscribeAttributeCameraAvSettingsUserLevelManagementDptzRelativeMove : pu if (mAutoResubscribe.HasValue()) { params.resubscribeAutomatically = mAutoResubscribe.Value(); } - [cluster subscribeAttributeDptzRelativeMoveWithParams:params + [cluster subscribeAttributeDPTZRelativeMoveWithParams:params subscriptionEstablished:^() { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"CameraAVSettingsUserLevelManagement.DptzRelativeMove response %@", [value description]); + NSLog(@"CameraAVSettingsUserLevelManagement.DPTZRelativeMove response %@", [value description]); if (error == nil) { RemoteDataModelLogger::LogAttributeAsJSON(@(endpointId), @(clusterId), @(attributeId), value); } else { @@ -182920,44 +182920,44 @@ void registerClusterCameraAvSettingsUserLevelManagement(Commands & commands) commands_list clusterCommands = { make_unique(Id), // #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL make_unique(Id), // make_unique(Id), // make_unique(Id), // #if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), // make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // #endif // MTR_ENABLE_PROVISIONAL #if MTR_ENABLE_PROVISIONAL make_unique(), // From f87b1cf6f6d2dd6b56c3a1516c58ee4f3691bfaf Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 18 Dec 2024 21:39:25 +0000 Subject: [PATCH 18/23] Restyled by whitespace --- src/app/zap-templates/zcl/zcl-with-test-extensions.json | 2 +- src/app/zap-templates/zcl/zcl.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index 6413f4b36dceea..c3d7fa20eebd4b 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -777,4 +777,4 @@ "uiOptions": { "showProfileId": false } -} \ No newline at end of file +} diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 2e08a88497f91b..16a70f1078e396 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -775,4 +775,4 @@ "uiOptions": { "showProfileId": false } -} \ No newline at end of file +} From d02245def111d5a879a9ebdb75b36d949d18ba19 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Wed, 18 Dec 2024 21:39:30 +0000 Subject: [PATCH 19/23] Restyled by prettier-json --- .../zcl/zcl-with-test-extensions.json | 124 ++++------------- src/app/zap-templates/zcl/zcl.json | 130 ++++-------------- 2 files changed, 49 insertions(+), 205 deletions(-) diff --git a/src/app/zap-templates/zcl/zcl-with-test-extensions.json b/src/app/zap-templates/zcl/zcl-with-test-extensions.json index c3d7fa20eebd4b..6aa9408f715c53 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -148,15 +148,9 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": [ - "Always", - "Conditional", - "Never" - ] + "defaultResponsePolicy": ["Always", "Conditional", "Never"] }, - "bool": [ - "commandDiscovery" - ] + "bool": ["commandDiscovery"] }, "defaults": { "text": { @@ -202,17 +196,9 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": [ - "ProductAppearance" - ], - "Chime": [ - "ActiveChimeID", - "Enabled" - ], - "Descriptor": [ - "ClusterRevision", - "FeatureMap" - ], + "Bridged Device Basic Information": ["ProductAppearance"], + "Chime": ["ActiveChimeID", "Enabled"], + "Descriptor": ["ClusterRevision", "FeatureMap"], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -264,11 +250,7 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -427,21 +409,14 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": [ - "Lineup", - "CurrentChannel" - ], + "Channel": ["Lineup", "CurrentChannel"], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": [ - "CurrentApp" - ], - "Application Basic": [ - "Application" - ], + "Application Launcher": ["CurrentApp"], + "Application Basic": ["Application"], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -453,19 +428,9 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": [ - "SupportedTemperatureLevels" - ], - "Dishwasher Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Microwave Oven Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Temperature Control": ["SupportedTemperatureLevels"], + "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -478,26 +443,14 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "RVC Run Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Operational State": [ "OperationalState", "OperationalError", @@ -674,10 +627,7 @@ "LevelValue", "FeatureMap" ], - "Air Quality": [ - "AirQuality", - "FeatureMap" - ], + "Air Quality": ["AirQuality", "FeatureMap"], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -709,15 +659,9 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": [ - "FeatureMap" - ], - "Valve Configuration and Control": [ - "RemainingDuration" - ], - "Boolean State Configuration": [ - "CurrentSensitivityLevel" - ], + "Power Topology": ["FeatureMap"], + "Valve Configuration and Control": ["RemainingDuration"], + "Boolean State Configuration": ["CurrentSensitivityLevel"], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -728,25 +672,14 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Wi-Fi Network Management": [ - "SSID", - "PassphraseSurrogate" - ], + "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": [ - "CurrentArea", - "EstimatedEndTime", - "FeatureMap" - ], + "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -754,20 +687,11 @@ "SpeakerCapabilities", "Viewport" ], - "Camera AV Settings User Level Management": [ - "MPTZPosition" - ] + "Camera AV Settings User Level Management": ["MPTZPosition"] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": [ - "ARRAY", - "BITMAP", - "ENUM", - "NUMBER", - "STRING", - "STRUCT" - ], + "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 16a70f1078e396..836126d877426f 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -3,11 +3,7 @@ "category": "matter", "version": 1, "requiredFeatureLevel": 102, - "xmlRoot": [ - ".", - "./data-model/chip/", - "./data-model/silabs/" - ], + "xmlRoot": [".", "./data-model/chip/", "./data-model/silabs/"], "_comment": "Ensure access-control-definitions.xml is first in xmlFile array", "xmlFile": [ "access-control-definitions.xml", @@ -146,15 +142,9 @@ "manufacturersXml": "../../../../src/app/zap-templates/zcl/data-model/manufacturers.xml", "options": { "text": { - "defaultResponsePolicy": [ - "Always", - "Conditional", - "Never" - ] + "defaultResponsePolicy": ["Always", "Conditional", "Never"] }, - "bool": [ - "commandDiscovery" - ] + "bool": ["commandDiscovery"] }, "defaults": { "text": { @@ -200,17 +190,9 @@ "SpecificationVersion", "MaxPathsPerInvoke" ], - "Bridged Device Basic Information": [ - "ProductAppearance" - ], - "Chime": [ - "ActiveChimeID", - "Enabled" - ], - "Descriptor": [ - "ClusterRevision", - "FeatureMap" - ], + "Bridged Device Basic Information": ["ProductAppearance"], + "Chime": ["ActiveChimeID", "Enabled"], + "Descriptor": ["ClusterRevision", "FeatureMap"], "Device Energy Management": [ "ESAType", "ESACanGenerate", @@ -262,11 +244,7 @@ "SessionEnergyDischarged", "FeatureMap" ], - "Energy EVSE Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Energy EVSE Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Ethernet Network Diagnostics": [ "PHYRate", "FullDuplex", @@ -425,21 +403,14 @@ "CurrentMaxRate", "OverrunCount" ], - "Channel": [ - "Lineup", - "CurrentChannel" - ], + "Channel": ["Lineup", "CurrentChannel"], "Media Playback": [ "SampledPosition", "ActiveAudioTrack", "ActiveTextTrack" ], - "Application Launcher": [ - "CurrentApp" - ], - "Application Basic": [ - "Application" - ], + "Application Launcher": ["CurrentApp"], + "Application Basic": ["Application"], "Time Synchronization": [ "TrustedTimeSource", "DefaultNTP", @@ -451,19 +422,9 @@ "TimeZoneListMaxSize", "DSTOffsetListMaxSize" ], - "Temperature Control": [ - "SupportedTemperatureLevels" - ], - "Dishwasher Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Microwave Oven Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Temperature Control": ["SupportedTemperatureLevels"], + "Dishwasher Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Microwave Oven Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Microwave Oven Control": [ "CookTime", "MaxCookTime", @@ -476,26 +437,14 @@ "WattRating", "FeatureMap" ], - "Laundry Washer Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "Laundry Washer Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Refrigerator And Temperature Controlled Cabinet Mode": [ "SupportedModes", "CurrentMode", "FeatureMap" ], - "RVC Clean Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "RVC Run Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], + "RVC Clean Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "RVC Run Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], "Operational State": [ "OperationalState", "OperationalError", @@ -672,10 +621,7 @@ "LevelValue", "FeatureMap" ], - "Air Quality": [ - "AirQuality", - "FeatureMap" - ], + "Air Quality": ["AirQuality", "FeatureMap"], "Electrical Energy Measurement": [ "Accuracy", "CumulativeEnergyImported", @@ -707,15 +653,9 @@ "NeutralCurrent", "FeatureMap" ], - "Power Topology": [ - "FeatureMap" - ], - "Valve Configuration and Control": [ - "RemainingDuration" - ], - "Boolean State Configuration": [ - "CurrentSensitivityLevel" - ], + "Power Topology": ["FeatureMap"], + "Valve Configuration and Control": ["RemainingDuration"], + "Boolean State Configuration": ["CurrentSensitivityLevel"], "Water Heater Management": [ "HeaterTypes", "HeatDemand", @@ -726,25 +666,14 @@ "FeatureMap", "ClusterRevision" ], - "Water Heater Mode": [ - "SupportedModes", - "CurrentMode", - "FeatureMap" - ], - "Wi-Fi Network Management": [ - "SSID", - "PassphraseSurrogate" - ], + "Water Heater Mode": ["SupportedModes", "CurrentMode", "FeatureMap"], + "Wi-Fi Network Management": ["SSID", "PassphraseSurrogate"], "Thread Network Directory": [ "PreferredExtendedPanID", "ThreadNetworks", "ThreadNetworkTableSize" ], - "Service Area": [ - "CurrentArea", - "EstimatedEndTime", - "FeatureMap" - ], + "Service Area": ["CurrentArea", "EstimatedEndTime", "FeatureMap"], "Camera AV Stream Management": [ "VideoSensorParams", "MinViewport", @@ -752,20 +681,11 @@ "SpeakerCapabilities", "Viewport" ], - "Camera AV Settings User Level Management": [ - "MPTZPosition" - ] + "Camera AV Settings User Level Management": ["MPTZPosition"] }, "mandatoryDeviceTypes": "0x0016", "defaultReportingPolicy": "mandatory", - "ZCLDataTypes": [ - "ARRAY", - "BITMAP", - "ENUM", - "NUMBER", - "STRING", - "STRUCT" - ], + "ZCLDataTypes": ["ARRAY", "BITMAP", "ENUM", "NUMBER", "STRING", "STRUCT"], "fabricHandling": { "automaticallyCreateFields": true, "indexFieldId": 254, From b93972a905acc24ac7f44fbb9b2e84c6ac56b1ae Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Thu, 19 Dec 2024 14:42:18 -0600 Subject: [PATCH 20/23] Renumber struct field IDs Fix accidental backout of chime-server reference --- ...settings-user-level-management-cluster.xml | 6 +- src/app/zap_cluster_list.json | 342 +++++++++++++----- .../data_model/controller-clusters.matter | 6 +- .../chip/devicecontroller/ChipStructs.java | 6 +- .../zap-generated/cluster-objects.h | 6 +- 5 files changed, 268 insertions(+), 98 deletions(-) diff --git a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml index a541695c50a0f0..660c2dfb58378b 100644 --- a/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/camera-av-settings-user-level-management-cluster.xml @@ -31,9 +31,9 @@ Git: 1.4-444-g6d595e737 - - - + + + diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index e859e6730cc9e3..f5eb5d529a82ae 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -113,7 +113,9 @@ "TARGET_NAVIGATOR_CLUSTER": [], "TEMPERATURE_CONTROL_CLUSTER": [], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": ["thermostat-client"], + "THERMOSTAT_CLUSTER": [ + "thermostat-client" + ], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [], "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [], "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [], @@ -140,8 +142,12 @@ "ZONE_MANAGEMENT_CLUSTER": [] }, "ServerDirectories": { - "ACCESS_CONTROL_CLUSTER": ["access-control-server"], - "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"], + "ACCESS_CONTROL_CLUSTER": [ + "access-control-server" + ], + "ACCOUNT_LOGIN_CLUSTER": [ + "account-login-server" + ], "ACTIONS_CLUSTER": [], "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [ "resource-monitoring-server" @@ -149,14 +155,26 @@ "ADMINISTRATOR_COMMISSIONING_CLUSTER": [ "administrator-commissioning-server" ], - "AIR_QUALITY_CLUSTER": ["air-quality-server"], + "AIR_QUALITY_CLUSTER": [ + "air-quality-server" + ], "ALARM_CLUSTER": [], - "APPLICATION_BASIC_CLUSTER": ["application-basic-server"], - "APPLICATION_LAUNCHER_CLUSTER": ["application-launcher-server"], - "AUDIO_OUTPUT_CLUSTER": ["audio-output-server"], + "APPLICATION_BASIC_CLUSTER": [ + "application-basic-server" + ], + "APPLICATION_LAUNCHER_CLUSTER": [ + "application-launcher-server" + ], + "AUDIO_OUTPUT_CLUSTER": [ + "audio-output-server" + ], "BALLAST_CONFIGURATION_CLUSTER": [], - "BASIC_INFORMATION_CLUSTER": ["basic-information"], - "BINDING_CLUSTER": ["bindings"], + "BASIC_INFORMATION_CLUSTER": [ + "basic-information" + ], + "BINDING_CLUSTER": [ + "bindings" + ], "BOOLEAN_STATE_CLUSTER": [], "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [ "boolean-state-configuration-server" @@ -172,79 +190,179 @@ "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "CHANNEL_CLUSTER": ["channel-server"], - "CHIME_CLUSTER": [], - "COLOR_CONTROL_CLUSTER": ["color-control-server"], - "COMMISSIONER_CONTROL_CLUSTER": ["commissioner-control-server"], + "CHANNEL_CLUSTER": [ + "channel-server" + ], + "CHIME_CLUSTER": [ + "chime-server" + ], + "COLOR_CONTROL_CLUSTER": [ + "color-control-server" + ], + "COMMISSIONER_CONTROL_CLUSTER": [ + "commissioner-control-server" + ], "COMMISSIONING_CLUSTER": [], - "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"], - "CONTENT_CONTROL_CLUSTER": ["content-control-server"], - "CONTENT_APP_OBSERVER_CLUSTER": ["content-app-observer"], - "DESCRIPTOR_CLUSTER": ["descriptor"], - "DEVICE_ENERGY_MANAGEMENT_CLUSTER": ["device-energy-management-server"], - "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": ["mode-base-server"], + "CONTENT_LAUNCHER_CLUSTER": [ + "content-launch-server" + ], + "CONTENT_CONTROL_CLUSTER": [ + "content-control-server" + ], + "CONTENT_APP_OBSERVER_CLUSTER": [ + "content-app-observer" + ], + "DESCRIPTOR_CLUSTER": [ + "descriptor" + ], + "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [ + "device-energy-management-server" + ], + "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [ + "mode-base-server" + ], "DEVICE_TEMP_CLUSTER": [], - "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"], - "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"], - "DISHWASHER_MODE_CLUSTER": ["mode-base-server"], - "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"], - "DOOR_LOCK_CLUSTER": ["door-lock-server"], - "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"], + "DIAGNOSTIC_LOGS_CLUSTER": [ + "diagnostic-logs-server" + ], + "DISHWASHER_ALARM_CLUSTER": [ + "dishwasher-alarm-server" + ], + "DISHWASHER_MODE_CLUSTER": [ + "mode-base-server" + ], + "MICROWAVE_OVEN_MODE_CLUSTER": [ + "mode-base-server" + ], + "DOOR_LOCK_CLUSTER": [ + "door-lock-server" + ], + "ECOSYSTEM_INFORMATION_CLUSTER": [ + "ecosystem-information-server" + ], "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [ "electrical-energy-measurement-server" ], "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [ "electrical-power-measurement-server" ], - "ENERGY_EVSE_CLUSTER": ["energy-evse-server"], - "ENERGY_EVSE_MODE_CLUSTER": ["mode-base-server"], + "ENERGY_EVSE_CLUSTER": [ + "energy-evse-server" + ], + "ENERGY_EVSE_MODE_CLUSTER": [ + "mode-base-server" + ], "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [ "ethernet-network-diagnostics-server" ], - "ENERGY_PREFERENCE_CLUSTER": ["energy-preference-server"], - "FAN_CONTROL_CLUSTER": ["fan-control-server"], - "FAULT_INJECTION_CLUSTER": ["fault-injection-server"], - "FIXED_LABEL_CLUSTER": ["fixed-label-server"], + "ENERGY_PREFERENCE_CLUSTER": [ + "energy-preference-server" + ], + "FAN_CONTROL_CLUSTER": [ + "fan-control-server" + ], + "FAULT_INJECTION_CLUSTER": [ + "fault-injection-server" + ], + "FIXED_LABEL_CLUSTER": [ + "fixed-label-server" + ], "FLOW_MEASUREMENT_CLUSTER": [], "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"], - "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"], - "GROUPS_CLUSTER": ["groups-server"], - "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"], - "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"], - "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"], - "IDENTIFY_CLUSTER": ["identify-server"], + "GENERAL_COMMISSIONING_CLUSTER": [ + "general-commissioning-server" + ], + "GENERAL_DIAGNOSTICS_CLUSTER": [ + "general-diagnostics-server" + ], + "GROUPS_CLUSTER": [ + "groups-server" + ], + "HEPA_FILTER_MONITORING_CLUSTER": [ + "resource-monitoring-server" + ], + "GROUP_KEY_MANAGEMENT_CLUSTER": [ + "group-key-mgmt-server" + ], + "ICD_MANAGEMENT_CLUSTER": [ + "icd-management-server" + ], + "IDENTIFY_CLUSTER": [ + "identify-server" + ], "ILLUMINANCE_MEASUREMENT_CLUSTER": [], - "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"], - "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-base-server"], - "LEVEL_CONTROL_CLUSTER": ["level-control"], + "KEYPAD_INPUT_CLUSTER": [ + "keypad-input-server" + ], + "LAUNDRY_WASHER_MODE_CLUSTER": [ + "mode-base-server" + ], + "LEVEL_CONTROL_CLUSTER": [ + "level-control" + ], "LOCALIZATION_CONFIGURATION_CLUSTER": [ "localization-configuration-server" ], - "LOW_POWER_CLUSTER": ["low-power-server"], - "MEDIA_INPUT_CLUSTER": ["media-input-server"], - "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"], - "MICROWAVE_OVEN_CONTROL_CLUSTER": ["microwave-oven-control-server"], - "MESSAGES_CLUSTER": ["messages-server"], - "MODE_SELECT_CLUSTER": ["mode-select-server"], - "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"], + "LOW_POWER_CLUSTER": [ + "low-power-server" + ], + "MEDIA_INPUT_CLUSTER": [ + "media-input-server" + ], + "MEDIA_PLAYBACK_CLUSTER": [ + "media-playback-server" + ], + "MICROWAVE_OVEN_CONTROL_CLUSTER": [ + "microwave-oven-control-server" + ], + "MESSAGES_CLUSTER": [ + "messages-server" + ], + "MODE_SELECT_CLUSTER": [ + "mode-select-server" + ], + "NETWORK_COMMISSIONING_CLUSTER": [ + "network-commissioning" + ], "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "SAMPLE_MEI_CLUSTER": ["sample-mei-server"], - "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"], - "ON_OFF_CLUSTER": ["on-off-server"], - "POWER_TOPOLOGY_CLUSTER": ["power-topology-server"], - "OPERATIONAL_CREDENTIALS_CLUSTER": ["operational-credentials-server"], - "OPERATIONAL_STATE_CLUSTER": ["operational-state-server"], - "OPERATIONAL_STATE_OVEN_CLUSTER": ["operational-state-server"], - "OPERATIONAL_STATE_RVC_CLUSTER": ["operational-state-server"], + "SAMPLE_MEI_CLUSTER": [ + "sample-mei-server" + ], + "OCCUPANCY_SENSING_CLUSTER": [ + "occupancy-sensor-server" + ], + "ON_OFF_CLUSTER": [ + "on-off-server" + ], + "POWER_TOPOLOGY_CLUSTER": [ + "power-topology-server" + ], + "OPERATIONAL_CREDENTIALS_CLUSTER": [ + "operational-credentials-server" + ], + "OPERATIONAL_STATE_CLUSTER": [ + "operational-state-server" + ], + "OPERATIONAL_STATE_OVEN_CLUSTER": [ + "operational-state-server" + ], + "OPERATIONAL_STATE_RVC_CLUSTER": [ + "operational-state-server" + ], "OTA_BOOTLOAD_CLUSTER": [], - "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"], - "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"], - "OVEN_MODE_CLUSTER": ["mode-base-server"], + "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [ + "ota-provider" + ], + "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [ + "ota-requestor" + ], + "OVEN_MODE_CLUSTER": [ + "mode-base-server" + ], "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], @@ -260,7 +378,9 @@ "POLL_CONTROL_CLUSTER": [], "POWER_CONFIG_CLUSTER": [], "POWER_PROFILE_CLUSTER": [], - "POWER_SOURCE_CLUSTER": ["power-source-server"], + "POWER_SOURCE_CLUSTER": [ + "power-source-server" + ], "POWER_SOURCE_CONFIGURATION_CLUSTER": [ "power-source-configuration-server" ], @@ -275,22 +395,44 @@ "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"], + "REFRIGERATOR_ALARM_CLUSTER": [ + "refrigerator-alarm-server" + ], "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [ "mode-base-server" ], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_MODE_CLUSTER": ["mode-base-server"], - "RVC_RUN_MODE_CLUSTER": ["mode-base-server"], - "SCENES_CLUSTER": ["scenes-server"], - "SERVICE_AREA_CLUSTER": ["service-area-server"], - "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"], - "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"], - "SWITCH_CLUSTER": ["switch-server"], - "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"], - "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"], + "RVC_CLEAN_MODE_CLUSTER": [ + "mode-base-server" + ], + "RVC_RUN_MODE_CLUSTER": [ + "mode-base-server" + ], + "SCENES_CLUSTER": [ + "scenes-server" + ], + "SERVICE_AREA_CLUSTER": [ + "service-area-server" + ], + "SMOKE_CO_ALARM_CLUSTER": [ + "smoke-co-alarm-server" + ], + "SOFTWARE_DIAGNOSTICS_CLUSTER": [ + "software-diagnostics-server" + ], + "SWITCH_CLUSTER": [ + "switch-server" + ], + "TARGET_NAVIGATOR_CLUSTER": [ + "target-navigator-server" + ], + "TEMPERATURE_CONTROL_CLUSTER": [ + "temperature-control-server" + ], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": ["thermostat-server"], + "THERMOSTAT_CLUSTER": [ + "thermostat-server" + ], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [ "thermostat-user-interface-configuration-server" ], @@ -300,30 +442,58 @@ "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [ "thread-network-diagnostics-server" ], - "THREAD_NETWORK_DIRECTORY_CLUSTER": ["thread-network-directory-server"], + "THREAD_NETWORK_DIRECTORY_CLUSTER": [ + "thread-network-directory-server" + ], "TIME_CLUSTER": [], - "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"], - "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"], - "TIMER_CLUSTER": ["timer-server"], + "TIME_FORMAT_LOCALIZATION_CLUSTER": [ + "time-format-localization-server" + ], + "TIME_SYNCHRONIZATION_CLUSTER": [ + "time-synchronization-server" + ], + "TIMER_CLUSTER": [ + "timer-server" + ], "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], "UNIT_LOCALIZATION_CLUSTER": [], - "UNIT_TESTING_CLUSTER": ["test-cluster-server"], - "USER_LABEL_CLUSTER": ["user-label-server"], + "UNIT_TESTING_CLUSTER": [ + "test-cluster-server" + ], + "USER_LABEL_CLUSTER": [ + "user-label-server" + ], "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [ "valve-configuration-and-control-server" ], - "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"], - "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"], - "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"], + "WAKE_ON_LAN_CLUSTER": [ + "wake-on-lan-server" + ], + "LAUNDRY_WASHER_CONTROLS_CLUSTER": [ + "laundry-washer-controls-server" + ], + "LAUNDRY_DRYER_CONTROLS_CLUSTER": [ + "laundry-dryer-controls-server" + ], "WEB_RTC_PROVIDER_CLUSTER": [], "WEBRTC_REQUESTOR_CLUSTER": [], - "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"], - "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"], - "WINDOW_COVERING_CLUSTER": ["window-covering-server"], - "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"], - "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"], + "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [ + "wifi-network-diagnostics-server" + ], + "WIFI_NETWORK_MANAGEMENT_CLUSTER": [ + "wifi-network-management-server" + ], + "WINDOW_COVERING_CLUSTER": [ + "window-covering-server" + ], + "WATER_HEATER_MANAGEMENT_CLUSTER": [ + "water-heater-management-server" + ], + "WATER_HEATER_MODE_CLUSTER": [ + "mode-base-server" + ], "ZONE_MANAGEMENT_CLUSTER": [] } -} +} \ No newline at end of file diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 814d67bdd4d419..67d28d3ef3f88f 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -9851,9 +9851,9 @@ provisional cluster CameraAvSettingsUserLevelManagement = 1362 { } struct MPTZStruct { - optional int16s pan = 2; - optional int16s tilt = 3; - optional int8u zoom = 4; + optional int16s pan = 0; + optional int16s tilt = 1; + optional int8u zoom = 2; } struct MPTZPresetStruct { diff --git a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java index 0598ae01b00192..349bbffaf51e95 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java @@ -14106,9 +14106,9 @@ public static class CameraAvSettingsUserLevelManagementClusterMPTZStruct { public Optional pan; public Optional tilt; public Optional zoom; - private static final long PAN_ID = 2L; - private static final long TILT_ID = 3L; - private static final long ZOOM_ID = 4L; + private static final long PAN_ID = 0L; + private static final long TILT_ID = 1L; + private static final long ZOOM_ID = 2L; public CameraAvSettingsUserLevelManagementClusterMPTZStruct( Optional pan, 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 60038888d0e7cd..9b248a927072b2 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 @@ -42530,9 +42530,9 @@ namespace Structs { namespace MPTZStruct { enum class Fields : uint8_t { - kPan = 2, - kTilt = 3, - kZoom = 4, + kPan = 0, + kTilt = 1, + kZoom = 2, }; struct Type From 8bbfaecfd8f5fc6cb8def9b583f60dcd4abe05ba Mon Sep 17 00:00:00 2001 From: "m.trayer" Date: Thu, 19 Dec 2024 15:10:38 -0600 Subject: [PATCH 21/23] Regen after sync with master --- .../CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt | 6 +++--- .../CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt | 6 +++--- src/controller/python/chip/clusters/Objects.py | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt index 39a5522c07eff3..e2ae92699af96b 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt +++ b/src/controller/java/generated/java/chip/devicecontroller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt @@ -56,9 +56,9 @@ class CameraAvSettingsUserLevelManagementClusterMPTZStruct( } companion object { - private const val TAG_PAN = 2 - private const val TAG_TILT = 3 - private const val TAG_ZOOM = 4 + private const val TAG_PAN = 0 + private const val TAG_TILT = 1 + private const val TAG_ZOOM = 2 fun fromTlv( tlvTag: Tag, diff --git a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt index c07c704b0bb06e..ebc6dd12822dc5 100644 --- a/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt +++ b/src/controller/java/generated/java/matter/controller/cluster/structs/CameraAvSettingsUserLevelManagementClusterMPTZStruct.kt @@ -56,9 +56,9 @@ class CameraAvSettingsUserLevelManagementClusterMPTZStruct( } companion object { - private const val TAG_PAN = 2 - private const val TAG_TILT = 3 - private const val TAG_ZOOM = 4 + private const val TAG_PAN = 0 + private const val TAG_TILT = 1 + private const val TAG_ZOOM = 2 fun fromTlv( tlvTag: Tag, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 42d54c051c2cfa..6d7131500b1dd6 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -46285,9 +46285,9 @@ class MPTZStruct(ClusterObject): def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="pan", Tag=2, Type=typing.Optional[int]), - ClusterObjectFieldDescriptor(Label="tilt", Tag=3, Type=typing.Optional[int]), - ClusterObjectFieldDescriptor(Label="zoom", Tag=4, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="pan", Tag=0, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="tilt", Tag=1, Type=typing.Optional[int]), + ClusterObjectFieldDescriptor(Label="zoom", Tag=2, Type=typing.Optional[uint]), ]) pan: 'typing.Optional[int]' = None From 5d3ce799482776c14809f01c439feca9ecc6034e Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Thu, 19 Dec 2024 21:12:05 +0000 Subject: [PATCH 22/23] Restyled by whitespace --- src/app/zap_cluster_list.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index f5eb5d529a82ae..c427882d516409 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -496,4 +496,4 @@ ], "ZONE_MANAGEMENT_CLUSTER": [] } -} \ No newline at end of file +} From 7e2cafb0b3678f24fa9cc7c75689ac9919363858 Mon Sep 17 00:00:00 2001 From: "Restyled.io" Date: Thu, 19 Dec 2024 21:12:10 +0000 Subject: [PATCH 23/23] Restyled by prettier-json --- src/app/zap_cluster_list.json | 340 +++++++++------------------------- 1 file changed, 85 insertions(+), 255 deletions(-) diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index c427882d516409..7f9fe4a7dcd25f 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -113,9 +113,7 @@ "TARGET_NAVIGATOR_CLUSTER": [], "TEMPERATURE_CONTROL_CLUSTER": [], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": [ - "thermostat-client" - ], + "THERMOSTAT_CLUSTER": ["thermostat-client"], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [], "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [], "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [], @@ -142,12 +140,8 @@ "ZONE_MANAGEMENT_CLUSTER": [] }, "ServerDirectories": { - "ACCESS_CONTROL_CLUSTER": [ - "access-control-server" - ], - "ACCOUNT_LOGIN_CLUSTER": [ - "account-login-server" - ], + "ACCESS_CONTROL_CLUSTER": ["access-control-server"], + "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"], "ACTIONS_CLUSTER": [], "ACTIVATED_CARBON_FILTER_MONITORING_CLUSTER": [ "resource-monitoring-server" @@ -155,26 +149,14 @@ "ADMINISTRATOR_COMMISSIONING_CLUSTER": [ "administrator-commissioning-server" ], - "AIR_QUALITY_CLUSTER": [ - "air-quality-server" - ], + "AIR_QUALITY_CLUSTER": ["air-quality-server"], "ALARM_CLUSTER": [], - "APPLICATION_BASIC_CLUSTER": [ - "application-basic-server" - ], - "APPLICATION_LAUNCHER_CLUSTER": [ - "application-launcher-server" - ], - "AUDIO_OUTPUT_CLUSTER": [ - "audio-output-server" - ], + "APPLICATION_BASIC_CLUSTER": ["application-basic-server"], + "APPLICATION_LAUNCHER_CLUSTER": ["application-launcher-server"], + "AUDIO_OUTPUT_CLUSTER": ["audio-output-server"], "BALLAST_CONFIGURATION_CLUSTER": [], - "BASIC_INFORMATION_CLUSTER": [ - "basic-information" - ], - "BINDING_CLUSTER": [ - "bindings" - ], + "BASIC_INFORMATION_CLUSTER": ["basic-information"], + "BINDING_CLUSTER": ["bindings"], "BOOLEAN_STATE_CLUSTER": [], "BOOLEAN_STATE_CONFIGURATION_CLUSTER": [ "boolean-state-configuration-server" @@ -190,179 +172,79 @@ "CARBON_MONOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "CHANNEL_CLUSTER": [ - "channel-server" - ], - "CHIME_CLUSTER": [ - "chime-server" - ], - "COLOR_CONTROL_CLUSTER": [ - "color-control-server" - ], - "COMMISSIONER_CONTROL_CLUSTER": [ - "commissioner-control-server" - ], + "CHANNEL_CLUSTER": ["channel-server"], + "CHIME_CLUSTER": ["chime-server"], + "COLOR_CONTROL_CLUSTER": ["color-control-server"], + "COMMISSIONER_CONTROL_CLUSTER": ["commissioner-control-server"], "COMMISSIONING_CLUSTER": [], - "CONTENT_LAUNCHER_CLUSTER": [ - "content-launch-server" - ], - "CONTENT_CONTROL_CLUSTER": [ - "content-control-server" - ], - "CONTENT_APP_OBSERVER_CLUSTER": [ - "content-app-observer" - ], - "DESCRIPTOR_CLUSTER": [ - "descriptor" - ], - "DEVICE_ENERGY_MANAGEMENT_CLUSTER": [ - "device-energy-management-server" - ], - "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": [ - "mode-base-server" - ], + "CONTENT_LAUNCHER_CLUSTER": ["content-launch-server"], + "CONTENT_CONTROL_CLUSTER": ["content-control-server"], + "CONTENT_APP_OBSERVER_CLUSTER": ["content-app-observer"], + "DESCRIPTOR_CLUSTER": ["descriptor"], + "DEVICE_ENERGY_MANAGEMENT_CLUSTER": ["device-energy-management-server"], + "DEVICE_ENERGY_MANAGEMENT_MODE_CLUSTER": ["mode-base-server"], "DEVICE_TEMP_CLUSTER": [], - "DIAGNOSTIC_LOGS_CLUSTER": [ - "diagnostic-logs-server" - ], - "DISHWASHER_ALARM_CLUSTER": [ - "dishwasher-alarm-server" - ], - "DISHWASHER_MODE_CLUSTER": [ - "mode-base-server" - ], - "MICROWAVE_OVEN_MODE_CLUSTER": [ - "mode-base-server" - ], - "DOOR_LOCK_CLUSTER": [ - "door-lock-server" - ], - "ECOSYSTEM_INFORMATION_CLUSTER": [ - "ecosystem-information-server" - ], + "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"], + "DISHWASHER_ALARM_CLUSTER": ["dishwasher-alarm-server"], + "DISHWASHER_MODE_CLUSTER": ["mode-base-server"], + "MICROWAVE_OVEN_MODE_CLUSTER": ["mode-base-server"], + "DOOR_LOCK_CLUSTER": ["door-lock-server"], + "ECOSYSTEM_INFORMATION_CLUSTER": ["ecosystem-information-server"], "ELECTRICAL_ENERGY_MEASUREMENT_CLUSTER": [ "electrical-energy-measurement-server" ], "ELECTRICAL_POWER_MEASUREMENT_CLUSTER": [ "electrical-power-measurement-server" ], - "ENERGY_EVSE_CLUSTER": [ - "energy-evse-server" - ], - "ENERGY_EVSE_MODE_CLUSTER": [ - "mode-base-server" - ], + "ENERGY_EVSE_CLUSTER": ["energy-evse-server"], + "ENERGY_EVSE_MODE_CLUSTER": ["mode-base-server"], "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [ "ethernet-network-diagnostics-server" ], - "ENERGY_PREFERENCE_CLUSTER": [ - "energy-preference-server" - ], - "FAN_CONTROL_CLUSTER": [ - "fan-control-server" - ], - "FAULT_INJECTION_CLUSTER": [ - "fault-injection-server" - ], - "FIXED_LABEL_CLUSTER": [ - "fixed-label-server" - ], + "ENERGY_PREFERENCE_CLUSTER": ["energy-preference-server"], + "FAN_CONTROL_CLUSTER": ["fan-control-server"], + "FAULT_INJECTION_CLUSTER": ["fault-injection-server"], + "FIXED_LABEL_CLUSTER": ["fixed-label-server"], "FLOW_MEASUREMENT_CLUSTER": [], "FORMALDEHYDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "GENERAL_COMMISSIONING_CLUSTER": [ - "general-commissioning-server" - ], - "GENERAL_DIAGNOSTICS_CLUSTER": [ - "general-diagnostics-server" - ], - "GROUPS_CLUSTER": [ - "groups-server" - ], - "HEPA_FILTER_MONITORING_CLUSTER": [ - "resource-monitoring-server" - ], - "GROUP_KEY_MANAGEMENT_CLUSTER": [ - "group-key-mgmt-server" - ], - "ICD_MANAGEMENT_CLUSTER": [ - "icd-management-server" - ], - "IDENTIFY_CLUSTER": [ - "identify-server" - ], + "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"], + "GENERAL_DIAGNOSTICS_CLUSTER": ["general-diagnostics-server"], + "GROUPS_CLUSTER": ["groups-server"], + "HEPA_FILTER_MONITORING_CLUSTER": ["resource-monitoring-server"], + "GROUP_KEY_MANAGEMENT_CLUSTER": ["group-key-mgmt-server"], + "ICD_MANAGEMENT_CLUSTER": ["icd-management-server"], + "IDENTIFY_CLUSTER": ["identify-server"], "ILLUMINANCE_MEASUREMENT_CLUSTER": [], - "KEYPAD_INPUT_CLUSTER": [ - "keypad-input-server" - ], - "LAUNDRY_WASHER_MODE_CLUSTER": [ - "mode-base-server" - ], - "LEVEL_CONTROL_CLUSTER": [ - "level-control" - ], + "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"], + "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-base-server"], + "LEVEL_CONTROL_CLUSTER": ["level-control"], "LOCALIZATION_CONFIGURATION_CLUSTER": [ "localization-configuration-server" ], - "LOW_POWER_CLUSTER": [ - "low-power-server" - ], - "MEDIA_INPUT_CLUSTER": [ - "media-input-server" - ], - "MEDIA_PLAYBACK_CLUSTER": [ - "media-playback-server" - ], - "MICROWAVE_OVEN_CONTROL_CLUSTER": [ - "microwave-oven-control-server" - ], - "MESSAGES_CLUSTER": [ - "messages-server" - ], - "MODE_SELECT_CLUSTER": [ - "mode-select-server" - ], - "NETWORK_COMMISSIONING_CLUSTER": [ - "network-commissioning" - ], + "LOW_POWER_CLUSTER": ["low-power-server"], + "MEDIA_INPUT_CLUSTER": ["media-input-server"], + "MEDIA_PLAYBACK_CLUSTER": ["media-playback-server"], + "MICROWAVE_OVEN_CONTROL_CLUSTER": ["microwave-oven-control-server"], + "MESSAGES_CLUSTER": ["messages-server"], + "MODE_SELECT_CLUSTER": ["mode-select-server"], + "NETWORK_COMMISSIONING_CLUSTER": ["network-commissioning"], "NITROGEN_DIOXIDE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "SAMPLE_MEI_CLUSTER": [ - "sample-mei-server" - ], - "OCCUPANCY_SENSING_CLUSTER": [ - "occupancy-sensor-server" - ], - "ON_OFF_CLUSTER": [ - "on-off-server" - ], - "POWER_TOPOLOGY_CLUSTER": [ - "power-topology-server" - ], - "OPERATIONAL_CREDENTIALS_CLUSTER": [ - "operational-credentials-server" - ], - "OPERATIONAL_STATE_CLUSTER": [ - "operational-state-server" - ], - "OPERATIONAL_STATE_OVEN_CLUSTER": [ - "operational-state-server" - ], - "OPERATIONAL_STATE_RVC_CLUSTER": [ - "operational-state-server" - ], + "SAMPLE_MEI_CLUSTER": ["sample-mei-server"], + "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"], + "ON_OFF_CLUSTER": ["on-off-server"], + "POWER_TOPOLOGY_CLUSTER": ["power-topology-server"], + "OPERATIONAL_CREDENTIALS_CLUSTER": ["operational-credentials-server"], + "OPERATIONAL_STATE_CLUSTER": ["operational-state-server"], + "OPERATIONAL_STATE_OVEN_CLUSTER": ["operational-state-server"], + "OPERATIONAL_STATE_RVC_CLUSTER": ["operational-state-server"], "OTA_BOOTLOAD_CLUSTER": [], - "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [ - "ota-provider" - ], - "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [ - "ota-requestor" - ], - "OVEN_MODE_CLUSTER": [ - "mode-base-server" - ], + "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"], + "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"], + "OVEN_MODE_CLUSTER": ["mode-base-server"], "OZONE_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], @@ -378,9 +260,7 @@ "POLL_CONTROL_CLUSTER": [], "POWER_CONFIG_CLUSTER": [], "POWER_PROFILE_CLUSTER": [], - "POWER_SOURCE_CLUSTER": [ - "power-source-server" - ], + "POWER_SOURCE_CLUSTER": ["power-source-server"], "POWER_SOURCE_CONFIGURATION_CLUSTER": [ "power-source-configuration-server" ], @@ -395,44 +275,22 @@ "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], - "REFRIGERATOR_ALARM_CLUSTER": [ - "refrigerator-alarm-server" - ], + "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"], "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [ "mode-base-server" ], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_MODE_CLUSTER": [ - "mode-base-server" - ], - "RVC_RUN_MODE_CLUSTER": [ - "mode-base-server" - ], - "SCENES_CLUSTER": [ - "scenes-server" - ], - "SERVICE_AREA_CLUSTER": [ - "service-area-server" - ], - "SMOKE_CO_ALARM_CLUSTER": [ - "smoke-co-alarm-server" - ], - "SOFTWARE_DIAGNOSTICS_CLUSTER": [ - "software-diagnostics-server" - ], - "SWITCH_CLUSTER": [ - "switch-server" - ], - "TARGET_NAVIGATOR_CLUSTER": [ - "target-navigator-server" - ], - "TEMPERATURE_CONTROL_CLUSTER": [ - "temperature-control-server" - ], + "RVC_CLEAN_MODE_CLUSTER": ["mode-base-server"], + "RVC_RUN_MODE_CLUSTER": ["mode-base-server"], + "SCENES_CLUSTER": ["scenes-server"], + "SERVICE_AREA_CLUSTER": ["service-area-server"], + "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"], + "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"], + "SWITCH_CLUSTER": ["switch-server"], + "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"], + "TEMPERATURE_CONTROL_CLUSTER": ["temperature-control-server"], "TEMPERATURE_MEASUREMENT_CLUSTER": [], - "THERMOSTAT_CLUSTER": [ - "thermostat-server" - ], + "THERMOSTAT_CLUSTER": ["thermostat-server"], "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [ "thermostat-user-interface-configuration-server" ], @@ -442,58 +300,30 @@ "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [ "thread-network-diagnostics-server" ], - "THREAD_NETWORK_DIRECTORY_CLUSTER": [ - "thread-network-directory-server" - ], + "THREAD_NETWORK_DIRECTORY_CLUSTER": ["thread-network-directory-server"], "TIME_CLUSTER": [], - "TIME_FORMAT_LOCALIZATION_CLUSTER": [ - "time-format-localization-server" - ], - "TIME_SYNCHRONIZATION_CLUSTER": [ - "time-synchronization-server" - ], - "TIMER_CLUSTER": [ - "timer-server" - ], + "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"], + "TIME_SYNCHRONIZATION_CLUSTER": ["time-synchronization-server"], + "TIMER_CLUSTER": ["timer-server"], "TVOC_CONCENTRATION_MEASUREMENT_CLUSTER": [ "concentration-measurement-server" ], "UNIT_LOCALIZATION_CLUSTER": [], - "UNIT_TESTING_CLUSTER": [ - "test-cluster-server" - ], - "USER_LABEL_CLUSTER": [ - "user-label-server" - ], + "UNIT_TESTING_CLUSTER": ["test-cluster-server"], + "USER_LABEL_CLUSTER": ["user-label-server"], "VALVE_CONFIGURATION_AND_CONTROL_CLUSTER": [ "valve-configuration-and-control-server" ], - "WAKE_ON_LAN_CLUSTER": [ - "wake-on-lan-server" - ], - "LAUNDRY_WASHER_CONTROLS_CLUSTER": [ - "laundry-washer-controls-server" - ], - "LAUNDRY_DRYER_CONTROLS_CLUSTER": [ - "laundry-dryer-controls-server" - ], + "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"], + "LAUNDRY_WASHER_CONTROLS_CLUSTER": ["laundry-washer-controls-server"], + "LAUNDRY_DRYER_CONTROLS_CLUSTER": ["laundry-dryer-controls-server"], "WEB_RTC_PROVIDER_CLUSTER": [], "WEBRTC_REQUESTOR_CLUSTER": [], - "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [ - "wifi-network-diagnostics-server" - ], - "WIFI_NETWORK_MANAGEMENT_CLUSTER": [ - "wifi-network-management-server" - ], - "WINDOW_COVERING_CLUSTER": [ - "window-covering-server" - ], - "WATER_HEATER_MANAGEMENT_CLUSTER": [ - "water-heater-management-server" - ], - "WATER_HEATER_MODE_CLUSTER": [ - "mode-base-server" - ], + "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"], + "WIFI_NETWORK_MANAGEMENT_CLUSTER": ["wifi-network-management-server"], + "WINDOW_COVERING_CLUSTER": ["window-covering-server"], + "WATER_HEATER_MANAGEMENT_CLUSTER": ["water-heater-management-server"], + "WATER_HEATER_MODE_CLUSTER": ["mode-base-server"], "ZONE_MANAGEMENT_CLUSTER": [] } }