From 155039220a5f44d7701a9a260ff8059148843d59 Mon Sep 17 00:00:00 2001 From: William Hicklin Date: Mon, 22 May 2023 14:08:14 +0100 Subject: [PATCH] Renamed the mode select alias clusters to match the latest spec changes. Fixes issue #26551. --- .github/workflows/tests.yaml | 6 +- .../all-clusters-app.matter | 2 + .../all-clusters-minimal-app.matter | 2 + .../placeholder/linux/apps/app1/config.matter | 3 + .../placeholder/linux/apps/app2/config.matter | 3 + scripts/rules.matterlint | 6 +- .../app-templates/endpoint_config.h | 83 +- src/app/zap-templates/zcl/data-model/all.xml | 6 +- ...ontrolled-cabinet-mode-select-cluster.xml} | 4 +- ....xml => rvc-clean-mode-select-cluster.xml} | 4 +- ...er.xml => rvc-run-mode-select-cluster.xml} | 4 +- .../zcl/zcl-with-test-extensions.json | 6 +- src/app/zap-templates/zcl/zcl.json | 6 +- src/app/zap_cluster_list.json | 12 +- .../data_model/controller-clusters.matter | 7 +- .../data_model/controller-clusters.zap | 12 +- .../devicecontroller/ClusterReadMapping.java | 855 +++++++++- .../devicecontroller/ClusterWriteMapping.java | 188 +++ .../CHIPAttributeTLVValueDecoder.cpp | 90 +- .../zap-generated/CHIPClustersWrite-JNI.cpp | 48 +- .../CHIPEventTLVValueDecoder.cpp | 12 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 63 +- .../java/zap-generated/CHIPInvokeCallbacks.h | 35 +- .../java/zap-generated/CHIPReadCallbacks.cpp | 481 +++--- .../chip/devicecontroller/ChipClusters.java | 48 +- .../chip/devicecontroller/ChipIdLookup.java | 9 +- .../chip/devicecontroller/ChipStructs.java | 54 +- .../devicecontroller/ClusterInfoMapping.java | 321 ++-- .../python/chip/clusters/CHIPClusters.py | 30 +- .../python/chip/clusters/Objects.py | 60 +- .../MTRAttributeTLVValueDecoder.mm | 66 +- .../CHIP/zap-generated/MTRBaseClusters.h | 123 +- .../CHIP/zap-generated/MTRBaseClusters.mm | 565 ++++--- .../zap-generated/MTRBaseClusters_Internal.h | 6 +- .../CHIP/zap-generated/MTRCallbackBridge.h | 946 ++++++------ .../CHIP/zap-generated/MTRCallbackBridge.mm | 176 ++- .../CHIP/zap-generated/MTRClusterConstants.h | 120 +- .../CHIP/zap-generated/MTRClusters.h | 34 +- .../CHIP/zap-generated/MTRClusters.mm | 264 ++-- .../CHIP/zap-generated/MTRClusters_Internal.h | 6 +- .../zap-generated/MTRCommandPayloadsObjc.h | 26 +- .../zap-generated/MTRCommandPayloadsObjc.mm | 57 +- .../MTRCommandPayloads_Internal.h | 15 +- .../zap-generated/MTREventTLVValueDecoder.mm | 24 +- .../CHIP/zap-generated/MTRStructsObjc.h | 12 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 24 +- .../zap-generated/attributes/Accessors.cpp | 171 +- .../zap-generated/attributes/Accessors.h | 19 +- .../app-common/zap-generated/callback.h | 165 +- .../zap-generated/cluster-enums-check.h | 20 +- .../app-common/zap-generated/cluster-enums.h | 12 +- .../zap-generated/cluster-objects.cpp | 21 +- .../zap-generated/cluster-objects.h | 162 +- .../app-common/zap-generated/ids/Attributes.h | 16 +- .../app-common/zap-generated/ids/Clusters.h | 12 +- .../app-common/zap-generated/ids/Commands.h | 12 +- .../app-common/zap-generated/print-cluster.h | 31 +- .../zap-generated/cluster/Commands.h | 104 +- .../cluster/ComplexArgumentParser.cpp | 27 +- .../cluster/ComplexArgumentParser.h | 31 +- .../cluster/logging/DataModelLogger.cpp | 135 +- .../cluster/logging/DataModelLogger.h | 32 +- .../zap-generated/cluster/Commands.h | 1373 ++++++++++------- .../zap-generated/CHIPClientCallbacks.h | 53 +- .../zap-generated/CHIPClusters.h | 20 +- .../zap-generated/endpoint_config.h | 6 +- .../zap-generated/gen_config.h | 24 +- 67 files changed, 4614 insertions(+), 2756 deletions(-) rename src/app/zap-templates/zcl/data-model/chip/{refrigerator-and-temperature-controlled-cabinet-cluster.xml => refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml} (96%) rename src/app/zap-templates/zcl/data-model/chip/{rvc-clean-cluster.xml => rvc-clean-mode-select-cluster.xml} (97%) rename src/app/zap-templates/zcl/data-model/chip/{rvc-run-cluster.xml => rvc-run-mode-select-cluster.xml} (98%) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a4804acffc6697..a60b9374ef0653 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -173,10 +173,10 @@ jobs: src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml \ - src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml \ - src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml \ - src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/scene.xml \ src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml \ diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index fa949735023bca..aaa89e392bba88 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -2334,6 +2334,7 @@ server cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute nullable int8u startUpMode = 4; @@ -5155,6 +5156,7 @@ endpoint 1 { server cluster ModeSelect { ram attribute description default = "Coffee"; + ram attribute standardNamespace default = 0; callback attribute supportedModes default = 0; persist attribute currentMode default = 0; persist attribute startUpMode default = 0; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index 04955b2eb0d358..718b0982375306 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -2067,6 +2067,7 @@ server cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; readonly attribute command_id generatedCommandList[] = 65528; @@ -4269,6 +4270,7 @@ endpoint 1 { server cluster ModeSelect { ram attribute description default = "Coffee"; + ram attribute standardNamespace default = 0; callback attribute supportedModes default = 0; persist attribute currentMode default = 0; callback attribute generatedCommandList; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 96a6339508453d..2c3f1526727683 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -2136,6 +2136,7 @@ client cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute optional nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute optional nullable int8u startUpMode = 4; @@ -2207,6 +2208,7 @@ server cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute nullable int8u startUpMode = 4; @@ -3708,6 +3710,7 @@ endpoint 0 { server cluster ModeSelect { ram attribute description; + callback attribute standardNamespace; callback attribute supportedModes default = 255; ram attribute currentMode; ram attribute startUpMode; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 29d62354fbcd5f..2148032ab84806 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -2097,6 +2097,7 @@ client cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute optional nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute optional nullable int8u startUpMode = 4; @@ -2168,6 +2169,7 @@ server cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute nullable int8u startUpMode = 4; @@ -3688,6 +3690,7 @@ endpoint 0 { server cluster ModeSelect { ram attribute description; + callback attribute standardNamespace; callback attribute supportedModes default = 255; ram attribute currentMode; ram attribute startUpMode; diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint index c93e1097fe77a1..c741dbd78a35e8 100644 --- a/scripts/rules.matterlint +++ b/scripts/rules.matterlint @@ -56,10 +56,10 @@ load "../src/app/zap-templates/zcl/data-model/chip/proxy-discovery-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/proxy-valid-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/pump-configuration-and-control-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/pwm-cluster.xml"; -load "../src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-cluster.xml"; -load "../src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml"; -load "../src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/scene.xml"; load "../src/app/zap-templates/zcl/data-model/chip/software-diagnostics-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/switch-cluster.xml"; diff --git a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h index 9e9470a47942f1..6595f8fcf07061 100644 --- a/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h +++ b/scripts/tools/zap/tests/outputs/all-clusters-app/app-templates/endpoint_config.h @@ -354,7 +354,7 @@ } // This is an array of EmberAfAttributeMetadata structures. -#define GENERATED_ATTRIBUTE_COUNT 717 +#define GENERATED_ATTRIBUTE_COUNT 718 #define GENERATED_ATTRIBUTES \ { \ \ @@ -875,8 +875,9 @@ { ZAP_SIMPLE_DEFAULT(1), 0x0000FFFD, 2, ZAP_TYPE(INT16U), 0 }, /* ClusterRevision */ \ \ /* Endpoint: 1, Cluster: Mode Select (server) */ \ - { ZAP_LONG_DEFAULTS_INDEX(20), 0x00000000, 65, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ - { ZAP_SIMPLE_DEFAULT(255), 0xFFF10001, 1, ZAP_TYPE(INT8U), 0 }, /* ManufacturerExtension */ \ + { ZAP_LONG_DEFAULTS_INDEX(20), 0x00000000, 65, ZAP_TYPE(CHAR_STRING), 0 }, /* Description */ \ + { ZAP_SIMPLE_DEFAULT(0), 0x00000001, 2, ZAP_TYPE(ENUM16), ZAP_ATTRIBUTE_MASK(NULLABLE) }, /* StandardNamespace */ \ + { ZAP_SIMPLE_DEFAULT(255), 0xFFF10001, 1, ZAP_TYPE(INT8U), 0 }, /* ManufacturerExtension */ \ { ZAP_EMPTY_DEFAULT(), 0x00000002, 0, ZAP_TYPE(ARRAY), ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE) }, /* SupportedModes */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000003, 1, ZAP_TYPE(INT8U), ZAP_ATTRIBUTE_MASK(TOKENIZE) }, /* CurrentMode */ \ { ZAP_SIMPLE_DEFAULT(0), 0x00000004, 1, ZAP_TYPE(INT8U), \ @@ -2489,8 +2490,8 @@ /* Endpoint: 1, Cluster: Mode Select (server) */ \ .clusterId = 0x00000050, \ .attributes = ZAP_ATTRIBUTE_INDEX(315), \ - .attributeCount = 8, \ - .clusterSize = 75, \ + .attributeCount = 9, \ + .clusterSize = 77, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ .functions = chipFuncArrayModeSelectServer, \ .acceptedCommandList = ZAP_GENERATED_COMMANDS_INDEX( 125 ), \ @@ -2501,7 +2502,7 @@ { \ /* Endpoint: 1, Cluster: Door Lock (server) */ \ .clusterId = 0x00000101, \ - .attributes = ZAP_ATTRIBUTE_INDEX(323), \ + .attributes = ZAP_ATTRIBUTE_INDEX(324), \ .attributeCount = 33, \ .clusterSize = 55, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ @@ -2514,7 +2515,7 @@ { \ /* Endpoint: 1, Cluster: Window Covering (server) */ \ .clusterId = 0x00000102, \ - .attributes = ZAP_ATTRIBUTE_INDEX(356), \ + .attributes = ZAP_ATTRIBUTE_INDEX(357), \ .attributeCount = 24, \ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION), \ @@ -2527,7 +2528,7 @@ { \ /* Endpoint: 1, Cluster: Barrier Control (server) */ \ .clusterId = 0x00000103, \ - .attributes = ZAP_ATTRIBUTE_INDEX(380), \ + .attributes = ZAP_ATTRIBUTE_INDEX(381), \ .attributeCount = 6, \ .clusterSize = 11, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ @@ -2540,7 +2541,7 @@ { \ /* Endpoint: 1, Cluster: Pump Configuration and Control (server) */ \ .clusterId = 0x00000200, \ - .attributes = ZAP_ATTRIBUTE_INDEX(386), \ + .attributes = ZAP_ATTRIBUTE_INDEX(387), \ .attributeCount = 25, \ .clusterSize = 52, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ @@ -2553,7 +2554,7 @@ { \ /* Endpoint: 1, Cluster: Thermostat (server) */ \ .clusterId = 0x00000201, \ - .attributes = ZAP_ATTRIBUTE_INDEX(411), \ + .attributes = ZAP_ATTRIBUTE_INDEX(412), \ .attributeCount = 16, \ .clusterSize = 31, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ @@ -2566,7 +2567,7 @@ { \ /* Endpoint: 1, Cluster: Fan Control (server) */ \ .clusterId = 0x00000202, \ - .attributes = ZAP_ATTRIBUTE_INDEX(427), \ + .attributes = ZAP_ATTRIBUTE_INDEX(428), \ .attributeCount = 13, \ .clusterSize = 17, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(ATTRIBUTE_CHANGED_FUNCTION) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ @@ -2579,7 +2580,7 @@ { \ /* Endpoint: 1, Cluster: Thermostat User Interface Configuration (server) */ \ .clusterId = 0x00000204, \ - .attributes = ZAP_ATTRIBUTE_INDEX(440), \ + .attributes = ZAP_ATTRIBUTE_INDEX(441), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(PRE_ATTRIBUTE_CHANGED_FUNCTION), \ @@ -2592,7 +2593,7 @@ { \ /* Endpoint: 1, Cluster: Color Control (server) */ \ .clusterId = 0x00000300, \ - .attributes = ZAP_ATTRIBUTE_INDEX(445), \ + .attributes = ZAP_ATTRIBUTE_INDEX(446), \ .attributeCount = 54, \ .clusterSize = 345, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ @@ -2605,7 +2606,7 @@ { \ /* Endpoint: 1, Cluster: Illuminance Measurement (server) */ \ .clusterId = 0x00000400, \ - .attributes = ZAP_ATTRIBUTE_INDEX(499), \ + .attributes = ZAP_ATTRIBUTE_INDEX(500), \ .attributeCount = 7, \ .clusterSize = 15, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2618,7 +2619,7 @@ { \ /* Endpoint: 1, Cluster: Temperature Measurement (server) */ \ .clusterId = 0x00000402, \ - .attributes = ZAP_ATTRIBUTE_INDEX(506), \ + .attributes = ZAP_ATTRIBUTE_INDEX(507), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2631,7 +2632,7 @@ { \ /* Endpoint: 1, Cluster: Pressure Measurement (server) */ \ .clusterId = 0x00000403, \ - .attributes = ZAP_ATTRIBUTE_INDEX(512), \ + .attributes = ZAP_ATTRIBUTE_INDEX(513), \ .attributeCount = 5, \ .clusterSize = 12, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2644,7 +2645,7 @@ { \ /* Endpoint: 1, Cluster: Flow Measurement (server) */ \ .clusterId = 0x00000404, \ - .attributes = ZAP_ATTRIBUTE_INDEX(517), \ + .attributes = ZAP_ATTRIBUTE_INDEX(518), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2657,7 +2658,7 @@ { \ /* Endpoint: 1, Cluster: Relative Humidity Measurement (server) */ \ .clusterId = 0x00000405, \ - .attributes = ZAP_ATTRIBUTE_INDEX(523), \ + .attributes = ZAP_ATTRIBUTE_INDEX(524), \ .attributeCount = 6, \ .clusterSize = 14, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2670,7 +2671,7 @@ { \ /* Endpoint: 1, Cluster: Occupancy Sensing (server) */ \ .clusterId = 0x00000406, \ - .attributes = ZAP_ATTRIBUTE_INDEX(529), \ + .attributes = ZAP_ATTRIBUTE_INDEX(530), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -2683,7 +2684,7 @@ { \ /* Endpoint: 1, Cluster: Wake on LAN (server) */ \ .clusterId = 0x00000503, \ - .attributes = ZAP_ATTRIBUTE_INDEX(534), \ + .attributes = ZAP_ATTRIBUTE_INDEX(535), \ .attributeCount = 3, \ .clusterSize = 39, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2696,7 +2697,7 @@ { \ /* Endpoint: 1, Cluster: Channel (server) */ \ .clusterId = 0x00000504, \ - .attributes = ZAP_ATTRIBUTE_INDEX(537), \ + .attributes = ZAP_ATTRIBUTE_INDEX(538), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2709,7 +2710,7 @@ { \ /* Endpoint: 1, Cluster: Target Navigator (server) */ \ .clusterId = 0x00000505, \ - .attributes = ZAP_ATTRIBUTE_INDEX(540), \ + .attributes = ZAP_ATTRIBUTE_INDEX(541), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2722,7 +2723,7 @@ { \ /* Endpoint: 1, Cluster: Media Playback (server) */ \ .clusterId = 0x00000506, \ - .attributes = ZAP_ATTRIBUTE_INDEX(544), \ + .attributes = ZAP_ATTRIBUTE_INDEX(545), \ .attributeCount = 8, \ .clusterSize = 43, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2735,7 +2736,7 @@ { \ /* Endpoint: 1, Cluster: Media Input (server) */ \ .clusterId = 0x00000507, \ - .attributes = ZAP_ATTRIBUTE_INDEX(552), \ + .attributes = ZAP_ATTRIBUTE_INDEX(553), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2748,7 +2749,7 @@ { \ /* Endpoint: 1, Cluster: Low Power (server) */ \ .clusterId = 0x00000508, \ - .attributes = ZAP_ATTRIBUTE_INDEX(556), \ + .attributes = ZAP_ATTRIBUTE_INDEX(557), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2761,7 +2762,7 @@ { \ /* Endpoint: 1, Cluster: Keypad Input (server) */ \ .clusterId = 0x00000509, \ - .attributes = ZAP_ATTRIBUTE_INDEX(558), \ + .attributes = ZAP_ATTRIBUTE_INDEX(559), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2774,7 +2775,7 @@ { \ /* Endpoint: 1, Cluster: Content Launcher (server) */ \ .clusterId = 0x0000050A, \ - .attributes = ZAP_ATTRIBUTE_INDEX(560), \ + .attributes = ZAP_ATTRIBUTE_INDEX(561), \ .attributeCount = 4, \ .clusterSize = 10, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2787,7 +2788,7 @@ { \ /* Endpoint: 1, Cluster: Audio Output (server) */ \ .clusterId = 0x0000050B, \ - .attributes = ZAP_ATTRIBUTE_INDEX(564), \ + .attributes = ZAP_ATTRIBUTE_INDEX(565), \ .attributeCount = 4, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2800,7 +2801,7 @@ { \ /* Endpoint: 1, Cluster: Application Launcher (server) */ \ .clusterId = 0x0000050C, \ - .attributes = ZAP_ATTRIBUTE_INDEX(568), \ + .attributes = ZAP_ATTRIBUTE_INDEX(569), \ .attributeCount = 3, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2813,7 +2814,7 @@ { \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ .clusterId = 0x0000050D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(571), \ + .attributes = ZAP_ATTRIBUTE_INDEX(572), \ .attributeCount = 9, \ .clusterSize = 110, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2826,7 +2827,7 @@ { \ /* Endpoint: 1, Cluster: Account Login (server) */ \ .clusterId = 0x0000050E, \ - .attributes = ZAP_ATTRIBUTE_INDEX(580), \ + .attributes = ZAP_ATTRIBUTE_INDEX(581), \ .attributeCount = 2, \ .clusterSize = 6, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2839,7 +2840,7 @@ { \ /* Endpoint: 1, Cluster: Electrical Measurement (server) */ \ .clusterId = 0x00000B04, \ - .attributes = ZAP_ATTRIBUTE_INDEX(582), \ + .attributes = ZAP_ATTRIBUTE_INDEX(583), \ .attributeCount = 13, \ .clusterSize = 32, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2852,7 +2853,7 @@ { \ /* Endpoint: 1, Cluster: Unit Testing (server) */ \ .clusterId = 0xFFF1FC05, \ - .attributes = ZAP_ATTRIBUTE_INDEX(595), \ + .attributes = ZAP_ATTRIBUTE_INDEX(596), \ .attributeCount = 83, \ .clusterSize = 2289, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2865,7 +2866,7 @@ { \ /* Endpoint: 2, Cluster: Groups (server) */ \ .clusterId = 0x00000004, \ - .attributes = ZAP_ATTRIBUTE_INDEX(678), \ + .attributes = ZAP_ATTRIBUTE_INDEX(679), \ .attributeCount = 3, \ .clusterSize = 7, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -2878,7 +2879,7 @@ { \ /* Endpoint: 2, Cluster: On/Off (server) */ \ .clusterId = 0x00000006, \ - .attributes = ZAP_ATTRIBUTE_INDEX(681), \ + .attributes = ZAP_ATTRIBUTE_INDEX(682), \ .attributeCount = 7, \ .clusterSize = 13, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION) | ZAP_CLUSTER_MASK(SHUTDOWN_FUNCTION), \ @@ -2891,7 +2892,7 @@ { \ /* Endpoint: 2, Cluster: Descriptor (server) */ \ .clusterId = 0x0000001D, \ - .attributes = ZAP_ATTRIBUTE_INDEX(688), \ + .attributes = ZAP_ATTRIBUTE_INDEX(689), \ .attributeCount = 6, \ .clusterSize = 4, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2904,7 +2905,7 @@ { \ /* Endpoint: 2, Cluster: Power Source (server) */ \ .clusterId = 0x0000002F, \ - .attributes = ZAP_ATTRIBUTE_INDEX(694), \ + .attributes = ZAP_ATTRIBUTE_INDEX(695), \ .attributeCount = 8, \ .clusterSize = 72, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2917,7 +2918,7 @@ { \ /* Endpoint: 2, Cluster: Occupancy Sensing (server) */ \ .clusterId = 0x00000406, \ - .attributes = ZAP_ATTRIBUTE_INDEX(702), \ + .attributes = ZAP_ATTRIBUTE_INDEX(703), \ .attributeCount = 5, \ .clusterSize = 9, \ .mask = ZAP_CLUSTER_MASK(SERVER) | ZAP_CLUSTER_MASK(INIT_FUNCTION), \ @@ -2930,7 +2931,7 @@ { \ /* Endpoint: 65534, Cluster: Network Commissioning (server) */ \ .clusterId = 0x00000031, \ - .attributes = ZAP_ATTRIBUTE_INDEX(707), \ + .attributes = ZAP_ATTRIBUTE_INDEX(708), \ .attributeCount = 10, \ .clusterSize = 0, \ .mask = ZAP_CLUSTER_MASK(SERVER), \ @@ -2949,7 +2950,7 @@ // This is an array of EmberAfEndpointType structures. #define GENERATED_ENDPOINT_TYPES \ { \ - { ZAP_CLUSTER_INDEX(0), 28, 361 }, { ZAP_CLUSTER_INDEX(28), 44, 3489 }, { ZAP_CLUSTER_INDEX(72), 5, 105 }, \ + { ZAP_CLUSTER_INDEX(0), 28, 361 }, { ZAP_CLUSTER_INDEX(28), 44, 3491 }, { ZAP_CLUSTER_INDEX(72), 5, 105 }, \ { ZAP_CLUSTER_INDEX(77), 1, 0 }, \ } @@ -2962,7 +2963,7 @@ static_assert(ATTRIBUTE_LARGEST <= CHIP_CONFIG_MAX_ATTRIBUTE_STORE_ELEMENT_SIZE, #define ATTRIBUTE_SINGLETONS_SIZE (37) // Total size of attribute storage -#define ATTRIBUTE_MAX_SIZE (3955) +#define ATTRIBUTE_MAX_SIZE (3957) // Number of fixed endpoints #define FIXED_ENDPOINT_COUNT (4) diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index 3bb674ccb5be57..50fa7308bea68c 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -55,10 +55,10 @@ - + - - + + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml similarity index 96% rename from src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml rename to src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml index 45b77d3b5c1fbf..a49b1d8c25c01a 100644 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml @@ -25,9 +25,9 @@ limitations under the License. General - Refrigerator And Temperature Controlled Cabinet + Refrigerator And Temperature Controlled Cabinet Mode Select 0x0052 - REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER + REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER true true This cluster is an alias of the Mode Select cluster, defining additional semantics and diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml similarity index 97% rename from src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml rename to src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml index aa4a4d0d1ae323..22a692c6f13524 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml @@ -31,9 +31,9 @@ limitations under the License. General - RVC Clean + RVC Clean Mode Select 0x0055 - RVC_CLEAN_CLUSTER + RVC_CLEAN_MODE_SELECT_CLUSTER true true This cluster is an alias of the Mode Select cluster which also defines a namespace for the diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml similarity index 98% rename from src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml rename to src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml index 2e9d843254751a..88a1500b9ceae2 100644 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml @@ -36,9 +36,9 @@ limitations under the License. General - RVC Run + RVC Run Mode Select 0x0054 - RVC_RUN_CLUSTER + RVC_RUN_MODE_SELECT_CLUSTER true true This cluster is an alias of the Mode Select cluster which also defines a namespace for the running modes of the Robotic Vacuum Cleaner devices. 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 97d0b12a213b18..8bdd2442737922 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -73,11 +73,11 @@ "proxy-valid-cluster.xml", "pump-configuration-and-control-cluster.xml", "pwm-cluster.xml", - "refrigerator-and-temperature-controlled-cabinet-cluster.xml", + "refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml", "relative-humidity-measurement-cluster.xml", "replacable-monitoring-cluster.xml", - "rvc-clean-cluster.xml ", - "rvc-run-cluster.xml", + "rvc-clean-mode-select-cluster.xml ", + "rvc-run-mode-select-cluster.xml", "scene.xml", "smoke-co-alarm-cluster.xml", "software-diagnostics-cluster.xml", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index 89586150d93841..9087de18dc28e3 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -71,10 +71,10 @@ "proxy-valid-cluster.xml", "pump-configuration-and-control-cluster.xml", "pwm-cluster.xml", - "refrigerator-and-temperature-controlled-cabinet-cluster.xml", + "refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml", "relative-humidity-measurement-cluster.xml", - "rvc-clean-cluster.xml ", - "rvc-run-cluster.xml", + "rvc-clean-mode-select-cluster.xml ", + "rvc-run-mode-select-cluster.xml", "replacable-monitoring-cluster.xml", "scene.xml", "smoke-co-alarm-cluster.xml", diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index f6a057eb90e00d..837c52d99511aa 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -76,10 +76,10 @@ "pump-configuration-and-control-client" ], "PWM_CLUSTER": [], - "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER": [], + "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER": [], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_CLUSTER": [], - "RVC_RUN_CLUSTER": [], + "RVC_CLEAN_MODE_SELECT_CLUSTER": [], + "RVC_RUN_MODE_SELECT_CLUSTER": [], "SCENES_CLUSTER": [], "SMOKE_CO_ALARM_CLUSTER": [], "SOFTWARE_DIAGNOSTICS_CLUSTER": [], @@ -184,12 +184,12 @@ "pump-configuration-and-control-server" ], "PWM_CLUSTER": [], - "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER": [ + "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER": [ "mode-select-server" ], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_CLUSTER": ["mode-select-server"], - "RVC_RUN_CLUSTER": ["mode-select-server"], + "RVC_CLEAN_MODE_SELECT_CLUSTER": ["mode-select-server"], + "RVC_RUN_MODE_SELECT_CLUSTER": ["mode-select-server"], "SCENES_CLUSTER": ["scenes"], "SMOKE_CO_ALARM_CLUSTER": [], "SOFTWARE_DIAGNOSTICS_CLUSTER": ["software-diagnostics-server"], diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 2b7822b50aa97c..567dc31566d42c 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -2783,6 +2783,7 @@ client cluster ModeSelect = 80 { } readonly attribute char_string<64> description = 0; + readonly attribute optional nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute optional nullable int8u startUpMode = 4; @@ -2878,7 +2879,7 @@ client cluster LaundryWasherModeSelect = 81 { /** This cluster is an alias of the Mode Select cluster, defining additional semantics and namespaced enumerated values for refrigerator and temperature controlled cabinet devices. */ -client cluster RefrigeratorAndTemperatureControlledCabinet = 82 { +client cluster RefrigeratorAndTemperatureControlledCabinetModeSelect = 82 { enum SemanticTags : ENUM16 { kRapidCool = 16384; kRapidFreeze = 16385; @@ -2935,7 +2936,7 @@ client cluster RefrigeratorAndTemperatureControlledCabinet = 82 { } /** This cluster is an alias of the Mode Select cluster which also defines a namespace for the running modes of the Robotic Vacuum Cleaner devices. */ -client cluster RvcRun = 84 { +client cluster RvcRunModeSelect = 84 { enum ChangeToModeResponseStatus : ENUM8 { kBatteryLow = 64; kRobotStuck = 65; @@ -3003,7 +3004,7 @@ client cluster RvcRun = 84 { /** This cluster is an alias of the Mode Select cluster which also defines a namespace for the cleaning type of the Robotic Vacuum Cleaner devices. */ -client cluster RvcClean = 85 { +client cluster RvcCleanModeSelect = 85 { enum ChangeToModeResponseStatus : ENUM8 { kCleaningInProgress = 64; } diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 6309c6371fd574..36b04438f1e5bd 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -13628,7 +13628,7 @@ "name": "Refrigerator And Temperature Controlled Cabinet", "code": 82, "mfgCode": null, - "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER", + "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -13688,7 +13688,7 @@ "name": "Refrigerator And Temperature Controlled Cabinet", "code": 82, "mfgCode": null, - "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER", + "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -13900,7 +13900,7 @@ "name": "RVC Run", "code": 84, "mfgCode": null, - "define": "RVC_RUN_CLUSTER", + "define": "RVC_RUN_MODE_SELECT_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -13960,7 +13960,7 @@ "name": "RVC Run", "code": 84, "mfgCode": null, - "define": "RVC_RUN_CLUSTER", + "define": "RVC_RUN_MODE_SELECT_CLUSTER", "side": "server", "enabled": 0, "commands": [ @@ -14172,7 +14172,7 @@ "name": "RVC Clean", "code": 85, "mfgCode": null, - "define": "RVC_CLEAN_CLUSTER", + "define": "RVC_CLEAN_MODE_SELECT_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -14232,7 +14232,7 @@ "name": "RVC Clean", "code": 85, "mfgCode": null, - "define": "RVC_CLEAN_CLUSTER", + "define": "RVC_CLEAN_MODE_SELECT_CLUSTER", "side": "server", "enabled": 0, "commands": [ diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index 306e57c0abbcdf..6632841ba87d46 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -7631,21 +7631,6 @@ private static Map readModeSelectInteractionInfo() { () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), readModeSelectDescriptionCommandParams); result.put("readDescriptionAttribute", readModeSelectDescriptionAttributeInteractionInfo); - Map readModeSelectStandardNamespaceCommandParams = - new LinkedHashMap(); - InteractionInfo readModeSelectStandardNamespaceAttributeInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.ModeSelectCluster) cluster) - .readStandardNamespaceAttribute( - (ChipClusters.ModeSelectCluster.StandardNamespaceAttributeCallback) callback); - }, - () -> - new ClusterInfoMapping - .DelegatedModeSelectClusterStandardNamespaceAttributeCallback(), - readModeSelectStandardNamespaceCommandParams); - result.put( - "readStandardNamespaceAttribute", readModeSelectStandardNamespaceAttributeInteractionInfo); Map readModeSelectSupportedModesCommandParams = new LinkedHashMap(); InteractionInfo readModeSelectSupportedModesAttributeInteractionInfo = @@ -7779,6 +7764,669 @@ private static Map readModeSelectInteractionInfo() { return result; } + private static Map readLaundryWasherModeSelectInteractionInfo() { + Map result = new LinkedHashMap<>(); + Map readLaundryWasherModeSelectDescriptionCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectDescriptionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readDescriptionAttribute((ChipClusters.CharStringAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), + readLaundryWasherModeSelectDescriptionCommandParams); + result.put( + "readDescriptionAttribute", readLaundryWasherModeSelectDescriptionAttributeInteractionInfo); + Map readLaundryWasherModeSelectSupportedModesCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectSupportedModesAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readSupportedModesAttribute( + (ChipClusters.LaundryWasherModeSelectCluster.SupportedModesAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterSupportedModesAttributeCallback(), + readLaundryWasherModeSelectSupportedModesCommandParams); + result.put( + "readSupportedModesAttribute", + readLaundryWasherModeSelectSupportedModesAttributeInteractionInfo); + Map readLaundryWasherModeSelectCurrentModeCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectCurrentModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readCurrentModeAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readLaundryWasherModeSelectCurrentModeCommandParams); + result.put( + "readCurrentModeAttribute", readLaundryWasherModeSelectCurrentModeAttributeInteractionInfo); + Map readLaundryWasherModeSelectStartUpModeCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readStartUpModeAttribute( + (ChipClusters.LaundryWasherModeSelectCluster.StartUpModeAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterStartUpModeAttributeCallback(), + readLaundryWasherModeSelectStartUpModeCommandParams); + result.put( + "readStartUpModeAttribute", readLaundryWasherModeSelectStartUpModeAttributeInteractionInfo); + Map readLaundryWasherModeSelectOnModeCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readOnModeAttribute( + (ChipClusters.LaundryWasherModeSelectCluster.OnModeAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterOnModeAttributeCallback(), + readLaundryWasherModeSelectOnModeCommandParams); + result.put("readOnModeAttribute", readLaundryWasherModeSelectOnModeAttributeInteractionInfo); + Map readLaundryWasherModeSelectGeneratedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectGeneratedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readGeneratedCommandListAttribute( + (ChipClusters.LaundryWasherModeSelectCluster + .GeneratedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterGeneratedCommandListAttributeCallback(), + readLaundryWasherModeSelectGeneratedCommandListCommandParams); + result.put( + "readGeneratedCommandListAttribute", + readLaundryWasherModeSelectGeneratedCommandListAttributeInteractionInfo); + Map readLaundryWasherModeSelectAcceptedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectAcceptedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readAcceptedCommandListAttribute( + (ChipClusters.LaundryWasherModeSelectCluster + .AcceptedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterAcceptedCommandListAttributeCallback(), + readLaundryWasherModeSelectAcceptedCommandListCommandParams); + result.put( + "readAcceptedCommandListAttribute", + readLaundryWasherModeSelectAcceptedCommandListAttributeInteractionInfo); + Map readLaundryWasherModeSelectEventListCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectEventListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readEventListAttribute( + (ChipClusters.LaundryWasherModeSelectCluster.EventListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterEventListAttributeCallback(), + readLaundryWasherModeSelectEventListCommandParams); + result.put( + "readEventListAttribute", readLaundryWasherModeSelectEventListAttributeInteractionInfo); + Map readLaundryWasherModeSelectAttributeListCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectAttributeListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readAttributeListAttribute( + (ChipClusters.LaundryWasherModeSelectCluster.AttributeListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedLaundryWasherModeSelectClusterAttributeListAttributeCallback(), + readLaundryWasherModeSelectAttributeListCommandParams); + result.put( + "readAttributeListAttribute", + readLaundryWasherModeSelectAttributeListAttributeInteractionInfo); + Map readLaundryWasherModeSelectFeatureMapCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectFeatureMapAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readLaundryWasherModeSelectFeatureMapCommandParams); + result.put( + "readFeatureMapAttribute", readLaundryWasherModeSelectFeatureMapAttributeInteractionInfo); + Map readLaundryWasherModeSelectClusterRevisionCommandParams = + new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSelectClusterRevisionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readLaundryWasherModeSelectClusterRevisionCommandParams); + result.put( + "readClusterRevisionAttribute", + readLaundryWasherModeSelectClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map + readRefrigeratorAndTemperatureControlledCabinetInteractionInfo() { + Map result = new LinkedHashMap<>(); + Map + readRefrigeratorAndTemperatureControlledCabinetDescriptionCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetDescriptionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readDescriptionAttribute( + (ChipClusters.CharStringAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetDescriptionCommandParams); + result.put( + "readDescriptionAttribute", + readRefrigeratorAndTemperatureControlledCabinetDescriptionAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetSupportedModesCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readSupportedModesAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .SupportedModesAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterSupportedModesAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetSupportedModesCommandParams); + result.put( + "readSupportedModesAttribute", + readRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetCurrentModeCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetCurrentModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readCurrentModeAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetCurrentModeCommandParams); + result.put( + "readCurrentModeAttribute", + readRefrigeratorAndTemperatureControlledCabinetCurrentModeAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetStartUpModeCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readStartUpModeAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .StartUpModeAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterStartUpModeAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetStartUpModeCommandParams); + result.put( + "readStartUpModeAttribute", + readRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetOnModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readOnModeAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .OnModeAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterOnModeAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetOnModeCommandParams); + result.put( + "readOnModeAttribute", + readRefrigeratorAndTemperatureControlledCabinetOnModeAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readGeneratedCommandListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .GeneratedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterGeneratedCommandListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListCommandParams); + result.put( + "readGeneratedCommandListAttribute", + readRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readAcceptedCommandListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .AcceptedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterAcceptedCommandListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListCommandParams); + result.put( + "readAcceptedCommandListAttribute", + readRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetEventListCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetEventListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readEventListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .EventListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterEventListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetEventListCommandParams); + result.put( + "readEventListAttribute", + readRefrigeratorAndTemperatureControlledCabinetEventListAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetAttributeListCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readAttributeListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + .AttributeListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRefrigeratorAndTemperatureControlledCabinetClusterAttributeListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetAttributeListCommandParams); + result.put( + "readAttributeListAttribute", + readRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetFeatureMapCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetFeatureMapAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetFeatureMapCommandParams); + result.put( + "readFeatureMapAttribute", + readRefrigeratorAndTemperatureControlledCabinetFeatureMapAttributeInteractionInfo); + Map + readRefrigeratorAndTemperatureControlledCabinetClusterRevisionCommandParams = + new LinkedHashMap(); + InteractionInfo + readRefrigeratorAndTemperatureControlledCabinetClusterRevisionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .readClusterRevisionAttribute( + (ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetClusterRevisionCommandParams); + result.put( + "readClusterRevisionAttribute", + readRefrigeratorAndTemperatureControlledCabinetClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readRvcRunInteractionInfo() { + Map result = new LinkedHashMap<>(); + Map readRvcRunDescriptionCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunDescriptionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readDescriptionAttribute((ChipClusters.CharStringAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), + readRvcRunDescriptionCommandParams); + result.put("readDescriptionAttribute", readRvcRunDescriptionAttributeInteractionInfo); + Map readRvcRunSupportedModesCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunSupportedModesAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readSupportedModesAttribute( + (ChipClusters.RvcRunCluster.SupportedModesAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcRunClusterSupportedModesAttributeCallback(), + readRvcRunSupportedModesCommandParams); + result.put("readSupportedModesAttribute", readRvcRunSupportedModesAttributeInteractionInfo); + Map readRvcRunCurrentModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunCurrentModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readCurrentModeAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readRvcRunCurrentModeCommandParams); + result.put("readCurrentModeAttribute", readRvcRunCurrentModeAttributeInteractionInfo); + Map readRvcRunStartUpModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readStartUpModeAttribute( + (ChipClusters.RvcRunCluster.StartUpModeAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcRunClusterStartUpModeAttributeCallback(), + readRvcRunStartUpModeCommandParams); + result.put("readStartUpModeAttribute", readRvcRunStartUpModeAttributeInteractionInfo); + Map readRvcRunOnModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readOnModeAttribute( + (ChipClusters.RvcRunCluster.OnModeAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcRunClusterOnModeAttributeCallback(), + readRvcRunOnModeCommandParams); + result.put("readOnModeAttribute", readRvcRunOnModeAttributeInteractionInfo); + Map readRvcRunGeneratedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunGeneratedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readGeneratedCommandListAttribute( + (ChipClusters.RvcRunCluster.GeneratedCommandListAttributeCallback) callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRvcRunClusterGeneratedCommandListAttributeCallback(), + readRvcRunGeneratedCommandListCommandParams); + result.put( + "readGeneratedCommandListAttribute", + readRvcRunGeneratedCommandListAttributeInteractionInfo); + Map readRvcRunAcceptedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunAcceptedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readAcceptedCommandListAttribute( + (ChipClusters.RvcRunCluster.AcceptedCommandListAttributeCallback) callback); + }, + () -> + new ClusterInfoMapping.DelegatedRvcRunClusterAcceptedCommandListAttributeCallback(), + readRvcRunAcceptedCommandListCommandParams); + result.put( + "readAcceptedCommandListAttribute", readRvcRunAcceptedCommandListAttributeInteractionInfo); + Map readRvcRunEventListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunEventListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readEventListAttribute( + (ChipClusters.RvcRunCluster.EventListAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcRunClusterEventListAttributeCallback(), + readRvcRunEventListCommandParams); + result.put("readEventListAttribute", readRvcRunEventListAttributeInteractionInfo); + Map readRvcRunAttributeListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunAttributeListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readAttributeListAttribute( + (ChipClusters.RvcRunCluster.AttributeListAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcRunClusterAttributeListAttributeCallback(), + readRvcRunAttributeListCommandParams); + result.put("readAttributeListAttribute", readRvcRunAttributeListAttributeInteractionInfo); + Map readRvcRunFeatureMapCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunFeatureMapAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readRvcRunFeatureMapCommandParams); + result.put("readFeatureMapAttribute", readRvcRunFeatureMapAttributeInteractionInfo); + Map readRvcRunClusterRevisionCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcRunClusterRevisionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readRvcRunClusterRevisionCommandParams); + result.put("readClusterRevisionAttribute", readRvcRunClusterRevisionAttributeInteractionInfo); + + return result; + } + + private static Map readRvcCleanInteractionInfo() { + Map result = new LinkedHashMap<>(); + Map readRvcCleanDescriptionCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanDescriptionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readDescriptionAttribute((ChipClusters.CharStringAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), + readRvcCleanDescriptionCommandParams); + result.put("readDescriptionAttribute", readRvcCleanDescriptionAttributeInteractionInfo); + Map readRvcCleanSupportedModesCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanSupportedModesAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readSupportedModesAttribute( + (ChipClusters.RvcCleanCluster.SupportedModesAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcCleanClusterSupportedModesAttributeCallback(), + readRvcCleanSupportedModesCommandParams); + result.put("readSupportedModesAttribute", readRvcCleanSupportedModesAttributeInteractionInfo); + Map readRvcCleanCurrentModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanCurrentModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readCurrentModeAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readRvcCleanCurrentModeCommandParams); + result.put("readCurrentModeAttribute", readRvcCleanCurrentModeAttributeInteractionInfo); + Map readRvcCleanStartUpModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readStartUpModeAttribute( + (ChipClusters.RvcCleanCluster.StartUpModeAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcCleanClusterStartUpModeAttributeCallback(), + readRvcCleanStartUpModeCommandParams); + result.put("readStartUpModeAttribute", readRvcCleanStartUpModeAttributeInteractionInfo); + Map readRvcCleanOnModeCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readOnModeAttribute( + (ChipClusters.RvcCleanCluster.OnModeAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcCleanClusterOnModeAttributeCallback(), + readRvcCleanOnModeCommandParams); + result.put("readOnModeAttribute", readRvcCleanOnModeAttributeInteractionInfo); + Map readRvcCleanGeneratedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanGeneratedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readGeneratedCommandListAttribute( + (ChipClusters.RvcCleanCluster.GeneratedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRvcCleanClusterGeneratedCommandListAttributeCallback(), + readRvcCleanGeneratedCommandListCommandParams); + result.put( + "readGeneratedCommandListAttribute", + readRvcCleanGeneratedCommandListAttributeInteractionInfo); + Map readRvcCleanAcceptedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanAcceptedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readAcceptedCommandListAttribute( + (ChipClusters.RvcCleanCluster.AcceptedCommandListAttributeCallback) callback); + }, + () -> + new ClusterInfoMapping + .DelegatedRvcCleanClusterAcceptedCommandListAttributeCallback(), + readRvcCleanAcceptedCommandListCommandParams); + result.put( + "readAcceptedCommandListAttribute", + readRvcCleanAcceptedCommandListAttributeInteractionInfo); + Map readRvcCleanEventListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanEventListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readEventListAttribute( + (ChipClusters.RvcCleanCluster.EventListAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcCleanClusterEventListAttributeCallback(), + readRvcCleanEventListCommandParams); + result.put("readEventListAttribute", readRvcCleanEventListAttributeInteractionInfo); + Map readRvcCleanAttributeListCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanAttributeListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readAttributeListAttribute( + (ChipClusters.RvcCleanCluster.AttributeListAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedRvcCleanClusterAttributeListAttributeCallback(), + readRvcCleanAttributeListCommandParams); + result.put("readAttributeListAttribute", readRvcCleanAttributeListAttributeInteractionInfo); + Map readRvcCleanFeatureMapCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanFeatureMapAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readRvcCleanFeatureMapCommandParams); + result.put("readFeatureMapAttribute", readRvcCleanFeatureMapAttributeInteractionInfo); + Map readRvcCleanClusterRevisionCommandParams = + new LinkedHashMap(); + InteractionInfo readRvcCleanClusterRevisionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readRvcCleanClusterRevisionCommandParams); + result.put("readClusterRevisionAttribute", readRvcCleanClusterRevisionAttributeInteractionInfo); + + return result; + } + private static Map readTemperatureControlInteractionInfo() { Map result = new LinkedHashMap<>(); Map readTemperatureControlTemperatureSetpointCommandParams = @@ -7958,6 +8606,176 @@ private static Map readTemperatureControlInteractionInf return result; } + private static Map readDishwasherModeSelectInteractionInfo() { + Map result = new LinkedHashMap<>(); + Map readDishwasherModeSelectDescriptionCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectDescriptionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readDescriptionAttribute((ChipClusters.CharStringAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), + readDishwasherModeSelectDescriptionCommandParams); + result.put( + "readDescriptionAttribute", readDishwasherModeSelectDescriptionAttributeInteractionInfo); + Map readDishwasherModeSelectSupportedModesCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectSupportedModesAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readSupportedModesAttribute( + (ChipClusters.DishwasherModeSelectCluster.SupportedModesAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterSupportedModesAttributeCallback(), + readDishwasherModeSelectSupportedModesCommandParams); + result.put( + "readSupportedModesAttribute", + readDishwasherModeSelectSupportedModesAttributeInteractionInfo); + Map readDishwasherModeSelectCurrentModeCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectCurrentModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readCurrentModeAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readDishwasherModeSelectCurrentModeCommandParams); + result.put( + "readCurrentModeAttribute", readDishwasherModeSelectCurrentModeAttributeInteractionInfo); + Map readDishwasherModeSelectStartUpModeCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readStartUpModeAttribute( + (ChipClusters.DishwasherModeSelectCluster.StartUpModeAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterStartUpModeAttributeCallback(), + readDishwasherModeSelectStartUpModeCommandParams); + result.put( + "readStartUpModeAttribute", readDishwasherModeSelectStartUpModeAttributeInteractionInfo); + Map readDishwasherModeSelectOnModeCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readOnModeAttribute( + (ChipClusters.DishwasherModeSelectCluster.OnModeAttributeCallback) callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterOnModeAttributeCallback(), + readDishwasherModeSelectOnModeCommandParams); + result.put("readOnModeAttribute", readDishwasherModeSelectOnModeAttributeInteractionInfo); + Map readDishwasherModeSelectGeneratedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectGeneratedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readGeneratedCommandListAttribute( + (ChipClusters.DishwasherModeSelectCluster + .GeneratedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterGeneratedCommandListAttributeCallback(), + readDishwasherModeSelectGeneratedCommandListCommandParams); + result.put( + "readGeneratedCommandListAttribute", + readDishwasherModeSelectGeneratedCommandListAttributeInteractionInfo); + Map readDishwasherModeSelectAcceptedCommandListCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectAcceptedCommandListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readAcceptedCommandListAttribute( + (ChipClusters.DishwasherModeSelectCluster + .AcceptedCommandListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterAcceptedCommandListAttributeCallback(), + readDishwasherModeSelectAcceptedCommandListCommandParams); + result.put( + "readAcceptedCommandListAttribute", + readDishwasherModeSelectAcceptedCommandListAttributeInteractionInfo); + Map readDishwasherModeSelectEventListCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectEventListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readEventListAttribute( + (ChipClusters.DishwasherModeSelectCluster.EventListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterEventListAttributeCallback(), + readDishwasherModeSelectEventListCommandParams); + result.put("readEventListAttribute", readDishwasherModeSelectEventListAttributeInteractionInfo); + Map readDishwasherModeSelectAttributeListCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectAttributeListAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readAttributeListAttribute( + (ChipClusters.DishwasherModeSelectCluster.AttributeListAttributeCallback) + callback); + }, + () -> + new ClusterInfoMapping + .DelegatedDishwasherModeSelectClusterAttributeListAttributeCallback(), + readDishwasherModeSelectAttributeListCommandParams); + result.put( + "readAttributeListAttribute", + readDishwasherModeSelectAttributeListAttributeInteractionInfo); + Map readDishwasherModeSelectFeatureMapCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectFeatureMapAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readFeatureMapAttribute((ChipClusters.LongAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), + readDishwasherModeSelectFeatureMapCommandParams); + result.put( + "readFeatureMapAttribute", readDishwasherModeSelectFeatureMapAttributeInteractionInfo); + Map readDishwasherModeSelectClusterRevisionCommandParams = + new LinkedHashMap(); + InteractionInfo readDishwasherModeSelectClusterRevisionAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .readClusterRevisionAttribute((ChipClusters.IntegerAttributeCallback) callback); + }, + () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), + readDishwasherModeSelectClusterRevisionCommandParams); + result.put( + "readClusterRevisionAttribute", + readDishwasherModeSelectClusterRevisionAttributeInteractionInfo); + + return result; + } + private static Map readAirQualityInteractionInfo() { Map result = new LinkedHashMap<>(); Map readAirQualityAirQualityCommandParams = @@ -19703,7 +20521,14 @@ public Map> getReadAttributeMap() { put("booleanState", readBooleanStateInteractionInfo()); put("icdManagement", readIcdManagementInteractionInfo()); put("modeSelect", readModeSelectInteractionInfo()); + put("laundryWasherModeSelect", readLaundryWasherModeSelectInteractionInfo()); + put( + "refrigeratorAndTemperatureControlledCabinet", + readRefrigeratorAndTemperatureControlledCabinetInteractionInfo()); + put("rvcRun", readRvcRunInteractionInfo()); + put("rvcClean", readRvcCleanInteractionInfo()); put("temperatureControl", readTemperatureControlInteractionInfo()); + put("dishwasherModeSelect", readDishwasherModeSelectInteractionInfo()); put("airQuality", readAirQualityInteractionInfo()); put("smokeCoAlarm", readSmokeCoAlarmInteractionInfo()); put("hepaFilterMonitoring", readHepaFilterMonitoringInteractionInfo()); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java index 5dec09e00c8159..1b08d77884b738 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java @@ -637,8 +637,196 @@ public Map> getWriteAttributeMap() { writeModeSelectInteractionInfo.put( "writeOnModeAttribute", writeModeSelectOnModeAttributeInteractionInfo); writeAttributeMap.put("modeSelect", writeModeSelectInteractionInfo); + Map writeLaundryWasherModeSelectInteractionInfo = + new LinkedHashMap<>(); + Map writeLaundryWasherModeSelectStartUpModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo laundryWasherModeSelectstartUpModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeLaundryWasherModeSelectStartUpModeCommandParams.put( + "value", laundryWasherModeSelectstartUpModeCommandParameterInfo); + InteractionInfo writeLaundryWasherModeSelectStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .writeStartUpModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeLaundryWasherModeSelectStartUpModeCommandParams); + writeLaundryWasherModeSelectInteractionInfo.put( + "writeStartUpModeAttribute", + writeLaundryWasherModeSelectStartUpModeAttributeInteractionInfo); + Map writeLaundryWasherModeSelectOnModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo laundryWasherModeSelectonModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeLaundryWasherModeSelectOnModeCommandParams.put( + "value", laundryWasherModeSelectonModeCommandParameterInfo); + InteractionInfo writeLaundryWasherModeSelectOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.LaundryWasherModeSelectCluster) cluster) + .writeOnModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeLaundryWasherModeSelectOnModeCommandParams); + writeLaundryWasherModeSelectInteractionInfo.put( + "writeOnModeAttribute", writeLaundryWasherModeSelectOnModeAttributeInteractionInfo); + writeAttributeMap.put("laundryWasherModeSelect", writeLaundryWasherModeSelectInteractionInfo); + Map writeRefrigeratorAndTemperatureControlledCabinetInteractionInfo = + new LinkedHashMap<>(); + Map + writeRefrigeratorAndTemperatureControlledCabinetStartUpModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo + refrigeratorAndTemperatureControlledCabinetstartUpModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeRefrigeratorAndTemperatureControlledCabinetStartUpModeCommandParams.put( + "value", refrigeratorAndTemperatureControlledCabinetstartUpModeCommandParameterInfo); + InteractionInfo + writeRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .writeStartUpModeAttribute( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeRefrigeratorAndTemperatureControlledCabinetStartUpModeCommandParams); + writeRefrigeratorAndTemperatureControlledCabinetInteractionInfo.put( + "writeStartUpModeAttribute", + writeRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeInteractionInfo); + Map + writeRefrigeratorAndTemperatureControlledCabinetOnModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo refrigeratorAndTemperatureControlledCabinetonModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeRefrigeratorAndTemperatureControlledCabinetOnModeCommandParams.put( + "value", refrigeratorAndTemperatureControlledCabinetonModeCommandParameterInfo); + InteractionInfo writeRefrigeratorAndTemperatureControlledCabinetOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + .writeOnModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeRefrigeratorAndTemperatureControlledCabinetOnModeCommandParams); + writeRefrigeratorAndTemperatureControlledCabinetInteractionInfo.put( + "writeOnModeAttribute", + writeRefrigeratorAndTemperatureControlledCabinetOnModeAttributeInteractionInfo); + writeAttributeMap.put( + "refrigeratorAndTemperatureControlledCabinet", + writeRefrigeratorAndTemperatureControlledCabinetInteractionInfo); + Map writeRvcRunInteractionInfo = new LinkedHashMap<>(); + Map writeRvcRunStartUpModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo rvcRunstartUpModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeRvcRunStartUpModeCommandParams.put("value", rvcRunstartUpModeCommandParameterInfo); + InteractionInfo writeRvcRunStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .writeStartUpModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeRvcRunStartUpModeCommandParams); + writeRvcRunInteractionInfo.put( + "writeStartUpModeAttribute", writeRvcRunStartUpModeAttributeInteractionInfo); + Map writeRvcRunOnModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo rvcRunonModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeRvcRunOnModeCommandParams.put("value", rvcRunonModeCommandParameterInfo); + InteractionInfo writeRvcRunOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcRunCluster) cluster) + .writeOnModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeRvcRunOnModeCommandParams); + writeRvcRunInteractionInfo.put( + "writeOnModeAttribute", writeRvcRunOnModeAttributeInteractionInfo); + writeAttributeMap.put("rvcRun", writeRvcRunInteractionInfo); + Map writeRvcCleanInteractionInfo = new LinkedHashMap<>(); + Map writeRvcCleanStartUpModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo rvcCleanstartUpModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeRvcCleanStartUpModeCommandParams.put("value", rvcCleanstartUpModeCommandParameterInfo); + InteractionInfo writeRvcCleanStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .writeStartUpModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeRvcCleanStartUpModeCommandParams); + writeRvcCleanInteractionInfo.put( + "writeStartUpModeAttribute", writeRvcCleanStartUpModeAttributeInteractionInfo); + Map writeRvcCleanOnModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo rvcCleanonModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeRvcCleanOnModeCommandParams.put("value", rvcCleanonModeCommandParameterInfo); + InteractionInfo writeRvcCleanOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RvcCleanCluster) cluster) + .writeOnModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeRvcCleanOnModeCommandParams); + writeRvcCleanInteractionInfo.put( + "writeOnModeAttribute", writeRvcCleanOnModeAttributeInteractionInfo); + writeAttributeMap.put("rvcClean", writeRvcCleanInteractionInfo); Map writeTemperatureControlInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("temperatureControl", writeTemperatureControlInteractionInfo); + Map writeDishwasherModeSelectInteractionInfo = new LinkedHashMap<>(); + Map writeDishwasherModeSelectStartUpModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo dishwasherModeSelectstartUpModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeDishwasherModeSelectStartUpModeCommandParams.put( + "value", dishwasherModeSelectstartUpModeCommandParameterInfo); + InteractionInfo writeDishwasherModeSelectStartUpModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .writeStartUpModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeDishwasherModeSelectStartUpModeCommandParams); + writeDishwasherModeSelectInteractionInfo.put( + "writeStartUpModeAttribute", writeDishwasherModeSelectStartUpModeAttributeInteractionInfo); + Map writeDishwasherModeSelectOnModeCommandParams = + new LinkedHashMap(); + CommandParameterInfo dishwasherModeSelectonModeCommandParameterInfo = + new CommandParameterInfo("value", Integer.class, Integer.class); + writeDishwasherModeSelectOnModeCommandParams.put( + "value", dishwasherModeSelectonModeCommandParameterInfo); + InteractionInfo writeDishwasherModeSelectOnModeAttributeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.DishwasherModeSelectCluster) cluster) + .writeOnModeAttribute( + (DefaultClusterCallback) callback, (Integer) commandArguments.get("value")); + }, + () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), + writeDishwasherModeSelectOnModeCommandParams); + writeDishwasherModeSelectInteractionInfo.put( + "writeOnModeAttribute", writeDishwasherModeSelectOnModeAttributeInteractionInfo); + writeAttributeMap.put("dishwasherModeSelect", writeDishwasherModeSelectInteractionInfo); Map writeAirQualityInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("airQuality", writeAirQualityInteractionInfo); Map writeSmokeCoAlarmInteractionInfo = new LinkedHashMap<>(); diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index 204ba64045e6f2..201d271bee216f 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -11873,6 +11873,28 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value)); return value; } + case Attributes::StandardNamespace::Id: { + using TypeInfo = Attributes::StandardNamespace::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = app::DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) + { + return nullptr; + } + jobject value; + if (cppValue.IsNull()) + { + value = nullptr; + } + else + { + std::string valueClassName = "java/lang/Integer"; + std::string valueCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), + cppValue.Value(), value); + } + return value; + } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -12448,8 +12470,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Id: { - using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinet; + case app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; switch (aPath.mAttributeId) { case Attributes::Description::Id: { @@ -12511,13 +12533,14 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( env, - "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct", + "chip/devicecontroller/" + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError( - Zcl, - "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct"); + ChipLogError(Zcl, + "Could not find class " + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct"); return nullptr; } jmethodID semanticTagStructStructCtor_3 = @@ -12526,7 +12549,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR { ChipLogError(Zcl, "Could not find " - "ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct constructor"); + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct " + "constructor"); return nullptr; } @@ -12537,21 +12561,25 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct", + env, + "chip/devicecontroller/" + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError( - Zcl, "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct"); + ChipLogError(Zcl, + "Could not find class " + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct"); return nullptr; } jmethodID modeOptionStructStructCtor_1 = env->GetMethodID( modeOptionStructStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V"); if (modeOptionStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, - "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct " - "constructor"); + ChipLogError( + Zcl, + "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct " + "constructor"); return nullptr; } @@ -12752,8 +12780,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::RvcRun::Id: { - using namespace app::Clusters::RvcRun; + case app::Clusters::RvcRunModeSelect::Id: { + using namespace app::Clusters::RvcRunModeSelect; switch (aPath.mAttributeId) { case Attributes::Description::Id: { @@ -12814,17 +12842,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunClusterSemanticTagStruct", semanticTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterSemanticTagStruct", + semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunClusterSemanticTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterSemanticTagStruct"); return nullptr; } jmethodID semanticTagStructStructCtor_3 = env->GetMethodID(semanticTagStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); if (semanticTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcRunClusterSemanticTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeSelectClusterSemanticTagStruct constructor"); return nullptr; } @@ -12835,17 +12864,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterModeOptionStruct", + modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterModeOptionStruct"); return nullptr; } jmethodID modeOptionStructStructCtor_1 = env->GetMethodID( modeOptionStructStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V"); if (modeOptionStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcRunClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeSelectClusterModeOptionStruct constructor"); return nullptr; } @@ -13046,8 +13076,8 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::RvcClean::Id: { - using namespace app::Clusters::RvcClean; + case app::Clusters::RvcCleanModeSelect::Id: { + using namespace app::Clusters::RvcCleanModeSelect; switch (aPath.mAttributeId) { case Attributes::Description::Id: { @@ -13108,17 +13138,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanClusterSemanticTagStruct", semanticTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterSemanticTagStruct", + semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanClusterSemanticTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterSemanticTagStruct"); return nullptr; } jmethodID semanticTagStructStructCtor_3 = env->GetMethodID(semanticTagStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); if (semanticTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanClusterSemanticTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeSelectClusterSemanticTagStruct constructor"); return nullptr; } @@ -13129,17 +13160,18 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterModeOptionStruct", + modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterModeOptionStruct"); return nullptr; } jmethodID modeOptionStructStructCtor_1 = env->GetMethodID( modeOptionStructStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V"); if (modeOptionStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeSelectClusterModeOptionStruct constructor"); return nullptr; } diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 4497957163d419..dd2c9a7945e1f4 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -2462,12 +2462,12 @@ JNI_METHOD(void, LaundryWasherModeSelectCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetCluster, writeStartUpModeAttribute) +JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2497,8 +2497,8 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetCluster, writeStartU env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); CHIP_ERROR err = CHIP_NO_ERROR; - RefrigeratorAndTemperatureControlledCabinetCluster * cppCluster = - reinterpret_cast(clusterPtr); + RefrigeratorAndTemperatureControlledCabinetModeSelectCluster * cppCluster = + reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2523,12 +2523,12 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetCluster, writeStartU onFailure.release(); } -JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetCluster, writeOnModeAttribute) +JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2558,8 +2558,8 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetCluster, writeOnMode env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); CHIP_ERROR err = CHIP_NO_ERROR; - RefrigeratorAndTemperatureControlledCabinetCluster * cppCluster = - reinterpret_cast(clusterPtr); + RefrigeratorAndTemperatureControlledCabinetModeSelectCluster * cppCluster = + reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2584,12 +2584,12 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetCluster, writeOnMode onFailure.release(); } -JNI_METHOD(void, RvcRunCluster, writeStartUpModeAttribute) +JNI_METHOD(void, RvcRunModeSelectCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcRun::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcRunModeSelect::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2618,8 +2618,8 @@ JNI_METHOD(void, RvcRunCluster, writeStartUpModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcRunCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcRunModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2644,12 +2644,12 @@ JNI_METHOD(void, RvcRunCluster, writeStartUpModeAttribute) onFailure.release(); } -JNI_METHOD(void, RvcRunCluster, writeOnModeAttribute) +JNI_METHOD(void, RvcRunModeSelectCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcRun::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcRunModeSelect::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2678,8 +2678,8 @@ JNI_METHOD(void, RvcRunCluster, writeOnModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcRunCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcRunModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2704,12 +2704,12 @@ JNI_METHOD(void, RvcRunCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, RvcCleanCluster, writeStartUpModeAttribute) +JNI_METHOD(void, RvcCleanModeSelectCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcClean::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcCleanModeSelect::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2738,8 +2738,8 @@ JNI_METHOD(void, RvcCleanCluster, writeStartUpModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcCleanCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcCleanModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2764,12 +2764,12 @@ JNI_METHOD(void, RvcCleanCluster, writeStartUpModeAttribute) onFailure.release(); } -JNI_METHOD(void, RvcCleanCluster, writeOnModeAttribute) +JNI_METHOD(void, RvcCleanModeSelectCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcClean::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcCleanModeSelect::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2798,8 +2798,8 @@ JNI_METHOD(void, RvcCleanCluster, writeOnModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcCleanCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcCleanModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); diff --git a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp index 8a8914f88b9615..31d7f9e0217279 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -2432,8 +2432,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Id: { - using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinet; + case app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; switch (aPath.mEventId) { default: @@ -2442,8 +2442,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::RvcRun::Id: { - using namespace app::Clusters::RvcRun; + case app::Clusters::RvcRunModeSelect::Id: { + using namespace app::Clusters::RvcRunModeSelect; switch (aPath.mEventId) { default: @@ -2452,8 +2452,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::RvcClean::Id: { - using namespace app::Clusters::RvcClean; + case app::Clusters::RvcCleanModeSelect::Id: { + using namespace app::Clusters::RvcCleanModeSelect; switch (aPath.mEventId) { default: diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index 2b2d11ff55344c..f6814fcb778f6c 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -2973,9 +2973,10 @@ void CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, + this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -2991,8 +2992,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallba } } -CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3003,10 +3004,10 @@ CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallba env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback::CallbackFn( void * context, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType & - dataResponse) + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse:: + DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3016,10 +3017,12 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseC VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback( + reinterpret_cast( + context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; @@ -3050,8 +3053,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseC env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPRvcRunClusterChangeToModeResponseCallback::CHIPRvcRunClusterChangeToModeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::CHIPRvcRunModeSelectClusterChangeToModeResponseCallback( + jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3067,7 +3071,7 @@ CHIPRvcRunClusterChangeToModeResponseCallback::CHIPRvcRunClusterChangeToModeResp } } -CHIPRvcRunClusterChangeToModeResponseCallback::~CHIPRvcRunClusterChangeToModeResponseCallback() +CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::~CHIPRvcRunModeSelectClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3078,8 +3082,8 @@ CHIPRvcRunClusterChangeToModeResponseCallback::~CHIPRvcRunClusterChangeToModeRes env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPRvcRunClusterChangeToModeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType & dataResponse) +void CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3089,9 +3093,10 @@ void CHIPRvcRunClusterChangeToModeResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; @@ -3122,8 +3127,9 @@ void CHIPRvcRunClusterChangeToModeResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPRvcCleanClusterChangeToModeResponseCallback::CHIPRvcCleanClusterChangeToModeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback( + jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3139,7 +3145,7 @@ CHIPRvcCleanClusterChangeToModeResponseCallback::CHIPRvcCleanClusterChangeToMode } } -CHIPRvcCleanClusterChangeToModeResponseCallback::~CHIPRvcCleanClusterChangeToModeResponseCallback() +CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::~CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3150,8 +3156,8 @@ CHIPRvcCleanClusterChangeToModeResponseCallback::~CHIPRvcCleanClusterChangeToMod env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPRvcCleanClusterChangeToModeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType & dataResponse) +void CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3161,9 +3167,10 @@ void CHIPRvcCleanClusterChangeToModeResponseCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); + std::unique_ptr + cppCallback(reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h index 2dfef61524770a..9d8f63ed747d83 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -495,46 +495,47 @@ class CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback jobject javaCallbackRef; }; -class CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback(); + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(); - static void CallbackFn( - void * context, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType & - data); + static void CallbackFn(void * context, + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands:: + ChangeToModeResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPRvcRunClusterChangeToModeResponseCallback : public Callback::Callback +class CHIPRvcRunModeSelectClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPRvcRunClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPRvcRunModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPRvcRunClusterChangeToModeResponseCallback(); + ~CHIPRvcRunModeSelectClusterChangeToModeResponseCallback(); - static void CallbackFn(void * context, const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType & data); + static void CallbackFn(void * context, + const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPRvcCleanClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPRvcCleanClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPRvcCleanClusterChangeToModeResponseCallback(); + ~CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & data); private: jobject javaCallbackRef; diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index 5679bd4977b776..f24d929a9ac135 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -19625,6 +19625,73 @@ void CHIPIcdManagementAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } +CHIPModeSelectStandardNamespaceAttributeCallback::CHIPModeSelectStandardNamespaceAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + return; + } + + javaCallbackRef = env->NewGlobalRef(javaCallback); + if (javaCallbackRef == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + } +} + +CHIPModeSelectStandardNamespaceAttributeCallback::~CHIPModeSelectStandardNamespaceAttributeCallback() +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +} + +void CHIPModeSelectStandardNamespaceAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) +{ + chip::DeviceLayer::StackUnlock unlock; + CHIP_ERROR err = CHIP_NO_ERROR; + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + jobject javaCallbackRef; + + VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); + + // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. + javaCallbackRef = cppCallback.get()->javaCallbackRef; + VerifyOrReturn(javaCallbackRef != nullptr, + ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); + + jmethodID javaMethod; + err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); + + jobject javaValue; + if (value.IsNull()) + { + javaValue = nullptr; + } + else + { + std::string javaValueClassName = "java/lang/Integer"; + std::string javaValueCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), + value.Value(), javaValue); + } + + env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); +} + CHIPModeSelectSupportedModesAttributeCallback::CHIPModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { @@ -20720,10 +20787,10 @@ void CHIPLaundryWasherModeSelectAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, - this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20740,8 +20807,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback:: } } -CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20752,10 +20819,11 @@ CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> & list) + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & + list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -20764,9 +20832,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallb VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - maybeDestroy); + std::unique_ptr + cppCallback( + reinterpret_cast(context), + maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -20814,12 +20884,14 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallb jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct", + env, + "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError( - Zcl, "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct"); + ChipLogError(Zcl, + "Could not find class " + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct"); return; } jmethodID semanticTagStructStructCtor_3 = @@ -20828,7 +20900,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallb { ChipLogError( Zcl, - "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct constructor"); + "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct " + "constructor"); return; } @@ -20839,20 +20912,22 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallb jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct", + env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, - "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct"); + ChipLogError( + Zcl, + "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct"); return; } jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V"); if (modeOptionStructStructCtor_1 == nullptr) { - ChipLogError( - Zcl, "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct constructor"); + ChipLogError(Zcl, + "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct " + "constructor"); return; } @@ -20865,10 +20940,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetSupportedModesAttributeCallb env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, - this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20885,8 +20960,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback:: } } -CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20897,7 +20972,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; @@ -20906,9 +20981,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - maybeDestroy); + std::unique_ptr + cppCallback( + reinterpret_cast(context), + maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -20935,9 +21011,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetStartUpModeAttributeCallback env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20954,8 +21031,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback:: } } -CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20966,7 +21043,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; @@ -20975,8 +21052,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback::Cal jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr + cppCallback(reinterpret_cast(context), + maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21003,10 +21081,12 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetOnModeAttributeCallback::Cal env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( - CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback< + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, + this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21023,8 +21103,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCall } } -CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21035,7 +21115,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCall env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21045,9 +21125,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttribut VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr + std::unique_ptr cppCallback( - reinterpret_cast(context), + reinterpret_cast( + context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. @@ -21078,10 +21160,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListAttribut env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( - CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback< + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21098,8 +21181,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallb } } -CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21110,7 +21193,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallb env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21120,9 +21203,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttribute VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr + std::unique_ptr cppCallback( - reinterpret_cast(context), + reinterpret_cast( + context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. @@ -21153,10 +21238,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListAttribute env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, - this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21173,8 +21258,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback:: } } -CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21185,7 +21270,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21195,8 +21280,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback:: VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr + cppCallback( + reinterpret_cast(context), + maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21226,10 +21313,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetEventListAttributeCallback:: env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, - this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21246,8 +21333,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback:: } } -CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21258,7 +21345,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21268,9 +21355,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallba VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr - cppCallback(reinterpret_cast(context), - maybeDestroy); + std::unique_ptr + cppCallback( + reinterpret_cast(context), + maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21300,8 +21389,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetAttributeListAttributeCallba env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunSupportedModesAttributeCallback::CHIPRvcRunSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcRunModeSelectSupportedModesAttributeCallback::CHIPRvcRunModeSelectSupportedModesAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21317,7 +21408,7 @@ CHIPRvcRunSupportedModesAttributeCallback::CHIPRvcRunSupportedModesAttributeCall } } -CHIPRvcRunSupportedModesAttributeCallback::~CHIPRvcRunSupportedModesAttributeCallback() +CHIPRvcRunModeSelectSupportedModesAttributeCallback::~CHIPRvcRunModeSelectSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21328,9 +21419,10 @@ CHIPRvcRunSupportedModesAttributeCallback::~CHIPRvcRunSupportedModesAttributeCal env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunSupportedModesAttributeCallback::CallbackFn( +void CHIPRvcRunModeSelectSupportedModesAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list) + const chip::app::DataModel::DecodableList & + list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21339,8 +21431,8 @@ void CHIPRvcRunSupportedModesAttributeCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21388,17 +21480,17 @@ void CHIPRvcRunSupportedModesAttributeCallback::CallbackFn( jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunClusterSemanticTagStruct", semanticTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunClusterSemanticTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterSemanticTagStruct"); return; } jmethodID semanticTagStructStructCtor_3 = env->GetMethodID(semanticTagStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); if (semanticTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcRunClusterSemanticTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeSelectClusterSemanticTagStruct constructor"); return; } @@ -21408,18 +21500,18 @@ void CHIPRvcRunSupportedModesAttributeCallback::CallbackFn( } jclass modeOptionStructStructClass_1; - err = chip::JniReferences::GetInstance().GetClassRef(env, "chip/devicecontroller/ChipStructs$RvcRunClusterModeOptionStruct", - modeOptionStructStructClass_1); + err = chip::JniReferences::GetInstance().GetClassRef( + env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterModeOptionStruct"); return; } jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V"); if (modeOptionStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcRunClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeSelectClusterModeOptionStruct constructor"); return; } @@ -21432,8 +21524,10 @@ void CHIPRvcRunSupportedModesAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunStartUpModeAttributeCallback::CHIPRvcRunStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcRunModeSelectStartUpModeAttributeCallback::CHIPRvcRunModeSelectStartUpModeAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21449,7 +21543,7 @@ CHIPRvcRunStartUpModeAttributeCallback::CHIPRvcRunStartUpModeAttributeCallback(j } } -CHIPRvcRunStartUpModeAttributeCallback::~CHIPRvcRunStartUpModeAttributeCallback() +CHIPRvcRunModeSelectStartUpModeAttributeCallback::~CHIPRvcRunModeSelectStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21460,7 +21554,8 @@ CHIPRvcRunStartUpModeAttributeCallback::~CHIPRvcRunStartUpModeAttributeCallback( env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) +void CHIPRvcRunModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21468,8 +21563,8 @@ void CHIPRvcRunStartUpModeAttributeCallback::CallbackFn(void * context, const ch jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21496,8 +21591,8 @@ void CHIPRvcRunStartUpModeAttributeCallback::CallbackFn(void * context, const ch env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcRunOnModeAttributeCallback::CHIPRvcRunOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcRunModeSelectOnModeAttributeCallback::CHIPRvcRunModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21513,7 +21608,7 @@ CHIPRvcRunOnModeAttributeCallback::CHIPRvcRunOnModeAttributeCallback(jobject jav } } -CHIPRvcRunOnModeAttributeCallback::~CHIPRvcRunOnModeAttributeCallback() +CHIPRvcRunModeSelectOnModeAttributeCallback::~CHIPRvcRunModeSelectOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21524,7 +21619,7 @@ CHIPRvcRunOnModeAttributeCallback::~CHIPRvcRunOnModeAttributeCallback() env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) +void CHIPRvcRunModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21532,8 +21627,8 @@ void CHIPRvcRunOnModeAttributeCallback::CallbackFn(void * context, const chip::a jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21560,9 +21655,9 @@ void CHIPRvcRunOnModeAttributeCallback::CallbackFn(void * context, const chip::a env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcRunGeneratedCommandListAttributeCallback::CHIPRvcRunGeneratedCommandListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback( + jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21579,7 +21674,7 @@ CHIPRvcRunGeneratedCommandListAttributeCallback::CHIPRvcRunGeneratedCommandListA } } -CHIPRvcRunGeneratedCommandListAttributeCallback::~CHIPRvcRunGeneratedCommandListAttributeCallback() +CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::~CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21590,8 +21685,8 @@ CHIPRvcRunGeneratedCommandListAttributeCallback::~CHIPRvcRunGeneratedCommandList env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunGeneratedCommandListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21600,8 +21695,8 @@ void CHIPRvcRunGeneratedCommandListAttributeCallback::CallbackFn(void * context, VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21631,9 +21726,9 @@ void CHIPRvcRunGeneratedCommandListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunAcceptedCommandListAttributeCallback::CHIPRvcRunAcceptedCommandListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback( + jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21650,7 +21745,7 @@ CHIPRvcRunAcceptedCommandListAttributeCallback::CHIPRvcRunAcceptedCommandListAtt } } -CHIPRvcRunAcceptedCommandListAttributeCallback::~CHIPRvcRunAcceptedCommandListAttributeCallback() +CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::~CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21661,8 +21756,8 @@ CHIPRvcRunAcceptedCommandListAttributeCallback::~CHIPRvcRunAcceptedCommandListAt env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunAcceptedCommandListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21671,8 +21766,8 @@ void CHIPRvcRunAcceptedCommandListAttributeCallback::CallbackFn(void * context, VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21702,8 +21797,10 @@ void CHIPRvcRunAcceptedCommandListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunEventListAttributeCallback::CHIPRvcRunEventListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcRunModeSelectEventListAttributeCallback::CHIPRvcRunModeSelectEventListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21719,7 +21816,7 @@ CHIPRvcRunEventListAttributeCallback::CHIPRvcRunEventListAttributeCallback(jobje } } -CHIPRvcRunEventListAttributeCallback::~CHIPRvcRunEventListAttributeCallback() +CHIPRvcRunModeSelectEventListAttributeCallback::~CHIPRvcRunModeSelectEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21730,8 +21827,8 @@ CHIPRvcRunEventListAttributeCallback::~CHIPRvcRunEventListAttributeCallback() env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunEventListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcRunModeSelectEventListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21740,8 +21837,8 @@ void CHIPRvcRunEventListAttributeCallback::CallbackFn(void * context, VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21771,8 +21868,10 @@ void CHIPRvcRunEventListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunAttributeListAttributeCallback::CHIPRvcRunAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcRunModeSelectAttributeListAttributeCallback::CHIPRvcRunModeSelectAttributeListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21788,7 +21887,7 @@ CHIPRvcRunAttributeListAttributeCallback::CHIPRvcRunAttributeListAttributeCallba } } -CHIPRvcRunAttributeListAttributeCallback::~CHIPRvcRunAttributeListAttributeCallback() +CHIPRvcRunModeSelectAttributeListAttributeCallback::~CHIPRvcRunModeSelectAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21799,8 +21898,8 @@ CHIPRvcRunAttributeListAttributeCallback::~CHIPRvcRunAttributeListAttributeCallb env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunAttributeListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcRunModeSelectAttributeListAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21809,8 +21908,8 @@ void CHIPRvcRunAttributeListAttributeCallback::CallbackFn(void * context, VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21840,8 +21939,10 @@ void CHIPRvcRunAttributeListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanSupportedModesAttributeCallback::CHIPRvcCleanSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CHIPRvcCleanModeSelectSupportedModesAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21857,7 +21958,7 @@ CHIPRvcCleanSupportedModesAttributeCallback::CHIPRvcCleanSupportedModesAttribute } } -CHIPRvcCleanSupportedModesAttributeCallback::~CHIPRvcCleanSupportedModesAttributeCallback() +CHIPRvcCleanModeSelectSupportedModesAttributeCallback::~CHIPRvcCleanModeSelectSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21868,9 +21969,10 @@ CHIPRvcCleanSupportedModesAttributeCallback::~CHIPRvcCleanSupportedModesAttribut env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanSupportedModesAttributeCallback::CallbackFn( +void CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList & list) + const chip::app::DataModel::DecodableList & + list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -21879,8 +21981,8 @@ void CHIPRvcCleanSupportedModesAttributeCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -21928,17 +22030,18 @@ void CHIPRvcCleanSupportedModesAttributeCallback::CallbackFn( jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanClusterSemanticTagStruct", semanticTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterSemanticTagStruct", + semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanClusterSemanticTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterSemanticTagStruct"); return; } jmethodID semanticTagStructStructCtor_3 = env->GetMethodID(semanticTagStructStructClass_3, "", "(Ljava/lang/Integer;Ljava/lang/Integer;)V"); if (semanticTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanClusterSemanticTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeSelectClusterSemanticTagStruct constructor"); return; } @@ -21949,17 +22052,17 @@ void CHIPRvcCleanSupportedModesAttributeCallback::CallbackFn( jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterModeOptionStruct"); return; } jmethodID modeOptionStructStructCtor_1 = env->GetMethodID(modeOptionStructStructClass_1, "", "(Ljava/lang/String;Ljava/lang/Integer;Ljava/util/ArrayList;)V"); if (modeOptionStructStructCtor_1 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeSelectClusterModeOptionStruct constructor"); return; } @@ -21972,8 +22075,10 @@ void CHIPRvcCleanSupportedModesAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanStartUpModeAttributeCallback::CHIPRvcCleanStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CHIPRvcCleanModeSelectStartUpModeAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21989,7 +22094,7 @@ CHIPRvcCleanStartUpModeAttributeCallback::CHIPRvcCleanStartUpModeAttributeCallba } } -CHIPRvcCleanStartUpModeAttributeCallback::~CHIPRvcCleanStartUpModeAttributeCallback() +CHIPRvcCleanModeSelectStartUpModeAttributeCallback::~CHIPRvcCleanModeSelectStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22000,7 +22105,8 @@ CHIPRvcCleanStartUpModeAttributeCallback::~CHIPRvcCleanStartUpModeAttributeCallb env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) +void CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22008,8 +22114,8 @@ void CHIPRvcCleanStartUpModeAttributeCallback::CallbackFn(void * context, const jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -22036,8 +22142,8 @@ void CHIPRvcCleanStartUpModeAttributeCallback::CallbackFn(void * context, const env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcCleanOnModeAttributeCallback::CHIPRvcCleanOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcCleanModeSelectOnModeAttributeCallback::CHIPRvcCleanModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22053,7 +22159,7 @@ CHIPRvcCleanOnModeAttributeCallback::CHIPRvcCleanOnModeAttributeCallback(jobject } } -CHIPRvcCleanOnModeAttributeCallback::~CHIPRvcCleanOnModeAttributeCallback() +CHIPRvcCleanModeSelectOnModeAttributeCallback::~CHIPRvcCleanModeSelectOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22064,7 +22170,8 @@ CHIPRvcCleanOnModeAttributeCallback::~CHIPRvcCleanOnModeAttributeCallback() env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) +void CHIPRvcCleanModeSelectOnModeAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22072,8 +22179,8 @@ void CHIPRvcCleanOnModeAttributeCallback::CallbackFn(void * context, const chip: jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -22100,9 +22207,9 @@ void CHIPRvcCleanOnModeAttributeCallback::CallbackFn(void * context, const chip: env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcCleanGeneratedCommandListAttributeCallback::CHIPRvcCleanGeneratedCommandListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback( + jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22119,7 +22226,7 @@ CHIPRvcCleanGeneratedCommandListAttributeCallback::CHIPRvcCleanGeneratedCommandL } } -CHIPRvcCleanGeneratedCommandListAttributeCallback::~CHIPRvcCleanGeneratedCommandListAttributeCallback() +CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22130,7 +22237,7 @@ CHIPRvcCleanGeneratedCommandListAttributeCallback::~CHIPRvcCleanGeneratedCommand env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -22140,8 +22247,8 @@ void CHIPRvcCleanGeneratedCommandListAttributeCallback::CallbackFn( VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -22171,9 +22278,9 @@ void CHIPRvcCleanGeneratedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanAcceptedCommandListAttributeCallback::CHIPRvcCleanAcceptedCommandListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback( + jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22190,7 +22297,7 @@ CHIPRvcCleanAcceptedCommandListAttributeCallback::CHIPRvcCleanAcceptedCommandLis } } -CHIPRvcCleanAcceptedCommandListAttributeCallback::~CHIPRvcCleanAcceptedCommandListAttributeCallback() +CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22201,8 +22308,8 @@ CHIPRvcCleanAcceptedCommandListAttributeCallback::~CHIPRvcCleanAcceptedCommandLi env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanAcceptedCommandListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22211,8 +22318,8 @@ void CHIPRvcCleanAcceptedCommandListAttributeCallback::CallbackFn(void * context VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -22242,8 +22349,10 @@ void CHIPRvcCleanAcceptedCommandListAttributeCallback::CallbackFn(void * context env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanEventListAttributeCallback::CHIPRvcCleanEventListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcCleanModeSelectEventListAttributeCallback::CHIPRvcCleanModeSelectEventListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22259,7 +22368,7 @@ CHIPRvcCleanEventListAttributeCallback::CHIPRvcCleanEventListAttributeCallback(j } } -CHIPRvcCleanEventListAttributeCallback::~CHIPRvcCleanEventListAttributeCallback() +CHIPRvcCleanModeSelectEventListAttributeCallback::~CHIPRvcCleanModeSelectEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22270,8 +22379,8 @@ CHIPRvcCleanEventListAttributeCallback::~CHIPRvcCleanEventListAttributeCallback( env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanEventListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcCleanModeSelectEventListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22280,8 +22389,8 @@ void CHIPRvcCleanEventListAttributeCallback::CallbackFn(void * context, VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; @@ -22311,8 +22420,10 @@ void CHIPRvcCleanEventListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanAttributeListAttributeCallback::CHIPRvcCleanAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcCleanModeSelectAttributeListAttributeCallback::CHIPRvcCleanModeSelectAttributeListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), + keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22328,7 +22439,7 @@ CHIPRvcCleanAttributeListAttributeCallback::CHIPRvcCleanAttributeListAttributeCa } } -CHIPRvcCleanAttributeListAttributeCallback::~CHIPRvcCleanAttributeListAttributeCallback() +CHIPRvcCleanModeSelectAttributeListAttributeCallback::~CHIPRvcCleanModeSelectAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22339,8 +22450,8 @@ CHIPRvcCleanAttributeListAttributeCallback::~CHIPRvcCleanAttributeListAttributeC env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanAttributeListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcCleanModeSelectAttributeListAttributeCallback::CallbackFn( + void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22349,8 +22460,8 @@ void CHIPRvcCleanAttributeListAttributeCallback::CallbackFn(void * context, VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. javaCallbackRef = cppCallback.get()->javaCallbackRef; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 527594adea5666..c2537fe8944464 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -13609,6 +13609,14 @@ public interface ChangeToModeResponseCallback { void onError(Exception error); } + public interface StandardNamespaceAttributeCallback { + void onSuccess(@Nullable Integer value); + + void onError(Exception ex); + + default void onSubscriptionEstablished(long subscriptionId) {} + } + public interface SupportedModesAttributeCallback { void onSuccess(List valueList); @@ -13674,6 +13682,15 @@ public void subscribeDescriptionAttribute( subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } + public void readStandardNamespaceAttribute(StandardNamespaceAttributeCallback callback) { + readStandardNamespaceAttribute(chipClusterPtr, callback); + } + + public void subscribeStandardNamespaceAttribute( + StandardNamespaceAttributeCallback callback, int minInterval, int maxInterval) { + subscribeStandardNamespaceAttribute(chipClusterPtr, callback, minInterval, maxInterval); + } + public void readSupportedModesAttribute(SupportedModesAttributeCallback callback) { readSupportedModesAttribute(chipClusterPtr, callback); } @@ -13791,6 +13808,15 @@ private native void subscribeDescriptionAttribute( int minInterval, int maxInterval); + private native void readStandardNamespaceAttribute( + long chipClusterPtr, StandardNamespaceAttributeCallback callback); + + private native void subscribeStandardNamespaceAttribute( + long chipClusterPtr, + StandardNamespaceAttributeCallback callback, + int minInterval, + int maxInterval); + private native void readSupportedModesAttribute( long chipClusterPtr, SupportedModesAttributeCallback callback); @@ -14193,10 +14219,12 @@ private native void subscribeClusterRevisionAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); } - public static class RefrigeratorAndTemperatureControlledCabinetCluster extends BaseChipCluster { + public static class RefrigeratorAndTemperatureControlledCabinetModeSelectCluster + extends BaseChipCluster { public static final long CLUSTER_ID = 82L; - public RefrigeratorAndTemperatureControlledCabinetCluster(long devicePtr, int endpointId) { + public RefrigeratorAndTemperatureControlledCabinetModeSelectCluster( + long devicePtr, int endpointId) { super(devicePtr, endpointId); } @@ -14241,7 +14269,9 @@ public interface ChangeToModeResponseCallback { public interface SupportedModesAttributeCallback { void onSuccess( - List + List< + ChipStructs + .RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct> valueList); void onError(Exception ex); @@ -14510,10 +14540,10 @@ private native void subscribeClusterRevisionAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); } - public static class RvcRunCluster extends BaseChipCluster { + public static class RvcRunModeSelectCluster extends BaseChipCluster { public static final long CLUSTER_ID = 84L; - public RvcRunCluster(long devicePtr, int endpointId) { + public RvcRunModeSelectCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @@ -14557,7 +14587,7 @@ public interface ChangeToModeResponseCallback { } public interface SupportedModesAttributeCallback { - void onSuccess(List valueList); + void onSuccess(List valueList); void onError(Exception ex); @@ -14825,10 +14855,10 @@ private native void subscribeClusterRevisionAttribute( long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); } - public static class RvcCleanCluster extends BaseChipCluster { + public static class RvcCleanModeSelectCluster extends BaseChipCluster { public static final long CLUSTER_ID = 85L; - public RvcCleanCluster(long devicePtr, int endpointId) { + public RvcCleanModeSelectCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @@ -14872,7 +14902,7 @@ public interface ChangeToModeResponseCallback { } public interface SupportedModesAttributeCallback { - void onSuccess(List valueList); + void onSuccess(List valueList); void onError(Exception ex); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index 9044a1ec1d2a76..a6eec6635bd589 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -155,13 +155,13 @@ public static String clusterIdToName(long clusterId) { return "LaundryWasherModeSelect"; } if (clusterId == 82L) { - return "RefrigeratorAndTemperatureControlledCabinet"; + return "RefrigeratorAndTemperatureControlledCabinetModeSelect"; } if (clusterId == 84L) { - return "RvcRun"; + return "RvcRunModeSelect"; } if (clusterId == 85L) { - return "RvcClean"; + return "RvcCleanModeSelect"; } if (clusterId == 86L) { return "TemperatureControl"; @@ -2014,6 +2014,9 @@ public static String attributeIdToName(long clusterId, long attributeId) { if (attributeId == 0L) { return "Description"; } + if (attributeId == 1L) { + return "StandardNamespace"; + } if (attributeId == 2L) { return "SupportedModes"; } diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index d79cee2c1c9ab7..c078a053793cc7 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1574,11 +1574,12 @@ public String toString() { } } - public static class RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct { + public static + class RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct { public Integer mfgCode; public Integer value; - public RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct( + public RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct( Integer mfgCode, Integer value) { this.mfgCode = mfgCode; this.value = value; @@ -1587,7 +1588,8 @@ public RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct {\n"); + output.append( + "RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); @@ -1599,17 +1601,20 @@ public String toString() { } } - public static class RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct { + public static class RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct { public String label; public Integer mode; public ArrayList< - ChipStructs.RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct> + ChipStructs + .RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct> semanticTags; - public RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct( + public RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct( String label, Integer mode, - ArrayList + ArrayList< + ChipStructs + .RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct> semanticTags) { this.label = label; this.mode = mode; @@ -1619,7 +1624,8 @@ public RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct {\n"); + output.append( + "RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); @@ -1634,11 +1640,11 @@ public String toString() { } } - public static class RvcRunClusterSemanticTagStruct { + public static class RvcRunModeSelectClusterSemanticTagStruct { public Integer mfgCode; public Integer value; - public RvcRunClusterSemanticTagStruct(Integer mfgCode, Integer value) { + public RvcRunModeSelectClusterSemanticTagStruct(Integer mfgCode, Integer value) { this.mfgCode = mfgCode; this.value = value; } @@ -1646,7 +1652,7 @@ public RvcRunClusterSemanticTagStruct(Integer mfgCode, Integer value) { @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcRunClusterSemanticTagStruct {\n"); + output.append("RvcRunModeSelectClusterSemanticTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); @@ -1658,15 +1664,15 @@ public String toString() { } } - public static class RvcRunClusterModeOptionStruct { + public static class RvcRunModeSelectClusterModeOptionStruct { public String label; public Integer mode; - public ArrayList semanticTags; + public ArrayList semanticTags; - public RvcRunClusterModeOptionStruct( + public RvcRunModeSelectClusterModeOptionStruct( String label, Integer mode, - ArrayList semanticTags) { + ArrayList semanticTags) { this.label = label; this.mode = mode; this.semanticTags = semanticTags; @@ -1675,7 +1681,7 @@ public RvcRunClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcRunClusterModeOptionStruct {\n"); + output.append("RvcRunModeSelectClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); @@ -1690,11 +1696,11 @@ public String toString() { } } - public static class RvcCleanClusterSemanticTagStruct { + public static class RvcCleanModeSelectClusterSemanticTagStruct { public Integer mfgCode; public Integer value; - public RvcCleanClusterSemanticTagStruct(Integer mfgCode, Integer value) { + public RvcCleanModeSelectClusterSemanticTagStruct(Integer mfgCode, Integer value) { this.mfgCode = mfgCode; this.value = value; } @@ -1702,7 +1708,7 @@ public RvcCleanClusterSemanticTagStruct(Integer mfgCode, Integer value) { @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcCleanClusterSemanticTagStruct {\n"); + output.append("RvcCleanModeSelectClusterSemanticTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); @@ -1714,15 +1720,15 @@ public String toString() { } } - public static class RvcCleanClusterModeOptionStruct { + public static class RvcCleanModeSelectClusterModeOptionStruct { public String label; public Integer mode; - public ArrayList semanticTags; + public ArrayList semanticTags; - public RvcCleanClusterModeOptionStruct( + public RvcCleanModeSelectClusterModeOptionStruct( String label, Integer mode, - ArrayList semanticTags) { + ArrayList semanticTags) { this.label = label; this.mode = mode; this.semanticTags = semanticTags; @@ -1731,7 +1737,7 @@ public RvcCleanClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcCleanClusterModeOptionStruct {\n"); + output.append("RvcCleanModeSelectClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java index 49291bfaf3a705..1ba62809876817 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -7200,6 +7200,30 @@ public void onError(Exception error) { } } + public static class DelegatedModeSelectClusterStandardNamespaceAttributeCallback + implements ChipClusters.ModeSelectCluster.StandardNamespaceAttributeCallback, + DelegatedClusterCallback { + private ClusterCommandCallback callback; + + @Override + public void setCallbackDelegate(ClusterCommandCallback callback) { + this.callback = callback; + } + + @Override + public void onSuccess(@Nullable Integer value) { + Map responseValues = new LinkedHashMap<>(); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("value", "Integer"); + responseValues.put(commandResponseInfo, value); + callback.onSuccess(responseValues); + } + + @Override + public void onError(Exception ex) { + callback.onFailure(ex); + } + } + public static class DelegatedModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.ModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { @@ -7568,8 +7592,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7597,8 +7621,8 @@ public void onError(Exception error) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterSupportedModesAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSupportedModesAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7610,13 +7634,15 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { @Override public void onSuccess( - List + List< + ChipStructs + .RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct> valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = new CommandResponseInfo( "valueList", - "List"); + "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -7628,8 +7654,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterStartUpModeAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterStartUpModeAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7654,8 +7680,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterOnModeAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterOnModeAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .OnModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7680,8 +7706,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterGeneratedCommandListAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterGeneratedCommandListAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7706,8 +7732,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterAcceptedCommandListAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAcceptedCommandListAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7732,8 +7758,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterEventListAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterEventListAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .EventListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7758,8 +7784,8 @@ public void onError(Exception ex) { } public static - class DelegatedRefrigeratorAndTemperatureControlledCabinetClusterAttributeListAttributeCallback - implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAttributeListAttributeCallback + implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7783,8 +7809,9 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterChangeToModeResponseCallback - implements ChipClusters.RvcRunCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeSelectClusterChangeToModeResponseCallback + implements ChipClusters.RvcRunModeSelectCluster.ChangeToModeResponseCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -7809,8 +7836,8 @@ public void onError(Exception error) { } } - public static class DelegatedRvcRunClusterSupportedModesAttributeCallback - implements ChipClusters.RvcRunCluster.SupportedModesAttributeCallback, + public static class DelegatedRvcRunModeSelectClusterSupportedModesAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7820,10 +7847,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(List valueList) { + public void onSuccess(List valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = - new CommandResponseInfo("valueList", "List"); + new CommandResponseInfo( + "valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -7834,8 +7862,9 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterStartUpModeAttributeCallback - implements ChipClusters.RvcRunCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeSelectClusterStartUpModeAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.StartUpModeAttributeCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -7857,8 +7886,9 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterOnModeAttributeCallback - implements ChipClusters.RvcRunCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeSelectClusterOnModeAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.OnModeAttributeCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -7880,8 +7910,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterGeneratedCommandListAttributeCallback - implements ChipClusters.RvcRunCluster.GeneratedCommandListAttributeCallback, + public static class DelegatedRvcRunModeSelectClusterGeneratedCommandListAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7904,8 +7934,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterAcceptedCommandListAttributeCallback - implements ChipClusters.RvcRunCluster.AcceptedCommandListAttributeCallback, + public static class DelegatedRvcRunModeSelectClusterAcceptedCommandListAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7928,8 +7958,9 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterEventListAttributeCallback - implements ChipClusters.RvcRunCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeSelectClusterEventListAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.EventListAttributeCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -7951,8 +7982,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunClusterAttributeListAttributeCallback - implements ChipClusters.RvcRunCluster.AttributeListAttributeCallback, + public static class DelegatedRvcRunModeSelectClusterAttributeListAttributeCallback + implements ChipClusters.RvcRunModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -7975,8 +8006,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterChangeToModeResponseCallback - implements ChipClusters.RvcCleanCluster.ChangeToModeResponseCallback, + public static class DelegatedRvcCleanModeSelectClusterChangeToModeResponseCallback + implements ChipClusters.RvcCleanModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -8002,8 +8033,8 @@ public void onError(Exception error) { } } - public static class DelegatedRvcCleanClusterSupportedModesAttributeCallback - implements ChipClusters.RvcCleanCluster.SupportedModesAttributeCallback, + public static class DelegatedRvcCleanModeSelectClusterSupportedModesAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -8013,10 +8044,11 @@ public void setCallbackDelegate(ClusterCommandCallback callback) { } @Override - public void onSuccess(List valueList) { + public void onSuccess(List valueList) { Map responseValues = new LinkedHashMap<>(); CommandResponseInfo commandResponseInfo = - new CommandResponseInfo("valueList", "List"); + new CommandResponseInfo( + "valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -8027,8 +8059,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterStartUpModeAttributeCallback - implements ChipClusters.RvcCleanCluster.StartUpModeAttributeCallback, + public static class DelegatedRvcCleanModeSelectClusterStartUpModeAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -8051,8 +8083,9 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterOnModeAttributeCallback - implements ChipClusters.RvcCleanCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeSelectClusterOnModeAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.OnModeAttributeCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -8074,8 +8107,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterGeneratedCommandListAttributeCallback - implements ChipClusters.RvcCleanCluster.GeneratedCommandListAttributeCallback, + public static class DelegatedRvcCleanModeSelectClusterGeneratedCommandListAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -8098,8 +8131,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterAcceptedCommandListAttributeCallback - implements ChipClusters.RvcCleanCluster.AcceptedCommandListAttributeCallback, + public static class DelegatedRvcCleanModeSelectClusterAcceptedCommandListAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -8122,8 +8155,9 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterEventListAttributeCallback - implements ChipClusters.RvcCleanCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeSelectClusterEventListAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.EventListAttributeCallback, + DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -8145,8 +8179,8 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanClusterAttributeListAttributeCallback - implements ChipClusters.RvcCleanCluster.AttributeListAttributeCallback, + public static class DelegatedRvcCleanModeSelectClusterAttributeListAttributeCallback + implements ChipClusters.RvcCleanModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @@ -16674,24 +16708,25 @@ public Map initializeClusterMap() { (ptr, endpointId) -> new ChipClusters.LaundryWasherModeSelectCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("laundryWasherModeSelect", laundryWasherModeSelectClusterInfo); - ClusterInfo refrigeratorAndTemperatureControlledCabinetClusterInfo = + ClusterInfo refrigeratorAndTemperatureControlledCabinetModeSelectClusterInfo = new ClusterInfo( (ptr, endpointId) -> - new ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster( + new ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster( ptr, endpointId), new HashMap<>()); clusterMap.put( - "refrigeratorAndTemperatureControlledCabinet", - refrigeratorAndTemperatureControlledCabinetClusterInfo); - ClusterInfo rvcRunClusterInfo = + "refrigeratorAndTemperatureControlledCabinetModeSelect", + refrigeratorAndTemperatureControlledCabinetModeSelectClusterInfo); + ClusterInfo rvcRunModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.RvcRunCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("rvcRun", rvcRunClusterInfo); - ClusterInfo rvcCleanClusterInfo = + (ptr, endpointId) -> new ChipClusters.RvcRunModeSelectCluster(ptr, endpointId), + new HashMap<>()); + clusterMap.put("rvcRunModeSelect", rvcRunModeSelectClusterInfo); + ClusterInfo rvcCleanModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.RvcCleanCluster(ptr, endpointId), + (ptr, endpointId) -> new ChipClusters.RvcCleanModeSelectCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("rvcClean", rvcCleanClusterInfo); + clusterMap.put("rvcCleanModeSelect", rvcCleanModeSelectClusterInfo); ClusterInfo temperatureControlClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.TemperatureControlCluster(ptr, endpointId), @@ -16996,10 +17031,10 @@ public void combineCommand( .get("laundryWasherModeSelect") .combineCommands(source.get("laundryWasherModeSelect")); destination - .get("refrigeratorAndTemperatureControlledCabinet") - .combineCommands(source.get("refrigeratorAndTemperatureControlledCabinet")); - destination.get("rvcRun").combineCommands(source.get("rvcRun")); - destination.get("rvcClean").combineCommands(source.get("rvcClean")); + .get("refrigeratorAndTemperatureControlledCabinetModeSelect") + .combineCommands(source.get("refrigeratorAndTemperatureControlledCabinetModeSelect")); + destination.get("rvcRunModeSelect").combineCommands(source.get("rvcRunModeSelect")); + destination.get("rvcCleanModeSelect").combineCommands(source.get("rvcCleanModeSelect")); destination.get("temperatureControl").combineCommands(source.get("temperatureControl")); destination.get("dishwasherModeSelect").combineCommands(source.get("dishwasherModeSelect")); destination.get("airQuality").combineCommands(source.get("airQuality")); @@ -19222,134 +19257,144 @@ public Map> getCommandMap() { "changeToModeWithStatus", laundryWasherModeSelectchangeToModeWithStatusInteractionInfo); commandMap.put("laundryWasherModeSelect", laundryWasherModeSelectClusterInteractionInfoMap); Map - refrigeratorAndTemperatureControlledCabinetClusterInteractionInfoMap = + refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); Map - refrigeratorAndTemperatureControlledCabinetchangeToModeCommandParams = + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeCommandParams = new LinkedHashMap(); CommandParameterInfo - refrigeratorAndTemperatureControlledCabinetchangeToModenewModeCommandParameterInfo = + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - refrigeratorAndTemperatureControlledCabinetchangeToModeCommandParams.put( + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeCommandParams.put( "newMode", - refrigeratorAndTemperatureControlledCabinetchangeToModenewModeCommandParameterInfo); + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModenewModeCommandParameterInfo); - InteractionInfo refrigeratorAndTemperatureControlledCabinetchangeToModeInteractionInfo = - new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) - .changeToMode( - (DefaultClusterCallback) callback, (Integer) commandArguments.get("newMode")); - }, - () -> new DelegatedDefaultClusterCallback(), - refrigeratorAndTemperatureControlledCabinetchangeToModeCommandParams); - refrigeratorAndTemperatureControlledCabinetClusterInteractionInfoMap.put( - "changeToMode", refrigeratorAndTemperatureControlledCabinetchangeToModeInteractionInfo); + InteractionInfo + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeInteractionInfo = + new InteractionInfo( + (cluster, callback, commandArguments) -> { + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) + cluster) + .changeToMode( + (DefaultClusterCallback) callback, + (Integer) commandArguments.get("newMode")); + }, + () -> new DelegatedDefaultClusterCallback(), + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeCommandParams); + refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap.put( + "changeToMode", + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeInteractionInfo); Map - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusCommandParams = + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); CommandParameterInfo - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusnewModeCommandParameterInfo = + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusCommandParams.put( + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusCommandParams.put( "newMode", - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusnewModeCommandParameterInfo); + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); InteractionInfo - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusInteractionInfo = + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster) cluster) + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) + cluster) .changeToModeWithStatus( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetCluster + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster .ChangeToModeResponseCallback) callback, (Integer) commandArguments.get("newMode")); }, () -> - new DelegatedRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallback(), - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusCommandParams); - refrigeratorAndTemperatureControlledCabinetClusterInteractionInfoMap.put( + new DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(), + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusCommandParams); + refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap.put( "changeToModeWithStatus", - refrigeratorAndTemperatureControlledCabinetchangeToModeWithStatusInteractionInfo); + refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusInteractionInfo); commandMap.put( - "refrigeratorAndTemperatureControlledCabinet", - refrigeratorAndTemperatureControlledCabinetClusterInteractionInfoMap); - Map rvcRunClusterInteractionInfoMap = new LinkedHashMap<>(); - Map rvcRunchangeToModeCommandParams = + "refrigeratorAndTemperatureControlledCabinetModeSelect", + refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap); + Map rvcRunModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); + Map rvcRunModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcRunchangeToModenewModeCommandParameterInfo = + CommandParameterInfo rvcRunModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcRunchangeToModeCommandParams.put("newMode", rvcRunchangeToModenewModeCommandParameterInfo); + rvcRunModeSelectchangeToModeCommandParams.put( + "newMode", rvcRunModeSelectchangeToModenewModeCommandParameterInfo); - InteractionInfo rvcRunchangeToModeInteractionInfo = + InteractionInfo rvcRunModeSelectchangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunCluster) cluster) + ((ChipClusters.RvcRunModeSelectCluster) cluster) .changeToMode( (DefaultClusterCallback) callback, (Integer) commandArguments.get("newMode")); }, () -> new DelegatedDefaultClusterCallback(), - rvcRunchangeToModeCommandParams); - rvcRunClusterInteractionInfoMap.put("changeToMode", rvcRunchangeToModeInteractionInfo); - Map rvcRunchangeToModeWithStatusCommandParams = + rvcRunModeSelectchangeToModeCommandParams); + rvcRunModeSelectClusterInteractionInfoMap.put( + "changeToMode", rvcRunModeSelectchangeToModeInteractionInfo); + Map rvcRunModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcRunchangeToModeWithStatusnewModeCommandParameterInfo = + CommandParameterInfo rvcRunModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcRunchangeToModeWithStatusCommandParams.put( - "newMode", rvcRunchangeToModeWithStatusnewModeCommandParameterInfo); + rvcRunModeSelectchangeToModeWithStatusCommandParams.put( + "newMode", rvcRunModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); - InteractionInfo rvcRunchangeToModeWithStatusInteractionInfo = + InteractionInfo rvcRunModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunCluster) cluster) + ((ChipClusters.RvcRunModeSelectCluster) cluster) .changeToModeWithStatus( - (ChipClusters.RvcRunCluster.ChangeToModeResponseCallback) callback, + (ChipClusters.RvcRunModeSelectCluster.ChangeToModeResponseCallback) callback, (Integer) commandArguments.get("newMode")); }, - () -> new DelegatedRvcRunClusterChangeToModeResponseCallback(), - rvcRunchangeToModeWithStatusCommandParams); - rvcRunClusterInteractionInfoMap.put( - "changeToModeWithStatus", rvcRunchangeToModeWithStatusInteractionInfo); - commandMap.put("rvcRun", rvcRunClusterInteractionInfoMap); - Map rvcCleanClusterInteractionInfoMap = new LinkedHashMap<>(); - Map rvcCleanchangeToModeCommandParams = + () -> new DelegatedRvcRunModeSelectClusterChangeToModeResponseCallback(), + rvcRunModeSelectchangeToModeWithStatusCommandParams); + rvcRunModeSelectClusterInteractionInfoMap.put( + "changeToModeWithStatus", rvcRunModeSelectchangeToModeWithStatusInteractionInfo); + commandMap.put("rvcRunModeSelect", rvcRunModeSelectClusterInteractionInfoMap); + Map rvcCleanModeSelectClusterInteractionInfoMap = + new LinkedHashMap<>(); + Map rvcCleanModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcCleanchangeToModenewModeCommandParameterInfo = + CommandParameterInfo rvcCleanModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcCleanchangeToModeCommandParams.put( - "newMode", rvcCleanchangeToModenewModeCommandParameterInfo); + rvcCleanModeSelectchangeToModeCommandParams.put( + "newMode", rvcCleanModeSelectchangeToModenewModeCommandParameterInfo); - InteractionInfo rvcCleanchangeToModeInteractionInfo = + InteractionInfo rvcCleanModeSelectchangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanCluster) cluster) + ((ChipClusters.RvcCleanModeSelectCluster) cluster) .changeToMode( (DefaultClusterCallback) callback, (Integer) commandArguments.get("newMode")); }, () -> new DelegatedDefaultClusterCallback(), - rvcCleanchangeToModeCommandParams); - rvcCleanClusterInteractionInfoMap.put("changeToMode", rvcCleanchangeToModeInteractionInfo); - Map rvcCleanchangeToModeWithStatusCommandParams = + rvcCleanModeSelectchangeToModeCommandParams); + rvcCleanModeSelectClusterInteractionInfoMap.put( + "changeToMode", rvcCleanModeSelectchangeToModeInteractionInfo); + Map rvcCleanModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcCleanchangeToModeWithStatusnewModeCommandParameterInfo = + CommandParameterInfo rvcCleanModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcCleanchangeToModeWithStatusCommandParams.put( - "newMode", rvcCleanchangeToModeWithStatusnewModeCommandParameterInfo); + rvcCleanModeSelectchangeToModeWithStatusCommandParams.put( + "newMode", rvcCleanModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); - InteractionInfo rvcCleanchangeToModeWithStatusInteractionInfo = + InteractionInfo rvcCleanModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanCluster) cluster) + ((ChipClusters.RvcCleanModeSelectCluster) cluster) .changeToModeWithStatus( - (ChipClusters.RvcCleanCluster.ChangeToModeResponseCallback) callback, + (ChipClusters.RvcCleanModeSelectCluster.ChangeToModeResponseCallback) + callback, (Integer) commandArguments.get("newMode")); }, - () -> new DelegatedRvcCleanClusterChangeToModeResponseCallback(), - rvcCleanchangeToModeWithStatusCommandParams); - rvcCleanClusterInteractionInfoMap.put( - "changeToModeWithStatus", rvcCleanchangeToModeWithStatusInteractionInfo); - commandMap.put("rvcClean", rvcCleanClusterInteractionInfoMap); + () -> new DelegatedRvcCleanModeSelectClusterChangeToModeResponseCallback(), + rvcCleanModeSelectchangeToModeWithStatusCommandParams); + rvcCleanModeSelectClusterInteractionInfoMap.put( + "changeToModeWithStatus", rvcCleanModeSelectchangeToModeWithStatusInteractionInfo); + commandMap.put("rvcCleanModeSelect", rvcCleanModeSelectClusterInteractionInfoMap); Map temperatureControlClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("temperatureControl", temperatureControlClusterInteractionInfoMap); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index f41eacb43123f9..44979e7104c365 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -3913,6 +3913,12 @@ class ChipClusters: "type": "str", "reportable": True, }, + 0x00000001: { + "attributeName": "StandardNamespace", + "attributeId": 0x00000001, + "type": "int", + "reportable": True, + }, 0x00000002: { "attributeName": "SupportedModes", "attributeId": 0x00000002, @@ -4067,8 +4073,8 @@ class ChipClusters: }, }, } - _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_INFO = { - "clusterName": "RefrigeratorAndTemperatureControlledCabinet", + _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_INFO = { + "clusterName": "RefrigeratorAndTemperatureControlledCabinetModeSelect", "clusterId": 0x00000052, "commands": { 0x00000000: { @@ -4157,8 +4163,8 @@ class ChipClusters: }, }, } - _RVC_RUN_CLUSTER_INFO = { - "clusterName": "RvcRun", + _RVC_RUN_MODE_SELECT_CLUSTER_INFO = { + "clusterName": "RvcRunModeSelect", "clusterId": 0x00000054, "commands": { 0x00000000: { @@ -4247,8 +4253,8 @@ class ChipClusters: }, }, } - _RVC_CLEAN_CLUSTER_INFO = { - "clusterName": "RvcClean", + _RVC_CLEAN_MODE_SELECT_CLUSTER_INFO = { + "clusterName": "RvcCleanModeSelect", "clusterId": 0x00000055, "commands": { 0x00000000: { @@ -10741,9 +10747,9 @@ class ChipClusters: 0x00000046: _ICD_MANAGEMENT_CLUSTER_INFO, 0x00000050: _MODE_SELECT_CLUSTER_INFO, 0x00000051: _LAUNDRY_WASHER_MODE_SELECT_CLUSTER_INFO, - 0x00000052: _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_INFO, - 0x00000054: _RVC_RUN_CLUSTER_INFO, - 0x00000055: _RVC_CLEAN_CLUSTER_INFO, + 0x00000052: _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_INFO, + 0x00000054: _RVC_RUN_MODE_SELECT_CLUSTER_INFO, + 0x00000055: _RVC_CLEAN_MODE_SELECT_CLUSTER_INFO, 0x00000059: _DISHWASHER_MODE_SELECT_CLUSTER_INFO, 0x0000005B: _AIR_QUALITY_CLUSTER_INFO, 0x0000005C: _SMOKE_CO_ALARM_CLUSTER_INFO, @@ -10829,9 +10835,9 @@ class ChipClusters: "IcdManagement": _ICD_MANAGEMENT_CLUSTER_INFO, "ModeSelect": _MODE_SELECT_CLUSTER_INFO, "LaundryWasherModeSelect": _LAUNDRY_WASHER_MODE_SELECT_CLUSTER_INFO, - "RefrigeratorAndTemperatureControlledCabinet": _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_INFO, - "RvcRun": _RVC_RUN_CLUSTER_INFO, - "RvcClean": _RVC_CLEAN_CLUSTER_INFO, + "RefrigeratorAndTemperatureControlledCabinetModeSelect": _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_INFO, + "RvcRunModeSelect": _RVC_RUN_MODE_SELECT_CLUSTER_INFO, + "RvcCleanModeSelect": _RVC_CLEAN_MODE_SELECT_CLUSTER_INFO, "DishwasherModeSelect": _DISHWASHER_MODE_SELECT_CLUSTER_INFO, "AirQuality": _AIR_QUALITY_CLUSTER_INFO, "SmokeCoAlarm": _SMOKE_CO_ALARM_CLUSTER_INFO, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index 667f213dc76c73..a762e4f7d08f81 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -14831,6 +14831,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), + ClusterObjectFieldDescriptor(Label="standardNamespace", Tag=0x00000001, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[ModeSelect.Structs.ModeOptionStruct]), ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000003, Type=uint), ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]), @@ -14844,6 +14845,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) description: 'str' = None + standardNamespace: 'typing.Union[None, Nullable, uint]' = None supportedModes: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None @@ -14985,6 +14987,22 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: value: 'str' = "" + @dataclass + class StandardNamespace(ClusterAttributeDescriptor): + @ChipUtility.classproperty + def cluster_id(cls) -> int: + return 0x0050 + + @ChipUtility.classproperty + def attribute_id(cls) -> int: + return 0x00000001 + + @ChipUtility.classproperty + def attribute_type(cls) -> ClusterObjectFieldDescriptor: + return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + + value: 'typing.Union[None, Nullable, uint]' = None + @dataclass class SupportedModes(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -15455,7 +15473,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class RefrigeratorAndTemperatureControlledCabinet(Cluster): +class RefrigeratorAndTemperatureControlledCabinetModeSelect(Cluster): id: typing.ClassVar[int] = 0x0052 @ChipUtility.classproperty @@ -15463,7 +15481,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[RefrigeratorAndTemperatureControlledCabinet.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]), ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000003, Type=uint), ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]), @@ -15476,7 +15494,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) description: 'str' = None - supportedModes: 'typing.List[RefrigeratorAndTemperatureControlledCabinet.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -15524,12 +15542,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[RefrigeratorAndTemperatureControlledCabinet.Structs.SemanticTagStruct]), + ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.SemanticTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - semanticTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinet.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) + semanticTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -15611,9 +15629,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[RefrigeratorAndTemperatureControlledCabinet.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]) - value: 'typing.List[RefrigeratorAndTemperatureControlledCabinet.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -15761,7 +15779,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class RvcRun(Cluster): +class RvcRunModeSelect(Cluster): id: typing.ClassVar[int] = 0x0054 @ChipUtility.classproperty @@ -15769,7 +15787,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[RvcRun.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]), ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000003, Type=uint), ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]), @@ -15782,7 +15800,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) description: 'str' = None - supportedModes: 'typing.List[RvcRun.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -15844,12 +15862,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[RvcRun.Structs.SemanticTagStruct]), + ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[RvcRunModeSelect.Structs.SemanticTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - semanticTags: 'typing.List[RvcRun.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) + semanticTags: 'typing.List[RvcRunModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -15931,9 +15949,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[RvcRun.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]) - value: 'typing.List[RvcRun.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -16081,7 +16099,7 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class RvcClean(Cluster): +class RvcCleanModeSelect(Cluster): id: typing.ClassVar[int] = 0x0055 @ChipUtility.classproperty @@ -16089,7 +16107,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[RvcClean.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]), ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000003, Type=uint), ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000004, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000005, Type=typing.Union[None, Nullable, uint]), @@ -16102,7 +16120,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) description: 'str' = None - supportedModes: 'typing.List[RvcClean.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -16159,12 +16177,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[RvcClean.Structs.SemanticTagStruct]), + ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[RvcCleanModeSelect.Structs.SemanticTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - semanticTags: 'typing.List[RvcClean.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) + semanticTags: 'typing.List[RvcCleanModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -16246,9 +16264,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[RvcClean.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]) - value: 'typing.List[RvcClean.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 3e8b935d58fd02..cd95046ce0b923 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -8784,6 +8784,21 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster( value = [[NSString alloc] initWithBytes:cppValue.data() length:cppValue.size() encoding:NSUTF8StringEncoding]; return value; } + case Attributes::StandardNamespace::Id: { + using TypeInfo = Attributes::StandardNamespace::TypeInfo; + TypeInfo::DecodableType cppValue; + *aError = DataModel::Decode(aReader, cppValue); + if (*aError != CHIP_NO_ERROR) { + return nil; + } + NSNumber * _Nullable value; + if (cppValue.IsNull()) { + value = nil; + } else { + value = [NSNumber numberWithUnsignedShort:cppValue.Value()]; + } + return value; + } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -9246,10 +9261,10 @@ static id _Nullable DecodeAttributeValueForLaundryWasherModeSelectCluster( *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; return nil; } -static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledCabinetCluster( +static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledCabinetModeSelectCluster( AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { - using namespace Clusters::RefrigeratorAndTemperatureControlledCabinet; + using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; switch (aAttributeId) { case Attributes::Description::Id: { using TypeInfo = Attributes::Description::TypeInfo; @@ -9275,8 +9290,8 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct * newElement_0; - newElement_0 = [MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct new]; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct * newElement_0; + newElement_0 = [MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct new]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; @@ -9286,8 +9301,8 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct * newElement_2; - newElement_2 = [MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct new]; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct new]; newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; @@ -9485,9 +9500,10 @@ static id _Nullable DecodeAttributeValueForRefrigeratorAndTemperatureControlledC *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; return nil; } -static id _Nullable DecodeAttributeValueForRVCRunCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) +static id _Nullable DecodeAttributeValueForRVCRunModeSelectCluster( + AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { - using namespace Clusters::RvcRun; + using namespace Clusters::RvcRunModeSelect; switch (aAttributeId) { case Attributes::Description::Id: { using TypeInfo = Attributes::Description::TypeInfo; @@ -9513,8 +9529,8 @@ static id _Nullable DecodeAttributeValueForRVCRunCluster(AttributeId aAttributeI auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRRVCRunClusterModeOptionStruct * newElement_0; - newElement_0 = [MTRRVCRunClusterModeOptionStruct new]; + MTRRVCRunModeSelectClusterModeOptionStruct * newElement_0; + newElement_0 = [MTRRVCRunModeSelectClusterModeOptionStruct new]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; @@ -9524,8 +9540,8 @@ static id _Nullable DecodeAttributeValueForRVCRunCluster(AttributeId aAttributeI auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRRVCRunClusterSemanticTagStruct * newElement_2; - newElement_2 = [MTRRVCRunClusterSemanticTagStruct new]; + MTRRVCRunModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRRVCRunModeSelectClusterSemanticTagStruct new]; newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; @@ -9723,9 +9739,10 @@ static id _Nullable DecodeAttributeValueForRVCRunCluster(AttributeId aAttributeI *aError = CHIP_ERROR_IM_MALFORMED_ATTRIBUTE_PATH_IB; return nil; } -static id _Nullable DecodeAttributeValueForRVCCleanCluster(AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) +static id _Nullable DecodeAttributeValueForRVCCleanModeSelectCluster( + AttributeId aAttributeId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { - using namespace Clusters::RvcClean; + using namespace Clusters::RvcCleanModeSelect; switch (aAttributeId) { case Attributes::Description::Id: { using TypeInfo = Attributes::Description::TypeInfo; @@ -9751,8 +9768,8 @@ static id _Nullable DecodeAttributeValueForRVCCleanCluster(AttributeId aAttribut auto iter_0 = cppValue.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRRVCCleanClusterModeOptionStruct * newElement_0; - newElement_0 = [MTRRVCCleanClusterModeOptionStruct new]; + MTRRVCCleanModeSelectClusterModeOptionStruct * newElement_0; + newElement_0 = [MTRRVCCleanModeSelectClusterModeOptionStruct new]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; @@ -9762,8 +9779,8 @@ static id _Nullable DecodeAttributeValueForRVCCleanCluster(AttributeId aAttribut auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRRVCCleanClusterSemanticTagStruct * newElement_2; - newElement_2 = [MTRRVCCleanClusterSemanticTagStruct new]; + MTRRVCCleanModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRRVCCleanModeSelectClusterSemanticTagStruct new]; newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; @@ -23664,14 +23681,15 @@ id _Nullable MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::T case Clusters::LaundryWasherModeSelect::Id: { return DecodeAttributeValueForLaundryWasherModeSelectCluster(aPath.mAttributeId, aReader, aError); } - case Clusters::RefrigeratorAndTemperatureControlledCabinet::Id: { - return DecodeAttributeValueForRefrigeratorAndTemperatureControlledCabinetCluster(aPath.mAttributeId, aReader, aError); + case Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + return DecodeAttributeValueForRefrigeratorAndTemperatureControlledCabinetModeSelectCluster( + aPath.mAttributeId, aReader, aError); } - case Clusters::RvcRun::Id: { - return DecodeAttributeValueForRVCRunCluster(aPath.mAttributeId, aReader, aError); + case Clusters::RvcRunModeSelect::Id: { + return DecodeAttributeValueForRVCRunModeSelectCluster(aPath.mAttributeId, aReader, aError); } - case Clusters::RvcClean::Id: { - return DecodeAttributeValueForRVCCleanCluster(aPath.mAttributeId, aReader, aError); + case Clusters::RvcCleanModeSelect::Id: { + return DecodeAttributeValueForRVCCleanModeSelectCluster(aPath.mAttributeId, aReader, aError); } case Clusters::TemperatureControl::Id: { return DecodeAttributeValueForTemperatureControlCluster(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 b7ae3ca56c609c..ca8854980ac53b 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -7726,6 +7726,19 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) completion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +- (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion + API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +- (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams *)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler + API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); ++ (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completion: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion + API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); + - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams *)params @@ -8052,13 +8065,13 @@ MTR_NEWLY_AVAILABLE @end /** - * Cluster Refrigerator And Temperature Controlled Cabinet + * Cluster Refrigerator And Temperature Controlled Cabinet Mode Select * * This cluster is an alias of the Mode Select cluster, defining additional semantics and namespaced enumerated values for refrigerator and temperature controlled cabinet devices. */ MTR_NEWLY_AVAILABLE -@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet : MTRCluster +@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID @@ -8073,7 +8086,7 @@ MTR_NEWLY_AVAILABLE Mode field in an entry of the SupportedModes list and the device is able to transition as requested the server SHALL set the CurrentMode attribute to the NewMode value and SHALL respond with a SUCCESS status response. */ -- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** * Command ChangeToModeWithStatus @@ -8083,10 +8096,11 @@ MTR_NEWLY_AVAILABLE NewMode field, see ChangeToMode command. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ - (void) - changeToModeWithStatusWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams *)params + changeToModeWithStatusWithParams: + (MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams *)params completion: (void (^)( - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams * _Nullable data, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion @@ -8236,13 +8250,13 @@ MTR_NEWLY_AVAILABLE @end /** - * Cluster RVC Run + * Cluster RVC Run Mode Select * * This cluster is an alias of the Mode Select cluster which also defines a namespace for the running modes of the Robotic Vacuum * Cleaner devices. */ MTR_NEWLY_AVAILABLE -@interface MTRBaseClusterRVCRun : MTRCluster +@interface MTRBaseClusterRVCRunModeSelect : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID @@ -8257,7 +8271,7 @@ MTR_NEWLY_AVAILABLE Mode field in an entry of the SupportedModes list and the device is able to transition as requested the server SHALL set the CurrentMode attribute to the NewMode value and SHALL respond with a SUCCESS status response. */ -- (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRVCRunModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** * Command ChangeToModeWithStatus @@ -8266,8 +8280,8 @@ MTR_NEWLY_AVAILABLE response with an ability for clients to determine causes of failures with fine-grained details. For status response depending on NewMode field, see ChangeToMode command. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ -- (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatusParams *)params - completion:(void (^)(MTRRVCRunClusterChangeToModeResponseParams * _Nullable data, +- (void)changeToModeWithStatusWithParams:(MTRRVCRunModeSelectClusterChangeToModeWithStatusParams *)params + completion:(void (^)(MTRRVCRunModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion @@ -8417,13 +8431,13 @@ MTR_NEWLY_AVAILABLE @end /** - * Cluster RVC Clean + * Cluster RVC Clean Mode Select * * This cluster is an alias of the Mode Select cluster which also defines a namespace for the cleaning type of the Robotic Vacuum Cleaner devices. */ MTR_NEWLY_AVAILABLE -@interface MTRBaseClusterRVCClean : MTRCluster +@interface MTRBaseClusterRVCCleanModeSelect : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID @@ -8438,7 +8452,7 @@ MTR_NEWLY_AVAILABLE Mode field in an entry of the SupportedModes list and the device is able to transition as requested the server SHALL set the CurrentMode attribute to the NewMode value and SHALL respond with a SUCCESS status response. */ -- (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRVCCleanModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; /** * Command ChangeToModeWithStatus @@ -8447,8 +8461,8 @@ MTR_NEWLY_AVAILABLE response with an ability for clients to determine causes of failures with fine-grained details. For status response depending on NewMode field, see ChangeToMode command. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ -- (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStatusParams *)params - completion:(void (^)(MTRRVCCleanClusterChangeToModeResponseParams * _Nullable data, +- (void)changeToModeWithStatusWithParams:(MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams *)params + completion:(void (^)(MTRRVCCleanModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion @@ -24135,49 +24149,49 @@ typedef NS_OPTIONS(uint32_t, MTRLaundryWasherModeSelectModeSelectFeature) { MTRLaundryWasherModeSelectModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, } MTR_NEWLY_AVAILABLE; -typedef NS_ENUM(uint16_t, MTRRefrigeratorAndTemperatureControlledCabinetSemanticTags) { - MTRRefrigeratorAndTemperatureControlledCabinetSemanticTagsRapidCool MTR_NEWLY_AVAILABLE = 0x4000, - MTRRefrigeratorAndTemperatureControlledCabinetSemanticTagsRapidFreeze MTR_NEWLY_AVAILABLE = 0x4001, +typedef NS_ENUM(uint16_t, MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSemanticTags) { + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSemanticTagsRapidCool MTR_NEWLY_AVAILABLE = 0x4000, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSemanticTagsRapidFreeze MTR_NEWLY_AVAILABLE = 0x4001, } MTR_NEWLY_AVAILABLE; -typedef NS_OPTIONS(uint32_t, MTRRefrigeratorAndTemperatureControlledCabinetModeSelectFeature) { - MTRRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureOnOff MTR_NEWLY_AVAILABLE = 0x1, - MTRRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, +typedef NS_OPTIONS(uint32_t, MTRRefrigeratorAndTemperatureControlledCabinetModeSelectModeSelectFeature) { + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectModeSelectFeatureOnOff MTR_NEWLY_AVAILABLE = 0x1, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, } MTR_NEWLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRRVCRunChangeToModeResponseStatus) { - MTRRVCRunChangeToModeResponseStatusBatteryLow MTR_NEWLY_AVAILABLE = 0x40, - MTRRVCRunChangeToModeResponseStatusRobotStuck MTR_NEWLY_AVAILABLE = 0x41, - MTRRVCRunChangeToModeResponseStatusBinMissing MTR_NEWLY_AVAILABLE = 0x42, - MTRRVCRunChangeToModeResponseStatusBinFull MTR_NEWLY_AVAILABLE = 0x43, - MTRRVCRunChangeToModeResponseStatusWaterTankMissing MTR_NEWLY_AVAILABLE = 0x44, - MTRRVCRunChangeToModeResponseStatusWaterTankLidOpen MTR_NEWLY_AVAILABLE = 0x45, - MTRRVCRunChangeToModeResponseStatusCleaningPadMissing MTR_NEWLY_AVAILABLE = 0x46, +typedef NS_ENUM(uint8_t, MTRRVCRunModeSelectChangeToModeResponseStatus) { + MTRRVCRunModeSelectChangeToModeResponseStatusBatteryLow MTR_NEWLY_AVAILABLE = 0x40, + MTRRVCRunModeSelectChangeToModeResponseStatusRobotStuck MTR_NEWLY_AVAILABLE = 0x41, + MTRRVCRunModeSelectChangeToModeResponseStatusBinMissing MTR_NEWLY_AVAILABLE = 0x42, + MTRRVCRunModeSelectChangeToModeResponseStatusBinFull MTR_NEWLY_AVAILABLE = 0x43, + MTRRVCRunModeSelectChangeToModeResponseStatusWaterTankMissing MTR_NEWLY_AVAILABLE = 0x44, + MTRRVCRunModeSelectChangeToModeResponseStatusWaterTankLidOpen MTR_NEWLY_AVAILABLE = 0x45, + MTRRVCRunModeSelectChangeToModeResponseStatusCleaningPadMissing MTR_NEWLY_AVAILABLE = 0x46, } MTR_NEWLY_AVAILABLE; -typedef NS_ENUM(uint16_t, MTRRVCRunSemanticTags) { - MTRRVCRunSemanticTagsIdle MTR_NEWLY_AVAILABLE = 0x4000, - MTRRVCRunSemanticTagsCleaning MTR_NEWLY_AVAILABLE = 0x4001, +typedef NS_ENUM(uint16_t, MTRRVCRunModeSelectSemanticTags) { + MTRRVCRunModeSelectSemanticTagsIdle MTR_NEWLY_AVAILABLE = 0x4000, + MTRRVCRunModeSelectSemanticTagsCleaning MTR_NEWLY_AVAILABLE = 0x4001, } MTR_NEWLY_AVAILABLE; -typedef NS_OPTIONS(uint32_t, MTRRVCRunModeSelectFeature) { - MTRRVCRunModeSelectFeatureOnOff MTR_NEWLY_AVAILABLE = 0x1, - MTRRVCRunModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, +typedef NS_OPTIONS(uint32_t, MTRRVCRunModeSelectModeSelectFeature) { + MTRRVCRunModeSelectModeSelectFeatureOnOff MTR_NEWLY_AVAILABLE = 0x1, + MTRRVCRunModeSelectModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, } MTR_NEWLY_AVAILABLE; -typedef NS_ENUM(uint8_t, MTRRVCCleanChangeToModeResponseStatus) { - MTRRVCCleanChangeToModeResponseStatusCleaningInProgress MTR_NEWLY_AVAILABLE = 0x40, +typedef NS_ENUM(uint8_t, MTRRVCCleanModeSelectChangeToModeResponseStatus) { + MTRRVCCleanModeSelectChangeToModeResponseStatusCleaningInProgress MTR_NEWLY_AVAILABLE = 0x40, } MTR_NEWLY_AVAILABLE; -typedef NS_ENUM(uint16_t, MTRRVCCleanSemanticTags) { - MTRRVCCleanSemanticTagsDeepClean MTR_NEWLY_AVAILABLE = 0x4000, - MTRRVCCleanSemanticTagsVacuum MTR_NEWLY_AVAILABLE = 0x4001, - MTRRVCCleanSemanticTagsMop MTR_NEWLY_AVAILABLE = 0x4002, +typedef NS_ENUM(uint16_t, MTRRVCCleanModeSelectSemanticTags) { + MTRRVCCleanModeSelectSemanticTagsDeepClean MTR_NEWLY_AVAILABLE = 0x4000, + MTRRVCCleanModeSelectSemanticTagsVacuum MTR_NEWLY_AVAILABLE = 0x4001, + MTRRVCCleanModeSelectSemanticTagsMop MTR_NEWLY_AVAILABLE = 0x4002, } MTR_NEWLY_AVAILABLE; -typedef NS_OPTIONS(uint32_t, MTRRVCCleanModeSelectFeature) { - MTRRVCCleanModeSelectFeatureOnOff MTR_NEWLY_AVAILABLE = 0x1, - MTRRVCCleanModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, +typedef NS_OPTIONS(uint32_t, MTRRVCCleanModeSelectModeSelectFeature) { + MTRRVCCleanModeSelectModeSelectFeatureOnOff MTR_NEWLY_AVAILABLE = 0x1, + MTRRVCCleanModeSelectModeSelectFeatureExtendedStatus MTR_NEWLY_AVAILABLE = 0x2, } MTR_NEWLY_AVAILABLE; typedef NS_OPTIONS(uint32_t, MTRTemperatureControlFeature) { @@ -35672,6 +35686,27 @@ typedef NS_ENUM(uint8_t, MTRFaultInjectionFaultType) { MTR_DEPRECATED("Please use readAttributeDescriptionWithAttributeCache:endpoint:queue:completion:", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); +- (void)readAttributeStandardNamespaceWithCompletionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler + MTR_DEPRECATED("Please use readAttributeStandardNamespaceWithCompletion:", ios(16.1, 16.4), macos(13.0, 13.3), + watchos(9.1, 9.4), tvos(16.1, 16.4)); +- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(MTRSubscribeParams * _Nullable)params + subscriptionEstablished: + (MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler + MTR_DEPRECATED("Please use subscribeAttributeStandardNamespaceWithParams:subscriptionEstablished:", ios(16.1, 16.4), + macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); ++ (void)readAttributeStandardNamespaceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler + MTR_DEPRECATED("Please use readAttributeStandardNamespaceWithAttributeCache:endpoint:queue:completion:", ios(16.1, 16.4), + macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)); + - (void)readAttributeSupportedModesWithCompletionHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completionHandler MTR_DEPRECATED("Please use readAttributeSupportedModesWithCompletion:", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index ca3fb8c82dad0a..385d11582feebc 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -46763,6 +46763,50 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta }); } +- (void)readAttributeStandardNamespaceWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + MTRReadParams * params = [[MTRReadParams alloc] init]; + using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo; + return MTRReadAttribute( + params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); +} + +- (void)subscribeAttributeStandardNamespaceWithParams:(MTRSubscribeParams * _Nonnull)params + subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished + reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo; + MTRSubscribeAttribute(params, + subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), + TypeInfo::GetAttributeId()); +} + ++ (void)readAttributeStandardNamespaceWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completion: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion +{ + auto * bridge = new MTRNullableInt16uAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction( + clusterStateCacheContainer.baseDevice, ^(NullableInt16uAttributeCallback successCb, MTRErrorCallback failureCb) { + if (clusterStateCacheContainer.cppClusterStateCache) { + chip::app::ConcreteAttributePath path; + using TypeInfo = ModeSelect::Attributes::StandardNamespace::TypeInfo; + path.mEndpointId = static_cast([endpoint unsignedShortValue]); + path.mClusterId = TypeInfo::GetClusterId(); + path.mAttributeId = TypeInfo::GetAttributeId(); + TypeInfo::DecodableType value; + CHIP_ERROR err = clusterStateCacheContainer.cppClusterStateCache->Get(path, value); + if (err == CHIP_NO_ERROR) { + successCb(bridge, value); + } + return err; + } + return CHIP_ERROR_NOT_FOUND; + }); +} + - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; @@ -47346,6 +47390,51 @@ + (void)readAttributeDescriptionWithAttributeCache:(MTRAttributeCacheContainer * }]; } +- (void)readAttributeStandardNamespaceWithCompletionHandler:(void (^)(NSNumber * _Nullable value, + NSError * _Nullable error))completionHandler +{ + [self readAttributeStandardNamespaceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + // Cast is safe because subclass does not add any selectors. + completionHandler(static_cast(value), error); + }]; +} +- (void)subscribeAttributeStandardNamespaceWithMinInterval:(NSNumber * _Nonnull)minInterval + maxInterval:(NSNumber * _Nonnull)maxInterval + params:(MTRSubscribeParams * _Nullable)params + subscriptionEstablished: + (MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler + reportHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler +{ + MTRSubscribeParams * _Nullable subscribeParams = [params copy]; + if (subscribeParams == nil) { + subscribeParams = [[MTRSubscribeParams alloc] initWithMinInterval:minInterval maxInterval:maxInterval]; + } else { + subscribeParams.minInterval = minInterval; + subscribeParams.maxInterval = maxInterval; + } + [self subscribeAttributeStandardNamespaceWithParams:subscribeParams + subscriptionEstablished:subscriptionEstablishedHandler + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + // Cast is safe because subclass does not add any selectors. + reportHandler(static_cast(value), error); + }]; +} ++ (void)readAttributeStandardNamespaceWithAttributeCache:(MTRAttributeCacheContainer *)attributeCacheContainer + endpoint:(NSNumber *)endpoint + queue:(dispatch_queue_t)queue + completionHandler: + (void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler +{ + [self readAttributeStandardNamespaceWithClusterStateCache:attributeCacheContainer.realContainer + endpoint:endpoint + queue:queue + completion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + // Cast is safe because subclass does not add any selectors. + completionHandler(static_cast(value), error); + }]; +} + - (void)readAttributeSupportedModesWithCompletionHandler:(void (^)( NSArray * _Nullable value, NSError * _Nullable error))completionHandler { @@ -48416,7 +48505,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC @end -@implementation MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet +@implementation MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -48431,7 +48520,7 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en return self; } -- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion { // Make a copy of params before we go async. @@ -48447,7 +48536,7 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToMode::Type request; + RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { params.timedInvokeTimeoutMs = MTRClampedNumber(params.timedInvokeTimeoutMs, @(1), @(UINT16_MAX)); @@ -48469,25 +48558,27 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl } - (void) - changeToModeWithStatusWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams *)params + changeToModeWithStatusWithParams: + (MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams *)params completion: (void (^)( - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams * _Nullable data, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion { // Make a copy of params before we go async. params = [params copy]; - auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackBridge(self.callbackQueue, - completion, + auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge( + self.callbackQueue, completion, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - RefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackType successCb, + RefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { auto * typedBridge - = static_cast(bridge); + = static_cast( + bridge); Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeWithStatus::Type request; + RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { params.timedInvokeTimeoutMs = MTRClampedNumber(params.timedInvokeTimeoutMs, @(1), @(UINT16_MAX)); @@ -48511,7 +48602,7 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::Description::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::Description::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48520,7 +48611,7 @@ - (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::Description::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::Description::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -48536,7 +48627,7 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::Description::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::Description::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48554,9 +48645,9 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::SupportedModes::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::SupportedModes::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48564,10 +48655,11 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::SupportedModes::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, - self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::SupportedModes::TypeInfo; + MTRSubscribeAttribute< + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackSubscriptionBridge, NSArray, + TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -48575,12 +48667,14 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge(queue, completion); + auto * bridge + = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallback successCb, + MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::SupportedModes::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::SupportedModes::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48598,7 +48692,7 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::CurrentMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48607,7 +48701,7 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::CurrentMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -48623,7 +48717,7 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(Int8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::CurrentMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48641,7 +48735,7 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48673,7 +48767,7 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value } ListFreer listFreer; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -48692,7 +48786,7 @@ - (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -48708,7 +48802,7 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48726,7 +48820,7 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::OnMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48758,7 +48852,7 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value } ListFreer listFreer; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::OnMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -48777,7 +48871,7 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::OnMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -48793,7 +48887,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::OnMode::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48811,9 +48905,9 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::GeneratedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::GeneratedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48822,8 +48916,9 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _ reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::GeneratedCommandList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48834,14 +48929,14 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge - = new MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge( + queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallback successCb, + ^(RefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::GeneratedCommandList::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::GeneratedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48859,9 +48954,9 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::AcceptedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AcceptedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48870,10 +48965,11 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::AcceptedCommandList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, - self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AcceptedCommandList::TypeInfo; + MTRSubscribeAttribute< + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge, NSArray, + TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -48882,14 +48978,14 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge - = new MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge( + queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallback successCb, + ^(RefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::AcceptedCommandList::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AcceptedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48907,8 +49003,8 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::EventList::TypeInfo; - return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48917,10 +49013,10 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::EventList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, - TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::EventList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, + self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -48928,12 +49024,14 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge(queue, completion); + auto * bridge + = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallback successCb, + MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::EventList::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::EventList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48951,9 +49049,9 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::AttributeList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AttributeList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -48961,10 +49059,11 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::AttributeList::TypeInfo; - MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, - self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AttributeList::TypeInfo; + MTRSubscribeAttribute< + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackSubscriptionBridge, NSArray, + TypeInfo::DecodableType>(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -48972,12 +49071,14 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge(queue, completion); + auto * bridge + = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallback successCb, + MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::AttributeList::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AttributeList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -48995,7 +49096,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::FeatureMap::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49004,7 +49105,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::FeatureMap::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49020,7 +49121,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(Int32uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::FeatureMap::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49038,7 +49139,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::ClusterRevision::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49047,7 +49148,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::ClusterRevision::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49064,7 +49165,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RefrigeratorAndTemperatureControlledCabinet::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::ClusterRevision::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49081,7 +49182,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC @end -@implementation MTRBaseClusterRVCRun +@implementation MTRBaseClusterRVCRunModeSelect - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -49096,7 +49197,7 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en return self; } -- (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion +- (void)changeToModeWithParams:(MTRRVCRunModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion { // Make a copy of params before we go async. params = [params copy]; @@ -49111,7 +49212,7 @@ - (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params comp Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcRun::Commands::ChangeToMode::Type request; + RvcRunModeSelect::Commands::ChangeToMode::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { params.timedInvokeTimeoutMs = MTRClampedNumber(params.timedInvokeTimeoutMs, @(1), @(UINT16_MAX)); @@ -49132,20 +49233,21 @@ - (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params comp std::move(*bridge).DispatchAction(self.device); } -- (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatusParams *)params - completion:(void (^)(MTRRVCRunClusterChangeToModeResponseParams * _Nullable data, +- (void)changeToModeWithStatusWithParams:(MTRRVCRunModeSelectClusterChangeToModeWithStatusParams *)params + completion:(void (^)(MTRRVCRunModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion { // Make a copy of params before we go async. params = [params copy]; - auto * bridge = new MTRRVCRunClusterChangeToModeResponseCallbackBridge(self.callbackQueue, completion, - ^(ExchangeManager & exchangeManager, const SessionHandle & session, RVCRunClusterChangeToModeResponseCallbackType successCb, - MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge = static_cast(bridge); + auto * bridge = new MTRRVCRunModeSelectClusterChangeToModeResponseCallbackBridge(self.callbackQueue, completion, + ^(ExchangeManager & exchangeManager, const SessionHandle & session, + RVCRunModeSelectClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, + MTRCallbackBridgeBase * bridge) { + auto * typedBridge = static_cast(bridge); Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcRun::Commands::ChangeToModeWithStatus::Type request; + RvcRunModeSelect::Commands::ChangeToModeWithStatus::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { params.timedInvokeTimeoutMs = MTRClampedNumber(params.timedInvokeTimeoutMs, @(1), @(UINT16_MAX)); @@ -49169,7 +49271,7 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatus - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::Description::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::Description::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49178,7 +49280,7 @@ - (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::Description::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::Description::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49194,7 +49296,7 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::Description::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::Description::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49212,8 +49314,8 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::SupportedModes::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcRunModeSelect::Attributes::SupportedModes::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49221,10 +49323,10 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::SupportedModes::TypeInfo; - MTRSubscribeAttribute(params, - subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcRunModeSelect::Attributes::SupportedModes::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -49232,12 +49334,12 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCRunSupportedModesListAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction( - clusterStateCacheContainer.baseDevice, ^(RVCRunSupportedModesListAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, + ^(RVCRunModeSelectSupportedModesListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::SupportedModes::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::SupportedModes::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49255,7 +49357,7 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::CurrentMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49264,7 +49366,7 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::CurrentMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49280,7 +49382,7 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(Int8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::CurrentMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49298,7 +49400,7 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::StartUpMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49330,7 +49432,7 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value } ListFreer listFreer; - using TypeInfo = RvcRun::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -49349,7 +49451,7 @@ - (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::StartUpMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49365,7 +49467,7 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::StartUpMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49383,7 +49485,7 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::OnMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49415,7 +49517,7 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value } ListFreer listFreer; - using TypeInfo = RvcRun::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -49434,7 +49536,7 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::OnMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49450,7 +49552,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::OnMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49468,8 +49570,8 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::GeneratedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcRunModeSelect::Attributes::GeneratedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49478,10 +49580,10 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _ reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::GeneratedCommandList::TypeInfo; - MTRSubscribeAttribute( - params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcRunModeSelect::Attributes::GeneratedCommandList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -49490,12 +49592,12 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCRunGeneratedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RVCRunGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RVCRunModeSelectGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::GeneratedCommandList::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::GeneratedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49513,8 +49615,8 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::AcceptedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcRunModeSelect::Attributes::AcceptedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49523,10 +49625,10 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::AcceptedCommandList::TypeInfo; - MTRSubscribeAttribute( - params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcRunModeSelect::Attributes::AcceptedCommandList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -49535,12 +49637,12 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCRunAcceptedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RVCRunAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RVCRunModeSelectAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::AcceptedCommandList::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::AcceptedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49558,8 +49660,8 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::EventList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcRunModeSelect::Attributes::EventList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49567,9 +49669,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::EventList::TypeInfo; - MTRSubscribeAttribute(params, - subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), + using TypeInfo = RvcRunModeSelect::Attributes::EventList::TypeInfo; + MTRSubscribeAttribute( + params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49578,12 +49680,12 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCRunEventListListAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction( - clusterStateCacheContainer.baseDevice, ^(RVCRunEventListListAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTRRVCRunModeSelectEventListListAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, + ^(RVCRunModeSelectEventListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::EventList::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::EventList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49601,8 +49703,8 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::AttributeList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcRunModeSelect::Attributes::AttributeList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49610,10 +49712,10 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::AttributeList::TypeInfo; - MTRSubscribeAttribute(params, - subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcRunModeSelect::Attributes::AttributeList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -49621,12 +49723,12 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCRunAttributeListListAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction( - clusterStateCacheContainer.baseDevice, ^(RVCRunAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, + ^(RVCRunModeSelectAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::AttributeList::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::AttributeList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49644,7 +49746,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::FeatureMap::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49653,7 +49755,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::FeatureMap::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49669,7 +49771,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(Int32uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::FeatureMap::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49687,7 +49789,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcRun::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::ClusterRevision::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49696,7 +49798,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcRun::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::ClusterRevision::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49713,7 +49815,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcRun::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RvcRunModeSelect::Attributes::ClusterRevision::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49730,7 +49832,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC @end -@implementation MTRBaseClusterRVCClean +@implementation MTRBaseClusterRVCCleanModeSelect - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -49745,7 +49847,7 @@ - (instancetype)initWithDevice:(MTRBaseDevice *)device endpointID:(NSNumber *)en return self; } -- (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion +- (void)changeToModeWithParams:(MTRRVCCleanModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion { // Make a copy of params before we go async. params = [params copy]; @@ -49760,7 +49862,7 @@ - (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params co Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcClean::Commands::ChangeToMode::Type request; + RvcCleanModeSelect::Commands::ChangeToMode::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { params.timedInvokeTimeoutMs = MTRClampedNumber(params.timedInvokeTimeoutMs, @(1), @(UINT16_MAX)); @@ -49781,20 +49883,21 @@ - (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params co std::move(*bridge).DispatchAction(self.device); } -- (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStatusParams *)params - completion:(void (^)(MTRRVCCleanClusterChangeToModeResponseParams * _Nullable data, +- (void)changeToModeWithStatusWithParams:(MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams *)params + completion:(void (^)(MTRRVCCleanModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion { // Make a copy of params before we go async. params = [params copy]; - auto * bridge = new MTRRVCCleanClusterChangeToModeResponseCallbackBridge(self.callbackQueue, completion, + auto * bridge = new MTRRVCCleanModeSelectClusterChangeToModeResponseCallbackBridge(self.callbackQueue, completion, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - RVCCleanClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge = static_cast(bridge); + RVCCleanModeSelectClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, + MTRCallbackBridgeBase * bridge) { + auto * typedBridge = static_cast(bridge); Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcClean::Commands::ChangeToModeWithStatus::Type request; + RvcCleanModeSelect::Commands::ChangeToModeWithStatus::Type request; if (params != nil) { if (params.timedInvokeTimeoutMs != nil) { params.timedInvokeTimeoutMs = MTRClampedNumber(params.timedInvokeTimeoutMs, @(1), @(UINT16_MAX)); @@ -49818,7 +49921,7 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStat - (void)readAttributeDescriptionWithCompletion:(void (^)(NSString * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::Description::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::Description::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49827,7 +49930,7 @@ - (void)subscribeAttributeDescriptionWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSString * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::Description::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::Description::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49843,7 +49946,7 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(CharStringAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::Description::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::Description::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49861,8 +49964,8 @@ + (void)readAttributeDescriptionWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeSupportedModesWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::SupportedModes::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcCleanModeSelect::Attributes::SupportedModes::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49870,10 +49973,10 @@ - (void)subscribeAttributeSupportedModesWithParams:(MTRSubscribeParams * _Nonnul subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::SupportedModes::TypeInfo; - MTRSubscribeAttribute( - params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcCleanModeSelect::Attributes::SupportedModes::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -49881,12 +49984,12 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCCleanSupportedModesListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RVCCleanSupportedModesListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RVCCleanModeSelectSupportedModesListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::SupportedModes::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::SupportedModes::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49904,7 +50007,7 @@ + (void)readAttributeSupportedModesWithClusterStateCache:(MTRClusterStateCacheCo - (void)readAttributeCurrentModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::CurrentMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49913,7 +50016,7 @@ - (void)subscribeAttributeCurrentModeWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::CurrentMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -49929,7 +50032,7 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(Int8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::CurrentMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::CurrentMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -49947,7 +50050,7 @@ + (void)readAttributeCurrentModeWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeStartUpModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::StartUpMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -49979,7 +50082,7 @@ - (void)writeAttributeStartUpModeWithValue:(NSNumber * _Nullable)value } ListFreer listFreer; - using TypeInfo = RvcClean::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -49998,7 +50101,7 @@ - (void)subscribeAttributeStartUpModeWithParams:(MTRSubscribeParams * _Nonnull)p subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::StartUpMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -50014,7 +50117,7 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::StartUpMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::StartUpMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50032,7 +50135,7 @@ + (void)readAttributeStartUpModeWithClusterStateCache:(MTRClusterStateCacheConta - (void)readAttributeOnModeWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::OnMode::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50064,7 +50167,7 @@ - (void)writeAttributeOnModeWithValue:(NSNumber * _Nullable)value } ListFreer listFreer; - using TypeInfo = RvcClean::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; if (value == nil) { cppValue.SetNull(); @@ -50083,7 +50186,7 @@ - (void)subscribeAttributeOnModeWithParams:(MTRSubscribeParams * _Nonnull)params subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::OnMode::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -50099,7 +50202,7 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer clusterStateCacheContainer.baseDevice, ^(NullableInt8uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::OnMode::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::OnMode::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50117,8 +50220,8 @@ + (void)readAttributeOnModeWithClusterStateCache:(MTRClusterStateCacheContainer - (void)readAttributeGeneratedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::GeneratedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcCleanModeSelect::Attributes::GeneratedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50127,10 +50230,10 @@ - (void)subscribeAttributeGeneratedCommandListWithParams:(MTRSubscribeParams * _ reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::GeneratedCommandList::TypeInfo; - MTRSubscribeAttribute( - params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcCleanModeSelect::Attributes::GeneratedCommandList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -50139,12 +50242,12 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RVCCleanGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RVCCleanModeSelectGeneratedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::GeneratedCommandList::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::GeneratedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50162,8 +50265,8 @@ + (void)readAttributeGeneratedCommandListWithClusterStateCache:(MTRClusterStateC - (void)readAttributeAcceptedCommandListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::AcceptedCommandList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcCleanModeSelect::Attributes::AcceptedCommandList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50172,10 +50275,10 @@ - (void)subscribeAttributeAcceptedCommandListWithParams:(MTRSubscribeParams * _N reportHandler: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::AcceptedCommandList::TypeInfo; - MTRSubscribeAttribute( - params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcCleanModeSelect::Attributes::AcceptedCommandList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -50184,12 +50287,12 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa completion: (void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge(queue, completion); + auto * bridge = new MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge(queue, completion); std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, - ^(RVCCleanAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { + ^(RVCCleanModeSelectAcceptedCommandListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::AcceptedCommandList::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::AcceptedCommandList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50207,8 +50310,8 @@ + (void)readAttributeAcceptedCommandListWithClusterStateCache:(MTRClusterStateCa - (void)readAttributeEventListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::EventList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcCleanModeSelect::Attributes::EventList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50216,9 +50319,9 @@ - (void)subscribeAttributeEventListWithParams:(MTRSubscribeParams * _Nonnull)par subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::EventList::TypeInfo; - MTRSubscribeAttribute(params, - subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), + using TypeInfo = RvcCleanModeSelect::Attributes::EventList::TypeInfo; + MTRSubscribeAttribute( + params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50227,12 +50330,12 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCCleanEventListListAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction( - clusterStateCacheContainer.baseDevice, ^(RVCCleanEventListListAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTRRVCCleanModeSelectEventListListAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, + ^(RVCCleanModeSelectEventListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::EventList::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::EventList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50250,8 +50353,8 @@ + (void)readAttributeEventListWithClusterStateCache:(MTRClusterStateCacheContain - (void)readAttributeAttributeListWithCompletion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::AttributeList::TypeInfo; - return MTRReadAttribute( + using TypeInfo = RvcCleanModeSelect::Attributes::AttributeList::TypeInfo; + return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50259,10 +50362,10 @@ - (void)subscribeAttributeAttributeListWithParams:(MTRSubscribeParams * _Nonnull subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::AttributeList::TypeInfo; - MTRSubscribeAttribute(params, - subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), - TypeInfo::GetAttributeId()); + using TypeInfo = RvcCleanModeSelect::Attributes::AttributeList::TypeInfo; + MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, + TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheContainer *)clusterStateCacheContainer @@ -50270,12 +50373,12 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon queue:(dispatch_queue_t)queue completion:(void (^)(NSArray * _Nullable value, NSError * _Nullable error))completion { - auto * bridge = new MTRRVCCleanAttributeListListAttributeCallbackBridge(queue, completion); - std::move(*bridge).DispatchLocalAction( - clusterStateCacheContainer.baseDevice, ^(RVCCleanAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { + auto * bridge = new MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge(queue, completion); + std::move(*bridge).DispatchLocalAction(clusterStateCacheContainer.baseDevice, + ^(RVCCleanModeSelectAttributeListListAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::AttributeList::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::AttributeList::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50293,7 +50396,7 @@ + (void)readAttributeAttributeListWithClusterStateCache:(MTRClusterStateCacheCon - (void)readAttributeFeatureMapWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::FeatureMap::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50302,7 +50405,7 @@ - (void)subscribeAttributeFeatureMapWithParams:(MTRSubscribeParams * _Nonnull)pa subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::FeatureMap::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -50318,7 +50421,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai clusterStateCacheContainer.baseDevice, ^(Int32uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::FeatureMap::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::FeatureMap::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); @@ -50336,7 +50439,7 @@ + (void)readAttributeFeatureMapWithClusterStateCache:(MTRClusterStateCacheContai - (void)readAttributeClusterRevisionWithCompletion:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completion { MTRReadParams * params = [[MTRReadParams alloc] init]; - using TypeInfo = RvcClean::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::ClusterRevision::TypeInfo; return MTRReadAttribute( params, completion, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); } @@ -50345,7 +50448,7 @@ - (void)subscribeAttributeClusterRevisionWithParams:(MTRSubscribeParams * _Nonnu subscriptionEstablished:(MTRSubscriptionEstablishedHandler _Nullable)subscriptionEstablished reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - using TypeInfo = RvcClean::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::ClusterRevision::TypeInfo; MTRSubscribeAttribute(params, subscriptionEstablished, reportHandler, self.callbackQueue, self.device, self->_endpoint, TypeInfo::GetClusterId(), TypeInfo::GetAttributeId()); @@ -50362,7 +50465,7 @@ + (void)readAttributeClusterRevisionWithClusterStateCache:(MTRClusterStateCacheC clusterStateCacheContainer.baseDevice, ^(Int16uAttributeCallback successCb, MTRErrorCallback failureCb) { if (clusterStateCacheContainer.cppClusterStateCache) { chip::app::ConcreteAttributePath path; - using TypeInfo = RvcClean::Attributes::ClusterRevision::TypeInfo; + using TypeInfo = RvcCleanModeSelect::Attributes::ClusterRevision::TypeInfo; path.mEndpointId = static_cast([endpoint unsignedShortValue]); path.mClusterId = TypeInfo::GetClusterId(); path.mAttributeId = TypeInfo::GetAttributeId(); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h index 8feee9d39c8a5e..5034e4c748bfbd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters_Internal.h @@ -205,17 +205,17 @@ @property (nonatomic, assign, readonly) chip::EndpointId endpoint; @end -@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet () +@interface MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect () @property (nonatomic, strong, readonly) MTRBaseDevice * device; @property (nonatomic, assign, readonly) chip::EndpointId endpoint; @end -@interface MTRBaseClusterRVCRun () +@interface MTRBaseClusterRVCRunModeSelect () @property (nonatomic, strong, readonly) MTRBaseDevice * device; @property (nonatomic, assign, readonly) chip::EndpointId endpoint; @end -@interface MTRBaseClusterRVCClean () +@interface MTRBaseClusterRVCCleanModeSelect () @property (nonatomic, strong, readonly) MTRBaseDevice * device; @property (nonatomic, assign, readonly) chip::EndpointId endpoint; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h index 06d512cd998043..edf2607689ef63 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.h @@ -89,13 +89,14 @@ typedef void (*ModeSelectClusterChangeToModeResponseCallbackType)( void *, const chip::app::Clusters::ModeSelect::Commands::ChangeToModeResponse::DecodableType &); typedef void (*LaundryWasherModeSelectClusterChangeToModeResponseCallbackType)( void *, const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType &); -typedef void (*RefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackType)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackType)( void *, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType &); -typedef void (*RVCRunClusterChangeToModeResponseCallbackType)( - void *, const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType &); -typedef void (*RVCCleanClusterChangeToModeResponseCallbackType)( - void *, const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType &); + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse:: + DecodableType &); +typedef void (*RVCRunModeSelectClusterChangeToModeResponseCallbackType)( + void *, const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType &); +typedef void (*RVCCleanModeSelectClusterChangeToModeResponseCallbackType)( + void *, const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType &); typedef void (*DishwasherModeSelectClusterChangeToModeResponseCallbackType)( void *, const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType &); typedef void (*DoorLockClusterGetWeekDayScheduleResponseCallbackType)( @@ -405,24 +406,27 @@ typedef void (*LaundryWasherModeSelectClusterSemanticTagsAttributeCallback)( void *, chip::app::Clusters::LaundryWasherModeSelect::SemanticTags); typedef void (*NullableLaundryWasherModeSelectClusterSemanticTagsAttributeCallback)( void *, const chip::app::DataModel::Nullable &); -typedef void (*RefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallback)( - void *, chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::SemanticTags); -typedef void (*NullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*RVCRunClusterChangeToModeResponseStatusAttributeCallback)(void *, - chip::app::Clusters::RvcRun::ChangeToModeResponseStatus); -typedef void (*NullableRVCRunClusterChangeToModeResponseStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*RVCRunClusterSemanticTagsAttributeCallback)(void *, chip::app::Clusters::RvcRun::SemanticTags); -typedef void (*NullableRVCRunClusterSemanticTagsAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*RVCCleanClusterChangeToModeResponseStatusAttributeCallback)( - void *, chip::app::Clusters::RvcClean::ChangeToModeResponseStatus); -typedef void (*NullableRVCCleanClusterChangeToModeResponseStatusAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); -typedef void (*RVCCleanClusterSemanticTagsAttributeCallback)(void *, chip::app::Clusters::RvcClean::SemanticTags); -typedef void (*NullableRVCCleanClusterSemanticTagsAttributeCallback)( - void *, const chip::app::DataModel::Nullable &); +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallback)( + void *, chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags); +typedef void (*NullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallback)( + void *, + const chip::app::DataModel::Nullable< + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags> &); +typedef void (*RVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallback)( + void *, chip::app::Clusters::RvcRunModeSelect::ChangeToModeResponseStatus); +typedef void (*NullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*RVCRunModeSelectClusterSemanticTagsAttributeCallback)(void *, chip::app::Clusters::RvcRunModeSelect::SemanticTags); +typedef void (*NullableRVCRunModeSelectClusterSemanticTagsAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*RVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallback)( + void *, chip::app::Clusters::RvcCleanModeSelect::ChangeToModeResponseStatus); +typedef void (*NullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); +typedef void (*RVCCleanModeSelectClusterSemanticTagsAttributeCallback)(void *, + chip::app::Clusters::RvcCleanModeSelect::SemanticTags); +typedef void (*NullableRVCCleanModeSelectClusterSemanticTagsAttributeCallback)( + void *, const chip::app::DataModel::Nullable &); typedef void (*DishwasherModeSelectClusterSemanticTagsAttributeCallback)(void *, chip::app::Clusters::DishwasherModeSelect::SemanticTags); typedef void (*NullableDishwasherModeSelectClusterSemanticTagsAttributeCallback)( @@ -1153,40 +1157,43 @@ typedef void (*LaundryWasherModeSelectEventListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*LaundryWasherModeSelectAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallback)( + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & + data); +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RVCRunSupportedModesListAttributeCallback)( +typedef void (*RVCRunModeSelectSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCRunGeneratedCommandListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCRunAcceptedCommandListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCRunEventListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCRunAttributeListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCCleanSupportedModesListAttributeCallback)( + const chip::app::DataModel::DecodableList & + data); +typedef void (*RVCRunModeSelectGeneratedCommandListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RVCRunModeSelectAcceptedCommandListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RVCRunModeSelectEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RVCRunModeSelectAttributeListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RVCCleanModeSelectSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCCleanGeneratedCommandListListAttributeCallback)( + const chip::app::DataModel::DecodableList & + data); +typedef void (*RVCCleanModeSelectGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RVCCleanAcceptedCommandListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCCleanEventListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RVCCleanAttributeListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); +typedef void (*RVCCleanModeSelectAcceptedCommandListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RVCCleanModeSelectEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RVCCleanModeSelectAttributeListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); typedef void (*TemperatureControlSupportedTemperatureLevelsListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< @@ -8853,504 +8860,529 @@ class MTRLaundryWasherModeSelectAttributeListListAttributeCallbackSubscriptionBr MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( + queue, handler, action, OnSuccessFn){}; static void OnSuccessFn( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> & value); + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & + value); }; -class MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackSubscriptionBridge - : public MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackSubscriptionBridge + : public MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackSubscriptionBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge(queue, handler, action), + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge::OnDone; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge( + dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge( + queue, handler, OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackSubscriptionBridge - : public MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge + : public MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackSubscriptionBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge(queue, handler, + action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge::OnDone; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge:: + KeepAliveOnCallback; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge( + dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge( + queue, handler, OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackSubscriptionBridge - : public MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge + : public MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackSubscriptionBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge(queue, handler, + action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge::OnDone; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge:: + KeepAliveOnCallback; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( + queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackSubscriptionBridge - : public MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackSubscriptionBridge + : public MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackSubscriptionBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge(queue, handler, action), + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge::OnDone; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( + queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackSubscriptionBridge - : public MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackSubscriptionBridge + : public MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackSubscriptionBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge(queue, handler, action), + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge::OnDone; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunSupportedModesListAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn( void * context, - const chip::app::DataModel::DecodableList & value); + const chip::app::DataModel::DecodableList & + value); }; -class MTRRVCRunSupportedModesListAttributeCallbackSubscriptionBridge : public MTRRVCRunSupportedModesListAttributeCallbackBridge +class MTRRVCRunModeSelectSupportedModesListAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge { public: - MTRRVCRunSupportedModesListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunSupportedModesListAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectSupportedModesListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunSupportedModesListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunSupportedModesListAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunGeneratedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCRunGeneratedCommandListListAttributeCallbackSubscriptionBridge - : public MTRRVCRunGeneratedCommandListListAttributeCallbackBridge +class MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge { public: - MTRRVCRunGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunGeneratedCommandListListAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunAcceptedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCRunAcceptedCommandListListAttributeCallbackSubscriptionBridge - : public MTRRVCRunAcceptedCommandListListAttributeCallbackBridge +class MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge { public: - MTRRVCRunAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunAcceptedCommandListListAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunEventListListAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCRunModeSelectEventListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCRunEventListListAttributeCallbackSubscriptionBridge : public MTRRVCRunEventListListAttributeCallbackBridge +class MTRRVCRunModeSelectEventListListAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectEventListListAttributeCallbackBridge { public: - MTRRVCRunEventListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunEventListListAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectEventListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCRunModeSelectEventListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunEventListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunEventListListAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectEventListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectEventListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunAttributeListListAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCRunAttributeListListAttributeCallbackSubscriptionBridge : public MTRRVCRunAttributeListListAttributeCallbackBridge +class MTRRVCRunModeSelectAttributeListListAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge { public: - MTRRVCRunAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunAttributeListListAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunAttributeListListAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanSupportedModesListAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn( - void * context, - const chip::app::DataModel::DecodableList & value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList< + chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::DecodableType> & value); }; -class MTRRVCCleanSupportedModesListAttributeCallbackSubscriptionBridge : public MTRRVCCleanSupportedModesListAttributeCallbackBridge +class MTRRVCCleanModeSelectSupportedModesListAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge { public: - MTRRVCCleanSupportedModesListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanSupportedModesListAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectSupportedModesListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanSupportedModesListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanSupportedModesListAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCCleanGeneratedCommandListListAttributeCallbackSubscriptionBridge - : public MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge +class MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge { public: - MTRRVCCleanGeneratedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCCleanAcceptedCommandListListAttributeCallbackSubscriptionBridge - : public MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge +class MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge { public: - MTRRVCCleanAcceptedCommandListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanEventListListAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCCleanModeSelectEventListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectEventListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCCleanEventListListAttributeCallbackSubscriptionBridge : public MTRRVCCleanEventListListAttributeCallbackBridge +class MTRRVCCleanModeSelectEventListListAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectEventListListAttributeCallbackBridge { public: - MTRRVCCleanEventListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanEventListListAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectEventListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCCleanModeSelectEventListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanEventListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanEventListListAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectEventListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectEventListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanAttributeListListAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, const chip::app::DataModel::DecodableList & value); }; -class MTRRVCCleanAttributeListListAttributeCallbackSubscriptionBridge : public MTRRVCCleanAttributeListListAttributeCallbackBridge +class MTRRVCCleanModeSelectAttributeListListAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge { public: - MTRRVCCleanAttributeListListAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanAttributeListListAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectAttributeListListAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanAttributeListListAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; @@ -17053,52 +17085,54 @@ class MTRLaundryWasherModeSelectClusterChangeToModeResponseCallbackBridge const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType & data); }; -class MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge( + queue, handler, OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn( - void * context, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType & - data); + static void OnSuccessFn(void * context, + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands:: + ChangeToModeResponse::DecodableType & data); }; -class MTRRVCRunClusterChangeToModeResponseCallbackBridge : public MTRCallbackBridge +class MTRRVCRunModeSelectClusterChangeToModeResponseCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & data); }; -class MTRRVCCleanClusterChangeToModeResponseCallbackBridge - : public MTRCallbackBridge +class MTRRVCCleanModeSelectClusterChangeToModeResponseCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectClusterChangeToModeResponseCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & data); }; class MTRDishwasherModeSelectClusterChangeToModeResponseCallbackBridge @@ -22285,343 +22319,359 @@ class MTRNullableLaundryWasherModeSelectClusterSemanticTagsAttributeCallbackSubs MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge( + queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::SemanticTags value); + static void OnSuccessFn(void * context, + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags value); }; -class MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackSubscriptionBridge - : public MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge +class MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge + : public MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge { public: - MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackSubscriptionBridge( + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge::OnDone; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler) : - MTRCallbackBridge(queue, handler, - OnSuccessFn){}; + MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge( + dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge( + queue, handler, OnSuccessFn){}; - MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, - ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge( + MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : + MTRCallbackBridge( queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn( - void * context, - const chip::app::DataModel::Nullable & - value); + static void OnSuccessFn(void * context, + const chip::app::DataModel::Nullable< + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags> & value); }; -class MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackSubscriptionBridge - : public MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge +class MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge + : public MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge { public: - MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackSubscriptionBridge( + MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), + MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge(queue, handler, + action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge::OnDone; + using MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge:: + KeepAliveOnCallback; + using MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::RvcRun::ChangeToModeResponseStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::RvcRunModeSelect::ChangeToModeResponseStatus value); }; -class MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge - : public MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge +class MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge { public: - MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( + MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + static void + OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value); }; -class MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge - : public MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge +class MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge + : public MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge { public: - MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( + MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; + using MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCRunClusterSemanticTagsAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCRunClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCRunClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::RvcRun::SemanticTags value); + static void OnSuccessFn(void * context, chip::app::Clusters::RvcRunModeSelect::SemanticTags value); }; -class MTRRVCRunClusterSemanticTagsAttributeCallbackSubscriptionBridge : public MTRRVCRunClusterSemanticTagsAttributeCallbackBridge +class MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge + : public MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge { public: - MTRRVCRunClusterSemanticTagsAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCRunClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), + MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCRunClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCRunClusterSemanticTagsAttributeCallbackBridge::OnDone; + using MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableRVCRunClusterSemanticTagsAttributeCallbackSubscriptionBridge - : public MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge +class MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge + : public MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge { public: - MTRNullableRVCRunClusterSemanticTagsAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), + MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge::OnDone; + using MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::RvcClean::ChangeToModeResponseStatus value); + static void OnSuccessFn(void * context, chip::app::Clusters::RvcCleanModeSelect::ChangeToModeResponseStatus value); }; -class MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge - : public MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge +class MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge { public: - MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( + MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler) : + MTRCallbackBridge(queue, handler, + OnSuccessFn){}; - MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, - OnSuccessFn){}; + MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(dispatch_queue_t queue, + ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, + OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge - : public MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge +class MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge + : public MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge { public: - MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( + MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), + MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; + using MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge : public MTRCallbackBridge +class MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; - static void OnSuccessFn(void * context, chip::app::Clusters::RvcClean::SemanticTags value); + static void OnSuccessFn(void * context, chip::app::Clusters::RvcCleanModeSelect::SemanticTags value); }; -class MTRRVCCleanClusterSemanticTagsAttributeCallbackSubscriptionBridge - : public MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge +class MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge + : public MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge { public: - MTRRVCCleanClusterSemanticTagsAttributeCallbackSubscriptionBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action, - MTRSubscriptionEstablishedHandler establishedHandler) : - MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), + MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge( + dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, + MTRSubscriptionEstablishedHandler establishedHandler) : + MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; - using MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge::OnDone; + using MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; + using MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; }; -class MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge - : public MTRCallbackBridge +class MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge + : public MTRCallbackBridge { public: - MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : - MTRCallbackBridge(queue, handler, OnSuccessFn){}; + MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler) : + MTRCallbackBridge(queue, handler, OnSuccessFn){}; - MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, - MTRActionBlock action) : - MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; + MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge(dispatch_queue_t queue, ResponseHandler handler, + MTRActionBlock action) : + MTRCallbackBridge(queue, handler, action, OnSuccessFn){}; static void OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value); + const chip::app::DataModel::Nullable & value); }; -class MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackSubscriptionBridge - : public MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge +class MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge + : public MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge { public: - MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackSubscriptionBridge( + MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge( dispatch_queue_t queue, ResponseHandler handler, MTRActionBlock action, MTRSubscriptionEstablishedHandler establishedHandler) : - MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), + MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge(queue, handler, action), mEstablishedHandler(establishedHandler) {} void OnSubscriptionEstablished(); - using MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; - using MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge::OnDone; + using MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge::KeepAliveOnCallback; + using MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge::OnDone; private: MTRSubscriptionEstablishedHandler mEstablishedHandler; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 2e161f116d87c4..1a3700a0debb3c 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -8346,9 +8346,10 @@ } } -void MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context, +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> & value) + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & + value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -8356,8 +8357,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct * newElement_0; - newElement_0 = [MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct new]; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct * newElement_0; + newElement_0 = [MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct new]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; @@ -8367,8 +8368,8 @@ auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct * newElement_2; - newElement_2 = [MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct new]; + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct new]; newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; @@ -8392,7 +8393,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallbackSubscriptionBridge:: +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { @@ -8408,7 +8409,7 @@ } } -void MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8431,7 +8432,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallbackSubscriptionBridge:: +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { @@ -8447,7 +8448,7 @@ } } -void MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8470,7 +8471,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallbackSubscriptionBridge:: +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { @@ -8486,7 +8487,7 @@ } } -void MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackBridge::OnSuccessFn( +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8509,7 +8510,8 @@ DispatchSuccess(context, objCValue); }; -void MTRRefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallbackSubscriptionBridge:: + OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8524,7 +8526,7 @@ } } -void MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackBridge::OnSuccessFn( +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8547,7 +8549,8 @@ DispatchSuccess(context, objCValue); }; -void MTRRefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallbackSubscriptionBridge:: + OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8562,8 +8565,9 @@ } } -void MTRRVCRunSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) +void MTRRVCRunModeSelectSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList & + value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -8571,8 +8575,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRRVCRunClusterModeOptionStruct * newElement_0; - newElement_0 = [MTRRVCRunClusterModeOptionStruct new]; + MTRRVCRunModeSelectClusterModeOptionStruct * newElement_0; + newElement_0 = [MTRRVCRunModeSelectClusterModeOptionStruct new]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; @@ -8582,8 +8586,8 @@ auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRRVCRunClusterSemanticTagStruct * newElement_2; - newElement_2 = [MTRRVCRunClusterSemanticTagStruct new]; + MTRRVCRunModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRRVCRunModeSelectClusterSemanticTagStruct new]; newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; @@ -8607,7 +8611,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCRunSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8622,7 +8626,7 @@ } } -void MTRRVCRunGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8645,7 +8649,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCRunGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8660,7 +8664,7 @@ } } -void MTRRVCRunAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8683,7 +8687,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCRunAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8698,7 +8702,7 @@ } } -void MTRRVCRunEventListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCRunModeSelectEventListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8721,7 +8725,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCRunEventListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectEventListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8736,7 +8740,7 @@ } } -void MTRRVCRunAttributeListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCRunModeSelectAttributeListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8759,7 +8763,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCRunAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8774,8 +8778,9 @@ } } -void MTRRVCCleanSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::DecodableList & value) +void MTRRVCCleanModeSelectSupportedModesListAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::DecodableList & + value) { NSArray * _Nonnull objCValue; { // Scope for our temporary variables @@ -8783,8 +8788,8 @@ auto iter_0 = value.begin(); while (iter_0.Next()) { auto & entry_0 = iter_0.GetValue(); - MTRRVCCleanClusterModeOptionStruct * newElement_0; - newElement_0 = [MTRRVCCleanClusterModeOptionStruct new]; + MTRRVCCleanModeSelectClusterModeOptionStruct * newElement_0; + newElement_0 = [MTRRVCCleanModeSelectClusterModeOptionStruct new]; newElement_0.label = [[NSString alloc] initWithBytes:entry_0.label.data() length:entry_0.label.size() encoding:NSUTF8StringEncoding]; @@ -8794,8 +8799,8 @@ auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRRVCCleanClusterSemanticTagStruct * newElement_2; - newElement_2 = [MTRRVCCleanClusterSemanticTagStruct new]; + MTRRVCCleanModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRRVCCleanModeSelectClusterSemanticTagStruct new]; newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode)]; newElement_2.value = [NSNumber numberWithUnsignedShort:entry_2.value]; [array_2 addObject:newElement_2]; @@ -8819,7 +8824,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCCleanSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectSupportedModesListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8834,7 +8839,7 @@ } } -void MTRRVCCleanGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8857,7 +8862,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCCleanGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectGeneratedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8872,7 +8877,7 @@ } } -void MTRRVCCleanAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8895,7 +8900,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCCleanAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectAcceptedCommandListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8910,7 +8915,7 @@ } } -void MTRRVCCleanEventListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCCleanModeSelectEventListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8933,7 +8938,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCCleanEventListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectEventListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -8948,7 +8953,7 @@ } } -void MTRRVCCleanAttributeListListAttributeCallbackBridge::OnSuccessFn( +void MTRRVCCleanModeSelectAttributeListListAttributeCallbackBridge::OnSuccessFn( void * context, const chip::app::DataModel::DecodableList & value) { NSArray * _Nonnull objCValue; @@ -8971,7 +8976,7 @@ DispatchSuccess(context, objCValue); }; -void MTRRVCCleanAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectAttributeListListAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -17810,10 +17815,11 @@ DispatchSuccess(context, response); }; -void MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackBridge::OnSuccessFn(void * context, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType & data) +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge::OnSuccessFn(void * context, + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse:: + DecodableType & data) { - auto * response = [MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams new]; + auto * response = [MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams new]; CHIP_ERROR err = [response _setFieldsFromDecodableStruct:data]; if (err != CHIP_NO_ERROR) { OnFailureFn(context, err); @@ -17822,10 +17828,10 @@ DispatchSuccess(context, response); }; -void MTRRVCRunClusterChangeToModeResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType & data) +void MTRRVCRunModeSelectClusterChangeToModeResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & data) { - auto * response = [MTRRVCRunClusterChangeToModeResponseParams new]; + auto * response = [MTRRVCRunModeSelectClusterChangeToModeResponseParams new]; CHIP_ERROR err = [response _setFieldsFromDecodableStruct:data]; if (err != CHIP_NO_ERROR) { OnFailureFn(context, err); @@ -17834,10 +17840,10 @@ DispatchSuccess(context, response); }; -void MTRRVCCleanClusterChangeToModeResponseCallbackBridge::OnSuccessFn( - void * context, const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType & data) +void MTRRVCCleanModeSelectClusterChangeToModeResponseCallbackBridge::OnSuccessFn( + void * context, const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & data) { - auto * response = [MTRRVCCleanClusterChangeToModeResponseParams new]; + auto * response = [MTRRVCCleanModeSelectClusterChangeToModeResponseParams new]; CHIP_ERROR err = [response _setFieldsFromDecodableStruct:data]; if (err != CHIP_NO_ERROR) { OnFailureFn(context, err); @@ -21628,15 +21634,15 @@ } } -void MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::SemanticTags value) +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackSubscriptionBridge:: +void MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { @@ -21652,8 +21658,10 @@ } } -void MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn(void * context, - const chip::app::DataModel::Nullable & value) +void MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( + void * context, + const chip::app::DataModel::Nullable & + value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -21664,7 +21672,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagsAttributeCallbackSubscriptionBridge:: +void MTRNullableRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge:: OnSubscriptionEstablished() { if (!mQueue) { @@ -21680,15 +21688,15 @@ } } -void MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::RvcRun::ChangeToModeResponseStatus value) +void MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::RvcRunModeSelect::ChangeToModeResponseStatus value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRRVCRunClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21703,8 +21711,8 @@ } } -void MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -21715,7 +21723,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableRVCRunClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableRVCRunModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21730,15 +21738,15 @@ } } -void MTRRVCRunClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::RvcRun::SemanticTags value) +void MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::RvcRunModeSelect::SemanticTags value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRRVCRunClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCRunModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21753,8 +21761,8 @@ } } -void MTRNullableRVCRunClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -21765,7 +21773,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableRVCRunClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableRVCRunModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21780,15 +21788,15 @@ } } -void MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::RvcClean::ChangeToModeResponseStatus value) +void MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::RvcCleanModeSelect::ChangeToModeResponseStatus value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedChar:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRRVCCleanClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21803,8 +21811,8 @@ } } -void MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackBridge::OnSuccessFn(void * context, + const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -21815,7 +21823,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableRVCCleanClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableRVCCleanModeSelectClusterChangeToModeResponseStatusAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21830,15 +21838,15 @@ } } -void MTRRVCCleanClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( - void * context, chip::app::Clusters::RvcClean::SemanticTags value) +void MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( + void * context, chip::app::Clusters::RvcCleanModeSelect::SemanticTags value) { NSNumber * _Nonnull objCValue; objCValue = [NSNumber numberWithUnsignedShort:chip::to_underlying(value)]; DispatchSuccess(context, objCValue); }; -void MTRRVCCleanClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRRVCCleanModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; @@ -21853,8 +21861,8 @@ } } -void MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( - void * context, const chip::app::DataModel::Nullable & value) +void MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackBridge::OnSuccessFn( + void * context, const chip::app::DataModel::Nullable & value) { NSNumber * _Nullable objCValue; if (value.IsNull()) { @@ -21865,7 +21873,7 @@ DispatchSuccess(context, objCValue); }; -void MTRNullableRVCCleanClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() +void MTRNullableRVCCleanModeSelectClusterSemanticTagsAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished() { if (!mQueue) { return; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h index f9ad85d2dd9dec..0b2743140e54f9 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h @@ -277,9 +277,9 @@ typedef NS_ENUM(uint32_t, MTRClusterIDType) { MTRClusterIDTypeBooleanStateID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000045, MTRClusterIDTypeModeSelectID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000050, MTRClusterIDTypeLaundryWasherModeSelectID MTR_NEWLY_AVAILABLE = 0x00000051, - MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID MTR_NEWLY_AVAILABLE = 0x00000052, - MTRClusterIDTypeRVCRunID MTR_NEWLY_AVAILABLE = 0x00000054, - MTRClusterIDTypeRVCCleanID MTR_NEWLY_AVAILABLE = 0x00000055, + MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID MTR_NEWLY_AVAILABLE = 0x00000052, + MTRClusterIDTypeRVCRunModeSelectID MTR_NEWLY_AVAILABLE = 0x00000054, + MTRClusterIDTypeRVCCleanModeSelectID MTR_NEWLY_AVAILABLE = 0x00000055, MTRClusterIDTypeTemperatureControlID MTR_NEWLY_AVAILABLE = 0x00000056, MTRClusterIDTypeDishwasherModeSelectID MTR_NEWLY_AVAILABLE = 0x00000059, MTRClusterIDTypeAirQualityID MTR_NEWLY_AVAILABLE = 0x0000005B, @@ -3667,6 +3667,10 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { "Please use MTRAttributeIDTypeClusterModeSelectAttributeDescriptionID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) = 0x00000000, + MTRClusterModeSelectAttributeStandardNamespaceID MTR_DEPRECATED( + "Please use MTRAttributeIDTypeClusterModeSelectAttributeStandardNamespaceID", ios(16.1, 16.4), macos(13.0, 13.3), + watchos(9.1, 9.4), tvos(16.1, 16.4)) + = 0x00000001, MTRClusterModeSelectAttributeSupportedModesID MTR_DEPRECATED( "Please use MTRAttributeIDTypeClusterModeSelectAttributeSupportedModesID", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) @@ -3705,6 +3709,8 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { // Cluster ModeSelect attributes MTRAttributeIDTypeClusterModeSelectAttributeDescriptionID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000000, + MTRAttributeIDTypeClusterModeSelectAttributeStandardNamespaceID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) + = 0x00000001, MTRAttributeIDTypeClusterModeSelectAttributeSupportedModesID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) = 0x00000002, MTRAttributeIDTypeClusterModeSelectAttributeCurrentModeID API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) @@ -3746,56 +3752,67 @@ typedef NS_ENUM(uint32_t, MTRAttributeIDType) { MTRAttributeIDTypeClusterLaundryWasherModeSelectAttributeClusterRevisionID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, - // Cluster RefrigeratorAndTemperatureControlledCabinet attributes - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeDescriptionID MTR_NEWLY_AVAILABLE = 0x00000000, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeSupportedModesID MTR_NEWLY_AVAILABLE = 0x00000002, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeCurrentModeID MTR_NEWLY_AVAILABLE = 0x00000003, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeStartUpModeID MTR_NEWLY_AVAILABLE = 0x00000004, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeOnModeID MTR_NEWLY_AVAILABLE = 0x00000005, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE + // Cluster RefrigeratorAndTemperatureControlledCabinetModeSelect attributes + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeDescriptionID MTR_NEWLY_AVAILABLE + = 0x00000000, + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeSupportedModesID MTR_NEWLY_AVAILABLE + = 0x00000002, + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeCurrentModeID MTR_NEWLY_AVAILABLE + = 0x00000003, + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeStartUpModeID MTR_NEWLY_AVAILABLE + = 0x00000004, + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeOnModeID MTR_NEWLY_AVAILABLE + = 0x00000005, + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeGeneratedCommandListID + MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeEventListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeEventListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeAttributeListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeAttributeListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeFeatureMapID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeFeatureMapID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID, - MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeClusterRevisionID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeClusterRevisionID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, - // Cluster RVCRun attributes - MTRAttributeIDTypeClusterRVCRunAttributeDescriptionID MTR_NEWLY_AVAILABLE = 0x00000000, - MTRAttributeIDTypeClusterRVCRunAttributeSupportedModesID MTR_NEWLY_AVAILABLE = 0x00000002, - MTRAttributeIDTypeClusterRVCRunAttributeCurrentModeID MTR_NEWLY_AVAILABLE = 0x00000003, - MTRAttributeIDTypeClusterRVCRunAttributeStartUpModeID MTR_NEWLY_AVAILABLE = 0x00000004, - MTRAttributeIDTypeClusterRVCRunAttributeOnModeID MTR_NEWLY_AVAILABLE = 0x00000005, - MTRAttributeIDTypeClusterRVCRunAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE + // Cluster RVCRunModeSelect attributes + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeDescriptionID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeSupportedModesID MTR_NEWLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeCurrentModeID MTR_NEWLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeStartUpModeID MTR_NEWLY_AVAILABLE = 0x00000004, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeOnModeID MTR_NEWLY_AVAILABLE = 0x00000005, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, - MTRAttributeIDTypeClusterRVCRunAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, - MTRAttributeIDTypeClusterRVCRunAttributeEventListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID, - MTRAttributeIDTypeClusterRVCRunAttributeAttributeListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID, - MTRAttributeIDTypeClusterRVCRunAttributeFeatureMapID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID, - MTRAttributeIDTypeClusterRVCRunAttributeClusterRevisionID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeEventListID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeEventListID, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeAttributeListID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeAttributeListID, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeFeatureMapID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeFeatureMapID, + MTRAttributeIDTypeClusterRVCRunModeSelectAttributeClusterRevisionID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, - // Cluster RVCClean attributes - MTRAttributeIDTypeClusterRVCCleanAttributeDescriptionID MTR_NEWLY_AVAILABLE = 0x00000000, - MTRAttributeIDTypeClusterRVCCleanAttributeSupportedModesID MTR_NEWLY_AVAILABLE = 0x00000002, - MTRAttributeIDTypeClusterRVCCleanAttributeCurrentModeID MTR_NEWLY_AVAILABLE = 0x00000003, - MTRAttributeIDTypeClusterRVCCleanAttributeStartUpModeID MTR_NEWLY_AVAILABLE = 0x00000004, - MTRAttributeIDTypeClusterRVCCleanAttributeOnModeID MTR_NEWLY_AVAILABLE = 0x00000005, - MTRAttributeIDTypeClusterRVCCleanAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE + // Cluster RVCCleanModeSelect attributes + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeDescriptionID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeSupportedModesID MTR_NEWLY_AVAILABLE = 0x00000002, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeCurrentModeID MTR_NEWLY_AVAILABLE = 0x00000003, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeStartUpModeID MTR_NEWLY_AVAILABLE = 0x00000004, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeOnModeID MTR_NEWLY_AVAILABLE = 0x00000005, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeGeneratedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeGeneratedCommandListID, - MTRAttributeIDTypeClusterRVCCleanAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeAcceptedCommandListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAcceptedCommandListID, - MTRAttributeIDTypeClusterRVCCleanAttributeEventListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeEventListID, - MTRAttributeIDTypeClusterRVCCleanAttributeAttributeListID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeEventListID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeEventListID, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeAttributeListID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeAttributeListID, - MTRAttributeIDTypeClusterRVCCleanAttributeFeatureMapID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeFeatureMapID, - MTRAttributeIDTypeClusterRVCCleanAttributeClusterRevisionID MTR_NEWLY_AVAILABLE + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeFeatureMapID MTR_NEWLY_AVAILABLE + = MTRAttributeIDTypeGlobalAttributeFeatureMapID, + MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeClusterRevisionID MTR_NEWLY_AVAILABLE = MTRAttributeIDTypeGlobalAttributeClusterRevisionID, // Cluster TemperatureControl attributes @@ -9224,22 +9241,23 @@ typedef NS_ENUM(uint32_t, MTRCommandIDType) { MTRCommandIDTypeClusterLaundryWasherModeSelectCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE = 0x00000001, MTRCommandIDTypeClusterLaundryWasherModeSelectCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE = 0x00000002, - // Cluster RefrigeratorAndTemperatureControlledCabinet commands - MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetCommandChangeToModeID MTR_NEWLY_AVAILABLE = 0x00000000, - MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE + // Cluster RefrigeratorAndTemperatureControlledCabinetModeSelect commands + MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectCommandChangeToModeID MTR_NEWLY_AVAILABLE + = 0x00000000, + MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE = 0x00000001, - MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE + MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE = 0x00000002, - // Cluster RVCRun commands - MTRCommandIDTypeClusterRVCRunCommandChangeToModeID MTR_NEWLY_AVAILABLE = 0x00000000, - MTRCommandIDTypeClusterRVCRunCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE = 0x00000001, - MTRCommandIDTypeClusterRVCRunCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE = 0x00000002, + // Cluster RVCRunModeSelect commands + MTRCommandIDTypeClusterRVCRunModeSelectCommandChangeToModeID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRCommandIDTypeClusterRVCRunModeSelectCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE = 0x00000001, + MTRCommandIDTypeClusterRVCRunModeSelectCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE = 0x00000002, - // Cluster RVCClean commands - MTRCommandIDTypeClusterRVCCleanCommandChangeToModeID MTR_NEWLY_AVAILABLE = 0x00000000, - MTRCommandIDTypeClusterRVCCleanCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE = 0x00000001, - MTRCommandIDTypeClusterRVCCleanCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE = 0x00000002, + // Cluster RVCCleanModeSelect commands + MTRCommandIDTypeClusterRVCCleanModeSelectCommandChangeToModeID MTR_NEWLY_AVAILABLE = 0x00000000, + MTRCommandIDTypeClusterRVCCleanModeSelectCommandChangeToModeWithStatusID MTR_NEWLY_AVAILABLE = 0x00000001, + MTRCommandIDTypeClusterRVCCleanModeSelectCommandChangeToModeResponseID MTR_NEWLY_AVAILABLE = 0x00000002, // Cluster TemperatureControl commands MTRCommandIDTypeClusterTemperatureControlCommandSetTemperatureID MTR_NEWLY_AVAILABLE = 0x00000000, diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h index caec743f1cb35b..db33cbb7c56aee 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.h @@ -2748,6 +2748,9 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - (NSDictionary *)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); +- (NSDictionary *)readAttributeStandardNamespaceWithParams:(MTRReadParams * _Nullable)params + API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); + - (NSDictionary *)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @@ -2856,28 +2859,29 @@ MTR_NEWLY_AVAILABLE @end /** - * Cluster Refrigerator And Temperature Controlled Cabinet + * Cluster Refrigerator And Temperature Controlled Cabinet Mode Select * This cluster is an alias of the Mode Select cluster, defining additional semantics and namespaced enumerated values for refrigerator and temperature controlled cabinet devices. */ MTR_NEWLY_AVAILABLE -@interface MTRClusterRefrigeratorAndTemperatureControlledCabinet : MTRCluster +@interface MTRClusterRefrigeratorAndTemperatureControlledCabinetModeSelect : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; -- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; - (void) - changeToModeWithStatusWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams *)params + changeToModeWithStatusWithParams: + (MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion: (void (^)( - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams * _Nullable data, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; @@ -2918,25 +2922,25 @@ MTR_NEWLY_AVAILABLE @end /** - * Cluster RVC Run + * Cluster RVC Run Mode Select * This cluster is an alias of the Mode Select cluster which also defines a namespace for the running modes of the Robotic Vacuum * Cleaner devices. */ MTR_NEWLY_AVAILABLE -@interface MTRClusterRVCRun : MTRCluster +@interface MTRClusterRVCRunModeSelect : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; -- (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRVCRunModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatusParams *)params +- (void)changeToModeWithStatusWithParams:(MTRRVCRunModeSelectClusterChangeToModeWithStatusParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs - completion:(void (^)(MTRRVCRunClusterChangeToModeResponseParams * _Nullable data, + completion:(void (^)(MTRRVCRunModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; @@ -2977,25 +2981,25 @@ MTR_NEWLY_AVAILABLE @end /** - * Cluster RVC Clean + * Cluster RVC Clean Mode Select * This cluster is an alias of the Mode Select cluster which also defines a namespace for the cleaning type of the Robotic Vacuum Cleaner devices. */ MTR_NEWLY_AVAILABLE -@interface MTRClusterRVCClean : MTRCluster +@interface MTRClusterRVCCleanModeSelect : MTRCluster - (instancetype _Nullable)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue NS_DESIGNATED_INITIALIZER MTR_NEWLY_AVAILABLE; -- (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRVCCleanModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs completion:(MTRStatusCompletion)completion MTR_NEWLY_AVAILABLE; -- (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStatusParams *)params +- (void)changeToModeWithStatusWithParams:(MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams *)params expectedValues:(NSArray *> * _Nullable)expectedDataValueDictionaries expectedValueInterval:(NSNumber * _Nullable)expectedValueIntervalMs - completion:(void (^)(MTRRVCCleanClusterChangeToModeResponseParams * _Nullable data, + completion:(void (^)(MTRRVCCleanModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion MTR_NEWLY_AVAILABLE; - (NSDictionary *)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params MTR_NEWLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm index 36da73714e8089..57e46f546bf268 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm @@ -12860,6 +12860,14 @@ - (void)changeToModeWithStatusWithParams:(MTRModeSelectClusterChangeToModeWithSt params:params]; } +- (NSDictionary *)readAttributeStandardNamespaceWithParams:(MTRReadParams * _Nullable)params +{ + return [self.device readAttributeWithEndpointID:@(_endpoint) + clusterID:@(MTRClusterIDTypeModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterModeSelectAttributeStandardNamespaceID) + params:params]; +} + - (NSDictionary *)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) @@ -13297,7 +13305,7 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD @end -@implementation MTRClusterRefrigeratorAndTemperatureControlledCabinet +@implementation MTRClusterRefrigeratorAndTemperatureControlledCabinetModeSelect - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -13312,15 +13320,15 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi return self; } -- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, - (unsigned int) MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID, - (unsigned int) MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetCommandChangeToModeID]; + (unsigned int) MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID, + (unsigned int) MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectCommandChangeToModeID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13347,7 +13355,7 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToMode::Type request; + RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } @@ -13382,18 +13390,19 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl } - (void) - changeToModeWithStatusWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams *)params + changeToModeWithStatusWithParams: + (MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion: (void (^)( - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams * _Nullable data, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion { - NSString * logPrefix = - [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, - (unsigned int) MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID, - (unsigned int) MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetCommandChangeToModeWithStatusID]; + NSString * logPrefix = [NSString + stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, + (unsigned int) MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID, + (unsigned int) MTRCommandIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectCommandChangeToModeWithStatusID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13405,7 +13414,7 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; - auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackBridge( + auto * bridge = new MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge( self.device.queue, ^(id _Nullable value, NSError * _Nullable error) { MTRClustersLogCompletion(logPrefix, value, error); @@ -13415,15 +13424,14 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - RefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseCallbackType successCb, + RefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge - = static_cast( - bridge); + auto * typedBridge = static_cast< + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallbackBridge *>(bridge); Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeWithStatus::Type request; + RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } @@ -13461,8 +13469,9 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeDescriptionID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeDescriptionID) params:params]; } @@ -13470,8 +13479,9 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeSupportedModesID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeSupportedModesID) params:params]; } @@ -13479,8 +13489,9 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeCurrentModeID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeCurrentModeID) params:params]; } @@ -13488,8 +13499,9 @@ - (void)changeToModeWithParams:(MTRRefrigeratorAndTemperatureControlledCabinetCl { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeStartUpModeID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeStartUpModeID) params:params]; } @@ -13506,8 +13518,9 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary *)dataV [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeStartUpModeID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -13517,8 +13530,9 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary *)dataV { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeOnModeID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeOnModeID) params:params]; } @@ -13535,8 +13549,9 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeOnModeID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -13546,9 +13561,9 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) attributeID: - @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeGeneratedCommandListID) + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeGeneratedCommandListID) params:params]; } @@ -13556,9 +13571,9 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) attributeID: - @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeAcceptedCommandListID) + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeAcceptedCommandListID) params:params]; } @@ -13566,8 +13581,9 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeEventListID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeEventListID) params:params]; } @@ -13575,8 +13591,9 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeAttributeListID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeAttributeListID) params:params]; } @@ -13584,8 +13601,9 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) - attributeID:@(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeFeatureMapID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) + attributeID: + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeFeatureMapID) params:params]; } @@ -13593,15 +13611,15 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetID) + clusterID:@(MTRClusterIDTypeRefrigeratorAndTemperatureControlledCabinetModeSelectID) attributeID: - @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetAttributeClusterRevisionID) + @(MTRAttributeIDTypeClusterRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeClusterRevisionID) params:params]; } @end -@implementation MTRClusterRVCRun +@implementation MTRClusterRVCRunModeSelect - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -13616,14 +13634,14 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi return self; } -- (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRVCRunModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { - NSString * logPrefix = - [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, - (unsigned int) MTRClusterIDTypeRVCRunID, (unsigned int) MTRCommandIDTypeClusterRVCRunCommandChangeToModeID]; + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeRVCRunModeSelectID, + (unsigned int) MTRCommandIDTypeClusterRVCRunModeSelectCommandChangeToModeID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13650,7 +13668,7 @@ - (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcRun::Commands::ChangeToMode::Type request; + RvcRunModeSelect::Commands::ChangeToMode::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } @@ -13684,15 +13702,15 @@ - (void)changeToModeWithParams:(MTRRVCRunClusterChangeToModeParams *)params } } -- (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatusParams *)params +- (void)changeToModeWithStatusWithParams:(MTRRVCRunModeSelectClusterChangeToModeWithStatusParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs - completion:(void (^)(MTRRVCRunClusterChangeToModeResponseParams * _Nullable data, + completion:(void (^)(MTRRVCRunModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion { NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, - _endpoint, (unsigned int) MTRClusterIDTypeRVCRunID, - (unsigned int) MTRCommandIDTypeClusterRVCRunCommandChangeToModeWithStatusID]; + _endpoint, (unsigned int) MTRClusterIDTypeRVCRunModeSelectID, + (unsigned int) MTRCommandIDTypeClusterRVCRunModeSelectCommandChangeToModeWithStatusID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13704,7 +13722,7 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatus MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; - auto * bridge = new MTRRVCRunClusterChangeToModeResponseCallbackBridge( + auto * bridge = new MTRRVCRunModeSelectClusterChangeToModeResponseCallbackBridge( self.device.queue, ^(id _Nullable value, NSError * _Nullable error) { MTRClustersLogCompletion(logPrefix, value, error); @@ -13714,13 +13732,13 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatus [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - RVCRunClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, + RVCRunModeSelectClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge = static_cast(bridge); + auto * typedBridge = static_cast(bridge); Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcRun::Commands::ChangeToModeWithStatus::Type request; + RvcRunModeSelect::Commands::ChangeToModeWithStatus::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } @@ -13757,32 +13775,32 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCRunClusterChangeToModeWithStatus - (NSDictionary *)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeDescriptionID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeDescriptionID) params:params]; } - (NSDictionary *)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeSupportedModesID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeSupportedModesID) params:params]; } - (NSDictionary *)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeCurrentModeID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeCurrentModeID) params:params]; } - (NSDictionary *)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeStartUpModeID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeStartUpModeID) params:params]; } @@ -13798,8 +13816,8 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary *)dataV NSNumber * timedWriteTimeout = params.timedWriteTimeout; [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeStartUpModeID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -13808,8 +13826,8 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary *)dataV - (NSDictionary *)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeOnModeID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeOnModeID) params:params]; } @@ -13825,8 +13843,8 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD NSNumber * timedWriteTimeout = params.timedWriteTimeout; [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeOnModeID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -13835,54 +13853,54 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD - (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeGeneratedCommandListID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeGeneratedCommandListID) params:params]; } - (NSDictionary *)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeAcceptedCommandListID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeAcceptedCommandListID) params:params]; } - (NSDictionary *)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeEventListID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeEventListID) params:params]; } - (NSDictionary *)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeAttributeListID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeAttributeListID) params:params]; } - (NSDictionary *)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeFeatureMapID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeFeatureMapID) params:params]; } - (NSDictionary *)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCRunID) - attributeID:@(MTRAttributeIDTypeClusterRVCRunAttributeClusterRevisionID) + clusterID:@(MTRClusterIDTypeRVCRunModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCRunModeSelectAttributeClusterRevisionID) params:params]; } @end -@implementation MTRClusterRVCClean +@implementation MTRClusterRVCCleanModeSelect - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpointID queue:(dispatch_queue_t)queue { @@ -13897,14 +13915,14 @@ - (instancetype)initWithDevice:(MTRDevice *)device endpointID:(NSNumber *)endpoi return self; } -- (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params +- (void)changeToModeWithParams:(MTRRVCCleanModeSelectClusterChangeToModeParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs completion:(MTRStatusCompletion)completion { - NSString * logPrefix = - [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, _endpoint, - (unsigned int) MTRClusterIDTypeRVCCleanID, (unsigned int) MTRCommandIDTypeClusterRVCCleanCommandChangeToModeID]; + NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, + _endpoint, (unsigned int) MTRClusterIDTypeRVCCleanModeSelectID, + (unsigned int) MTRCommandIDTypeClusterRVCCleanModeSelectCommandChangeToModeID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13931,7 +13949,7 @@ - (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcClean::Commands::ChangeToMode::Type request; + RvcCleanModeSelect::Commands::ChangeToMode::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } @@ -13965,15 +13983,15 @@ - (void)changeToModeWithParams:(MTRRVCCleanClusterChangeToModeParams *)params } } -- (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStatusParams *)params +- (void)changeToModeWithStatusWithParams:(MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams *)params expectedValues:(NSArray *> *)expectedValues expectedValueInterval:(NSNumber *)expectedValueIntervalMs - completion:(void (^)(MTRRVCCleanClusterChangeToModeResponseParams * _Nullable data, + completion:(void (^)(MTRRVCCleanModeSelectClusterChangeToModeResponseParams * _Nullable data, NSError * _Nullable error))completion { NSString * logPrefix = [NSString stringWithFormat:@"MTRDevice command %u %u %u %u", self.device.deviceController.fabricIndex, - _endpoint, (unsigned int) MTRClusterIDTypeRVCCleanID, - (unsigned int) MTRCommandIDTypeClusterRVCCleanCommandChangeToModeWithStatusID]; + _endpoint, (unsigned int) MTRClusterIDTypeRVCCleanModeSelectID, + (unsigned int) MTRCommandIDTypeClusterRVCCleanModeSelectCommandChangeToModeWithStatusID]; // Make a copy of params before we go async. params = [params copy]; NSNumber * timedInvokeTimeoutMsParam = params.timedInvokeTimeoutMs; @@ -13985,7 +14003,7 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStat MTRClustersLogDequeue(logPrefix, self.device.asyncCallbackWorkQueue); MTRBaseDevice * baseDevice = [[MTRBaseDevice alloc] initWithNodeID:self.device.nodeID controller:self.device.deviceController]; - auto * bridge = new MTRRVCCleanClusterChangeToModeResponseCallbackBridge( + auto * bridge = new MTRRVCCleanModeSelectClusterChangeToModeResponseCallbackBridge( self.device.queue, ^(id _Nullable value, NSError * _Nullable error) { MTRClustersLogCompletion(logPrefix, value, error); @@ -13995,13 +14013,13 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStat [workItem endWork]; }, ^(ExchangeManager & exchangeManager, const SessionHandle & session, - RVCCleanClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, + RVCCleanModeSelectClusterChangeToModeResponseCallbackType successCb, MTRErrorCallback failureCb, MTRCallbackBridgeBase * bridge) { - auto * typedBridge = static_cast(bridge); + auto * typedBridge = static_cast(bridge); Optional timedInvokeTimeoutMs; Optional invokeTimeout; ListFreer listFreer; - RvcClean::Commands::ChangeToModeWithStatus::Type request; + RvcCleanModeSelect::Commands::ChangeToModeWithStatus::Type request; if (timedInvokeTimeoutMsParam != nil) { timedInvokeTimeoutMs.SetValue(timedInvokeTimeoutMsParam.unsignedShortValue); } @@ -14038,32 +14056,32 @@ - (void)changeToModeWithStatusWithParams:(MTRRVCCleanClusterChangeToModeWithStat - (NSDictionary *)readAttributeDescriptionWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeDescriptionID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeDescriptionID) params:params]; } - (NSDictionary *)readAttributeSupportedModesWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeSupportedModesID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeSupportedModesID) params:params]; } - (NSDictionary *)readAttributeCurrentModeWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeCurrentModeID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeCurrentModeID) params:params]; } - (NSDictionary *)readAttributeStartUpModeWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeStartUpModeID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeStartUpModeID) params:params]; } @@ -14079,8 +14097,8 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary *)dataV NSNumber * timedWriteTimeout = params.timedWriteTimeout; [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeStartUpModeID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeStartUpModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -14089,8 +14107,8 @@ - (void)writeAttributeStartUpModeWithValue:(NSDictionary *)dataV - (NSDictionary *)readAttributeOnModeWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeOnModeID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeOnModeID) params:params]; } @@ -14106,8 +14124,8 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD NSNumber * timedWriteTimeout = params.timedWriteTimeout; [self.device writeAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeOnModeID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeOnModeID) value:dataValueDictionary expectedValueInterval:expectedValueIntervalMs timedWriteTimeout:timedWriteTimeout]; @@ -14116,48 +14134,48 @@ - (void)writeAttributeOnModeWithValue:(NSDictionary *)dataValueD - (NSDictionary *)readAttributeGeneratedCommandListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeGeneratedCommandListID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeGeneratedCommandListID) params:params]; } - (NSDictionary *)readAttributeAcceptedCommandListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeAcceptedCommandListID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeAcceptedCommandListID) params:params]; } - (NSDictionary *)readAttributeEventListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeEventListID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeEventListID) params:params]; } - (NSDictionary *)readAttributeAttributeListWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeAttributeListID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeAttributeListID) params:params]; } - (NSDictionary *)readAttributeFeatureMapWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeFeatureMapID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeFeatureMapID) params:params]; } - (NSDictionary *)readAttributeClusterRevisionWithParams:(MTRReadParams * _Nullable)params { return [self.device readAttributeWithEndpointID:@(_endpoint) - clusterID:@(MTRClusterIDTypeRVCCleanID) - attributeID:@(MTRAttributeIDTypeClusterRVCCleanAttributeClusterRevisionID) + clusterID:@(MTRClusterIDTypeRVCCleanModeSelectID) + attributeID:@(MTRAttributeIDTypeClusterRVCCleanModeSelectAttributeClusterRevisionID) params:params]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h index 7095d5e809c68c..79f521480b8897 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRClusters_Internal.h @@ -206,17 +206,17 @@ @property (nonatomic, readonly) MTRDevice * device; @end -@interface MTRClusterRefrigeratorAndTemperatureControlledCabinet () +@interface MTRClusterRefrigeratorAndTemperatureControlledCabinetModeSelect () @property (nonatomic, readonly) uint16_t endpoint; @property (nonatomic, readonly) MTRDevice * device; @end -@interface MTRClusterRVCRun () +@interface MTRClusterRVCRunModeSelect () @property (nonatomic, readonly) uint16_t endpoint; @property (nonatomic, readonly) MTRDevice * device; @end -@interface MTRClusterRVCClean () +@interface MTRClusterRVCCleanModeSelect () @property (nonatomic, readonly) uint16_t endpoint; @property (nonatomic, readonly) MTRDevice * device; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h index 883b24a0498f48..b305e7e3ede7b2 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h @@ -4210,7 +4210,7 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams : NSObject +@interface MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams : NSObject @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_NEWLY_AVAILABLE; /** @@ -4240,7 +4240,7 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams : NSObject +@interface MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams : NSObject @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_NEWLY_AVAILABLE; /** @@ -4270,15 +4270,15 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams : NSObject +@interface MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nullable statusText MTR_NEWLY_AVAILABLE; /** - * Initialize an MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams with a response-value dictionary - * of the sort that MTRDeviceResponseHandler would receive. + * Initialize an MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams with a response-value + * dictionary of the sort that MTRDeviceResponseHandler would receive. * * Will return nil and hand out an error if the response-value dictionary is not * a command data response or is not the right command response. @@ -4291,7 +4291,7 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRVCRunClusterChangeToModeParams : NSObject +@interface MTRRVCRunModeSelectClusterChangeToModeParams : NSObject @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_NEWLY_AVAILABLE; /** @@ -4321,7 +4321,7 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRVCRunClusterChangeToModeWithStatusParams : NSObject +@interface MTRRVCRunModeSelectClusterChangeToModeWithStatusParams : NSObject @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_NEWLY_AVAILABLE; /** @@ -4351,14 +4351,14 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRVCRunClusterChangeToModeResponseParams : NSObject +@interface MTRRVCRunModeSelectClusterChangeToModeResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nullable statusText MTR_NEWLY_AVAILABLE; /** - * Initialize an MTRRVCRunClusterChangeToModeResponseParams with a response-value dictionary + * Initialize an MTRRVCRunModeSelectClusterChangeToModeResponseParams with a response-value dictionary * of the sort that MTRDeviceResponseHandler would receive. * * Will return nil and hand out an error if the response-value dictionary is not @@ -4372,7 +4372,7 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRVCCleanClusterChangeToModeParams : NSObject +@interface MTRRVCCleanModeSelectClusterChangeToModeParams : NSObject @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_NEWLY_AVAILABLE; /** @@ -4402,7 +4402,7 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRVCCleanClusterChangeToModeWithStatusParams : NSObject +@interface MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams : NSObject @property (nonatomic, copy, getter=getNewMode) NSNumber * _Nonnull newMode MTR_NEWLY_AVAILABLE; /** @@ -4432,14 +4432,14 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRVCCleanClusterChangeToModeResponseParams : NSObject +@interface MTRRVCCleanModeSelectClusterChangeToModeResponseParams : NSObject @property (nonatomic, copy) NSNumber * _Nonnull status MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSString * _Nullable statusText MTR_NEWLY_AVAILABLE; /** - * Initialize an MTRRVCCleanClusterChangeToModeResponseParams with a response-value dictionary + * Initialize an MTRRVCCleanModeSelectClusterChangeToModeResponseParams with a response-value dictionary * of the sort that MTRDeviceResponseHandler would receive. * * Will return nil and hand out an error if the response-value dictionary is not diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm index e3b07f750085c5..6cf4ac393d7c1e 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm @@ -6731,7 +6731,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct: return CHIP_NO_ERROR; } @end -@implementation MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams +@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams - (instancetype)init { if (self = [super init]) { @@ -6745,7 +6745,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams alloc] init]; + auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams alloc] init]; other.newMode = self.newMode; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -6761,7 +6761,7 @@ - (NSString *)description } @end -@implementation MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams +@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams - (instancetype)init { if (self = [super init]) { @@ -6775,7 +6775,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams alloc] init]; + auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams alloc] init]; other.newMode = self.newMode; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -6791,7 +6791,7 @@ - (NSString *)description } @end -@implementation MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams +@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams - (instancetype)init { if (self = [super init]) { @@ -6805,7 +6805,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams alloc] init]; + auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams alloc] init]; other.status = self.status; other.statusText = self.statusText; @@ -6828,7 +6828,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r } using DecodableType - = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType; + = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType; chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue clusterID:DecodableType::GetClusterId() commandID:DecodableType::GetCommandId() @@ -6863,11 +6863,10 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r @end -@implementation MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams (InternalMethods) +@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams (InternalMethods) -- (CHIP_ERROR)_setFieldsFromDecodableStruct: - (const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType &) - decodableStruct +- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect:: + Commands::ChangeToModeResponse::DecodableType &)decodableStruct { { self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status]; @@ -6884,7 +6883,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct: return CHIP_NO_ERROR; } @end -@implementation MTRRVCRunClusterChangeToModeParams +@implementation MTRRVCRunModeSelectClusterChangeToModeParams - (instancetype)init { if (self = [super init]) { @@ -6898,7 +6897,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRVCRunClusterChangeToModeParams alloc] init]; + auto other = [[MTRRVCRunModeSelectClusterChangeToModeParams alloc] init]; other.newMode = self.newMode; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -6914,7 +6913,7 @@ - (NSString *)description } @end -@implementation MTRRVCRunClusterChangeToModeWithStatusParams +@implementation MTRRVCRunModeSelectClusterChangeToModeWithStatusParams - (instancetype)init { if (self = [super init]) { @@ -6928,7 +6927,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRVCRunClusterChangeToModeWithStatusParams alloc] init]; + auto other = [[MTRRVCRunModeSelectClusterChangeToModeWithStatusParams alloc] init]; other.newMode = self.newMode; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -6944,7 +6943,7 @@ - (NSString *)description } @end -@implementation MTRRVCRunClusterChangeToModeResponseParams +@implementation MTRRVCRunModeSelectClusterChangeToModeResponseParams - (instancetype)init { if (self = [super init]) { @@ -6958,7 +6957,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRVCRunClusterChangeToModeResponseParams alloc] init]; + auto other = [[MTRRVCRunModeSelectClusterChangeToModeResponseParams alloc] init]; other.status = self.status; other.statusText = self.statusText; @@ -6980,7 +6979,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r return nil; } - using DecodableType = chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType; + using DecodableType = chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType; chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue clusterID:DecodableType::GetClusterId() commandID:DecodableType::GetCommandId() @@ -7015,10 +7014,10 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r @end -@implementation MTRRVCRunClusterChangeToModeResponseParams (InternalMethods) +@implementation MTRRVCRunModeSelectClusterChangeToModeResponseParams (InternalMethods) - (CHIP_ERROR)_setFieldsFromDecodableStruct: - (const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType &)decodableStruct + (const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType &)decodableStruct { { self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status]; @@ -7035,7 +7034,7 @@ - (CHIP_ERROR)_setFieldsFromDecodableStruct: return CHIP_NO_ERROR; } @end -@implementation MTRRVCCleanClusterChangeToModeParams +@implementation MTRRVCCleanModeSelectClusterChangeToModeParams - (instancetype)init { if (self = [super init]) { @@ -7049,7 +7048,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRVCCleanClusterChangeToModeParams alloc] init]; + auto other = [[MTRRVCCleanModeSelectClusterChangeToModeParams alloc] init]; other.newMode = self.newMode; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -7065,7 +7064,7 @@ - (NSString *)description } @end -@implementation MTRRVCCleanClusterChangeToModeWithStatusParams +@implementation MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams - (instancetype)init { if (self = [super init]) { @@ -7079,7 +7078,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRVCCleanClusterChangeToModeWithStatusParams alloc] init]; + auto other = [[MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams alloc] init]; other.newMode = self.newMode; other.timedInvokeTimeoutMs = self.timedInvokeTimeoutMs; @@ -7095,7 +7094,7 @@ - (NSString *)description } @end -@implementation MTRRVCCleanClusterChangeToModeResponseParams +@implementation MTRRVCCleanModeSelectClusterChangeToModeResponseParams - (instancetype)init { if (self = [super init]) { @@ -7109,7 +7108,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone; { - auto other = [[MTRRVCCleanClusterChangeToModeResponseParams alloc] init]; + auto other = [[MTRRVCCleanModeSelectClusterChangeToModeResponseParams alloc] init]; other.status = self.status; other.statusText = self.statusText; @@ -7131,7 +7130,7 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r return nil; } - using DecodableType = chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType; + using DecodableType = chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType; chip::System::PacketBufferHandle buffer = [MTRBaseDevice _responseDataForCommand:responseValue clusterID:DecodableType::GetClusterId() commandID:DecodableType::GetCommandId() @@ -7166,10 +7165,10 @@ - (nullable instancetype)initWithResponseValue:(NSDictionary *)r @end -@implementation MTRRVCCleanClusterChangeToModeResponseParams (InternalMethods) +@implementation MTRRVCCleanModeSelectClusterChangeToModeResponseParams (InternalMethods) - (CHIP_ERROR)_setFieldsFromDecodableStruct: - (const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType &)decodableStruct + (const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType &)decodableStruct { { self.status = [NSNumber numberWithUnsignedChar:decodableStruct.status]; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h index c7cffbe3901010..f168549fa15207 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h @@ -231,25 +231,24 @@ NS_ASSUME_NONNULL_BEGIN @end -@interface MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams (InternalMethods) +@interface MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams (InternalMethods) -- (CHIP_ERROR)_setFieldsFromDecodableStruct: - (const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType &) - decodableStruct; +- (CHIP_ERROR)_setFieldsFromDecodableStruct:(const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect:: + Commands::ChangeToModeResponse::DecodableType &)decodableStruct; @end -@interface MTRRVCRunClusterChangeToModeResponseParams (InternalMethods) +@interface MTRRVCRunModeSelectClusterChangeToModeResponseParams (InternalMethods) - (CHIP_ERROR)_setFieldsFromDecodableStruct: - (const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType &)decodableStruct; + (const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType &)decodableStruct; @end -@interface MTRRVCCleanClusterChangeToModeResponseParams (InternalMethods) +@interface MTRRVCCleanModeSelectClusterChangeToModeResponseParams (InternalMethods) - (CHIP_ERROR)_setFieldsFromDecodableStruct: - (const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType &)decodableStruct; + (const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType &)decodableStruct; @end diff --git a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm index 05ae4f4d18e722..e39623bc61a656 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm @@ -1564,10 +1564,10 @@ static id _Nullable DecodeEventPayloadForLaundryWasherModeSelectCluster( *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; return nil; } -static id _Nullable DecodeEventPayloadForRefrigeratorAndTemperatureControlledCabinetCluster( +static id _Nullable DecodeEventPayloadForRefrigeratorAndTemperatureControlledCabinetModeSelectCluster( EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { - using namespace Clusters::RefrigeratorAndTemperatureControlledCabinet; + using namespace Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; switch (aEventId) { default: { break; @@ -1577,9 +1577,9 @@ static id _Nullable DecodeEventPayloadForRefrigeratorAndTemperatureControlledCab *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; return nil; } -static id _Nullable DecodeEventPayloadForRVCRunCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) +static id _Nullable DecodeEventPayloadForRVCRunModeSelectCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { - using namespace Clusters::RvcRun; + using namespace Clusters::RvcRunModeSelect; switch (aEventId) { default: { break; @@ -1589,9 +1589,9 @@ static id _Nullable DecodeEventPayloadForRVCRunCluster(EventId aEventId, TLV::TL *aError = CHIP_ERROR_IM_MALFORMED_EVENT_PATH_IB; return nil; } -static id _Nullable DecodeEventPayloadForRVCCleanCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) +static id _Nullable DecodeEventPayloadForRVCCleanModeSelectCluster(EventId aEventId, TLV::TLVReader & aReader, CHIP_ERROR * aError) { - using namespace Clusters::RvcClean; + using namespace Clusters::RvcCleanModeSelect; switch (aEventId) { default: { break; @@ -2952,14 +2952,14 @@ id _Nullable MTRDecodeEventPayload(const ConcreteEventPath & aPath, TLV::TLVRead case Clusters::LaundryWasherModeSelect::Id: { return DecodeEventPayloadForLaundryWasherModeSelectCluster(aPath.mEventId, aReader, aError); } - case Clusters::RefrigeratorAndTemperatureControlledCabinet::Id: { - return DecodeEventPayloadForRefrigeratorAndTemperatureControlledCabinetCluster(aPath.mEventId, aReader, aError); + case Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + return DecodeEventPayloadForRefrigeratorAndTemperatureControlledCabinetModeSelectCluster(aPath.mEventId, aReader, aError); } - case Clusters::RvcRun::Id: { - return DecodeEventPayloadForRVCRunCluster(aPath.mEventId, aReader, aError); + case Clusters::RvcRunModeSelect::Id: { + return DecodeEventPayloadForRVCRunModeSelectCluster(aPath.mEventId, aReader, aError); } - case Clusters::RvcClean::Id: { - return DecodeEventPayloadForRVCCleanCluster(aPath.mEventId, aReader, aError); + case Clusters::RvcCleanModeSelect::Id: { + return DecodeEventPayloadForRVCCleanModeSelectCluster(aPath.mEventId, aReader, aError); } case Clusters::TemperatureControl::Id: { return DecodeEventPayloadForTemperatureControlCluster(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 f2823fd100b566..d929ca3819f7dd 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -693,39 +693,39 @@ MTR_NEWLY_AVAILABLE @end MTR_NEWLY_AVAILABLE -@interface MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct : NSObject +@interface MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull mfgCode MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull value MTR_NEWLY_AVAILABLE; @end MTR_NEWLY_AVAILABLE -@interface MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct : NSObject +@interface MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull mode MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSArray * _Nonnull semanticTags MTR_NEWLY_AVAILABLE; @end MTR_NEWLY_AVAILABLE -@interface MTRRVCRunClusterSemanticTagStruct : NSObject +@interface MTRRVCRunModeSelectClusterSemanticTagStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull mfgCode MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull value MTR_NEWLY_AVAILABLE; @end MTR_NEWLY_AVAILABLE -@interface MTRRVCRunClusterModeOptionStruct : NSObject +@interface MTRRVCRunModeSelectClusterModeOptionStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull mode MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSArray * _Nonnull semanticTags MTR_NEWLY_AVAILABLE; @end MTR_NEWLY_AVAILABLE -@interface MTRRVCCleanClusterSemanticTagStruct : NSObject +@interface MTRRVCCleanModeSelectClusterSemanticTagStruct : NSObject @property (nonatomic, copy) NSNumber * _Nonnull mfgCode MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull value MTR_NEWLY_AVAILABLE; @end MTR_NEWLY_AVAILABLE -@interface MTRRVCCleanClusterModeOptionStruct : NSObject +@interface MTRRVCCleanModeSelectClusterModeOptionStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSNumber * _Nonnull mode MTR_NEWLY_AVAILABLE; @property (nonatomic, copy) NSArray * _Nonnull semanticTags MTR_NEWLY_AVAILABLE; diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 6dc19b68db0c82..fbd0ea5a25e8b0 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -2732,7 +2732,7 @@ - (NSString *)description @end -@implementation MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct +@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct - (instancetype)init { if (self = [super init]) { @@ -2746,7 +2746,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterSemanticTagStruct alloc] init]; + auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSemanticTagStruct alloc] init]; other.mfgCode = self.mfgCode; other.value = self.value; @@ -2763,7 +2763,7 @@ - (NSString *)description @end -@implementation MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct +@implementation MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct - (instancetype)init { if (self = [super init]) { @@ -2779,7 +2779,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterModeOptionStruct alloc] init]; + auto other = [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct alloc] init]; other.label = self.label; other.mode = self.mode; @@ -2797,7 +2797,7 @@ - (NSString *)description @end -@implementation MTRRVCRunClusterSemanticTagStruct +@implementation MTRRVCRunModeSelectClusterSemanticTagStruct - (instancetype)init { if (self = [super init]) { @@ -2811,7 +2811,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRRVCRunClusterSemanticTagStruct alloc] init]; + auto other = [[MTRRVCRunModeSelectClusterSemanticTagStruct alloc] init]; other.mfgCode = self.mfgCode; other.value = self.value; @@ -2828,7 +2828,7 @@ - (NSString *)description @end -@implementation MTRRVCRunClusterModeOptionStruct +@implementation MTRRVCRunModeSelectClusterModeOptionStruct - (instancetype)init { if (self = [super init]) { @@ -2844,7 +2844,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRRVCRunClusterModeOptionStruct alloc] init]; + auto other = [[MTRRVCRunModeSelectClusterModeOptionStruct alloc] init]; other.label = self.label; other.mode = self.mode; @@ -2862,7 +2862,7 @@ - (NSString *)description @end -@implementation MTRRVCCleanClusterSemanticTagStruct +@implementation MTRRVCCleanModeSelectClusterSemanticTagStruct - (instancetype)init { if (self = [super init]) { @@ -2876,7 +2876,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRRVCCleanClusterSemanticTagStruct alloc] init]; + auto other = [[MTRRVCCleanModeSelectClusterSemanticTagStruct alloc] init]; other.mfgCode = self.mfgCode; other.value = self.value; @@ -2893,7 +2893,7 @@ - (NSString *)description @end -@implementation MTRRVCCleanClusterModeOptionStruct +@implementation MTRRVCCleanModeSelectClusterModeOptionStruct - (instancetype)init { if (self = [super init]) { @@ -2909,7 +2909,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRRVCCleanClusterModeOptionStruct alloc] init]; + auto other = [[MTRRVCCleanModeSelectClusterModeOptionStruct alloc] init]; other.label = self.label; other.mode = self.mode; 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 4dfae3b501cd04..370c7e90814389 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 @@ -6955,6 +6955,59 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) } // namespace Description +namespace StandardNamespace { + +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType temp; + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::ModeSelect::Id, Id, readable, sizeof(temp)); + VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); + if (Traits::IsNullValue(temp)) + { + value.SetNull(); + } + else + { + value.SetNonNull() = Traits::StorageToWorking(temp); + } + return status; +} +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) +{ + using Traits = NumericAttributeTraits; + if (!Traits::CanRepresentValue(/* isNullable = */ true, value)) + { + return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; + } + Traits::StorageType storageValue; + Traits::WorkingToStorage(value, storageValue); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); + return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE); +} + +EmberAfStatus SetNull(chip::EndpointId endpoint) +{ + using Traits = NumericAttributeTraits; + Traits::StorageType value; + Traits::SetNull(value); + uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); + return emberAfWriteAttribute(endpoint, Clusters::ModeSelect::Id, Id, writable, ZCL_ENUM16_ATTRIBUTE_TYPE); +} + +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) +{ + if (value.IsNull()) + { + return SetNull(endpoint); + } + + return Set(endpoint, value.Value()); +} + +} // namespace StandardNamespace + namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -7392,7 +7445,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { namespace Attributes { namespace Description { @@ -7400,8 +7453,8 @@ namespace Description { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[64 + 1]; - EmberAfStatus status = - emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, + zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -7421,7 +7474,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[64 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, zclString, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } @@ -7433,9 +7486,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, + readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7454,7 +7507,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7466,9 +7519,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, + readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7490,7 +7543,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7500,7 +7553,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7522,9 +7575,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, + readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7546,7 +7599,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7556,7 +7609,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7578,9 +7631,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, + readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7599,7 +7652,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } @@ -7611,9 +7664,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) { using Traits = NumericAttributeTraits; Traits::StorageType temp; - uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = - emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, + readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7632,16 +7685,16 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinet +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect -namespace RvcRun { +namespace RvcRunModeSelect { namespace Attributes { namespace Description { @@ -7649,7 +7702,7 @@ namespace Description { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRun::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -7669,7 +7722,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[64 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace Description @@ -7681,7 +7734,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRun::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7700,7 +7753,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentMode @@ -7712,7 +7765,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRun::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7734,7 +7787,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -7743,7 +7796,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -7765,7 +7818,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRun::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7787,7 +7840,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -7796,7 +7849,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -7818,7 +7871,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRun::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7837,7 +7890,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -7849,7 +7902,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRun::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7868,15 +7921,15 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcRun::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcRun +} // namespace RvcRunModeSelect -namespace RvcClean { +namespace RvcCleanModeSelect { namespace Attributes { namespace Description { @@ -7884,7 +7937,7 @@ namespace Description { EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) { uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcClean::Id, Id, zclString, sizeof(zclString)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, zclString, sizeof(zclString)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); size_t length = emberAfStringLength(zclString); if (length == NumericAttributeTraits::kNullValue) @@ -7904,7 +7957,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) uint8_t zclString[64 + 1]; emberAfCopyInt8u(zclString, 0, static_cast(value.size())); memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); } } // namespace Description @@ -7916,7 +7969,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcClean::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7935,7 +7988,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentMode @@ -7947,7 +8000,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcClean::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7969,7 +8022,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -7978,7 +8031,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8000,7 +8053,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & valu using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcClean::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8022,7 +8075,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8031,7 +8084,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8053,7 +8106,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcClean::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8072,7 +8125,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -8084,7 +8137,7 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcClean::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8103,13 +8156,13 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteAttribute(endpoint, Clusters::RvcClean::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { 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 03ce547faf7fa9..455fb667433990 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 @@ -1342,6 +1342,13 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // ch EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); } // namespace Description +namespace StandardNamespace { +EmberAfStatus Get(chip::EndpointId endpoint, DataModel::Nullable & value); // enum16 +EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +EmberAfStatus SetNull(chip::EndpointId endpoint); +EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value); +} // namespace StandardNamespace + namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1414,7 +1421,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { namespace Attributes { namespace Description { @@ -1452,9 +1459,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinet +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect -namespace RvcRun { +namespace RvcRunModeSelect { namespace Attributes { namespace Description { @@ -1492,9 +1499,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcRun +} // namespace RvcRunModeSelect -namespace RvcClean { +namespace RvcCleanModeSelect { namespace Attributes { namespace Description { @@ -1532,7 +1539,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { 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 b5a1c89cebfb04..bbe5a758516402 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -377,29 +377,29 @@ void emberAfModeSelectClusterInitCallback(chip::EndpointId endpoint); */ void emberAfLaundryWasherModeSelectClusterInitCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Init +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRefrigeratorAndTemperatureControlledCabinetClusterInitCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterInitCallback(chip::EndpointId endpoint); -/** @brief RVC Run Cluster Init +/** @brief RVC Run Mode Select Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcRunClusterInitCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeSelectClusterInitCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Cluster Init +/** @brief RVC Clean Mode Select Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcCleanClusterInitCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeSelectClusterInitCallback(chip::EndpointId endpoint); /** @brief Temperature Control Cluster Init * @@ -4085,43 +4085,43 @@ void emberAfLaundryWasherModeSelectClusterServerTickCallback(chip::EndpointId en void emberAfLaundryWasherModeSelectClusterClientTickCallback(chip::EndpointId endpoint); // -// Refrigerator And Temperature Controlled Cabinet Cluster +// Refrigerator And Temperature Controlled Cabinet Mode Select Cluster // -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Server Init +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRefrigeratorAndTemperatureControlledCabinetClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Server Shutdown +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterRefrigeratorAndTemperatureControlledCabinetClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Client Init +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRefrigeratorAndTemperatureControlledCabinetClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Server Attribute Changed +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterRefrigeratorAndTemperatureControlledCabinetClusterServerAttributeChangedCallback( +void MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Server Pre Attribute Changed +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4130,10 +4130,11 @@ void MatterRefrigeratorAndTemperatureControlledCabinetClusterServerAttributeChan * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterRefrigeratorAndTemperatureControlledCabinetClusterServerPreAttributeChangedCallback( +chip::Protocols::InteractionModel::Status +MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Client Pre Attribute Changed +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4142,62 +4143,63 @@ chip::Protocols::InteractionModel::Status MatterRefrigeratorAndTemperatureContro * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterRefrigeratorAndTemperatureControlledCabinetClusterClientPreAttributeChangedCallback( +chip::Protocols::InteractionModel::Status +MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterClientPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Server Tick +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfRefrigeratorAndTemperatureControlledCabinetClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Cluster Client Tick +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfRefrigeratorAndTemperatureControlledCabinetClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterClientTickCallback(chip::EndpointId endpoint); // -// RVC Run Cluster +// RVC Run Mode Select Cluster // -/** @brief RVC Run Cluster Server Init +/** @brief RVC Run Mode Select Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcRunClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeSelectClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief RVC Run Cluster Server Shutdown +/** @brief RVC Run Mode Select Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterRvcRunClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterRvcRunModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief RVC Run Cluster Client Init +/** @brief RVC Run Mode Select Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcRunClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeSelectClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief RVC Run Cluster Server Attribute Changed +/** @brief RVC Run Mode Select Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterRvcRunClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterRvcRunModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief RVC Run Cluster Server Pre Attribute Changed +/** @brief RVC Run Mode Select Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4207,10 +4209,10 @@ void MatterRvcRunClusterServerAttributeChangedCallback(const chip::app::Concrete * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterRvcRunClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +MatterRvcRunModeSelectClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Run Cluster Client Pre Attribute Changed +/** @brief RVC Run Mode Select Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4220,62 +4222,62 @@ MatterRvcRunClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAt * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterRvcRunClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +MatterRvcRunModeSelectClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Run Cluster Server Tick +/** @brief RVC Run Mode Select Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcRunClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeSelectClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief RVC Run Cluster Client Tick +/** @brief RVC Run Mode Select Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcRunClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeSelectClusterClientTickCallback(chip::EndpointId endpoint); // -// RVC Clean Cluster +// RVC Clean Mode Select Cluster // -/** @brief RVC Clean Cluster Server Init +/** @brief RVC Clean Mode Select Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcCleanClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeSelectClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Cluster Server Shutdown +/** @brief RVC Clean Mode Select Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterRvcCleanClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterRvcCleanModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Cluster Client Init +/** @brief RVC Clean Mode Select Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcCleanClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeSelectClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Cluster Server Attribute Changed +/** @brief RVC Clean Mode Select Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterRvcCleanClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterRvcCleanModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief RVC Clean Cluster Server Pre Attribute Changed +/** @brief RVC Clean Mode Select Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4284,11 +4286,10 @@ void MatterRvcCleanClusterServerAttributeChangedCallback(const chip::app::Concre * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status -MatterRvcCleanClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status MatterRvcCleanModeSelectClusterServerPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Clean Cluster Client Pre Attribute Changed +/** @brief RVC Clean Mode Select Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4297,25 +4298,24 @@ MatterRvcCleanClusterServerPreAttributeChangedCallback(const chip::app::Concrete * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status -MatterRvcCleanClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status MatterRvcCleanModeSelectClusterClientPreAttributeChangedCallback( + const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Clean Cluster Server Tick +/** @brief RVC Clean Mode Select Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcCleanClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeSelectClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Cluster Client Tick +/** @brief RVC Clean Mode Select Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcCleanClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeSelectClusterClientTickCallback(chip::EndpointId endpoint); // // Temperature Control Cluster @@ -8378,42 +8378,43 @@ bool emberAfLaundryWasherModeSelectClusterChangeToModeWithStatusCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); /** - * @brief Refrigerator And Temperature Controlled Cabinet Cluster ChangeToMode Command callback (from client) + * @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster ChangeToMode Command callback (from client) */ -bool emberAfRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeCallback( +bool emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToMode::DecodableType & commandData); + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::DecodableType & + commandData); /** - * @brief Refrigerator And Temperature Controlled Cabinet Cluster ChangeToModeWithStatus Command callback (from client) + * @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster ChangeToModeWithStatus Command callback (from client) */ -bool emberAfRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusCallback( +bool emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeWithStatus::DecodableType & - commandData); + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus:: + DecodableType & commandData); /** - * @brief RVC Run Cluster ChangeToMode Command callback (from client) + * @brief RVC Run Mode Select Cluster ChangeToMode Command callback (from client) */ -bool emberAfRvcRunClusterChangeToModeCallback( +bool emberAfRvcRunModeSelectClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcRun::Commands::ChangeToMode::DecodableType & commandData); + const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief RVC Run Cluster ChangeToModeWithStatus Command callback (from client) + * @brief RVC Run Mode Select Cluster ChangeToModeWithStatus Command callback (from client) */ -bool emberAfRvcRunClusterChangeToModeWithStatusCallback( +bool emberAfRvcRunModeSelectClusterChangeToModeWithStatusCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcRun::Commands::ChangeToModeWithStatus::DecodableType & commandData); + const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); /** - * @brief RVC Clean Cluster ChangeToMode Command callback (from client) + * @brief RVC Clean Mode Select Cluster ChangeToMode Command callback (from client) */ -bool emberAfRvcCleanClusterChangeToModeCallback( +bool emberAfRvcCleanModeSelectClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcClean::Commands::ChangeToMode::DecodableType & commandData); + const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief RVC Clean Cluster ChangeToModeWithStatus Command callback (from client) + * @brief RVC Clean Mode Select Cluster ChangeToModeWithStatus Command callback (from client) */ -bool emberAfRvcCleanClusterChangeToModeWithStatusCallback( +bool emberAfRvcCleanModeSelectClusterChangeToModeWithStatusCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcClean::Commands::ChangeToModeWithStatus::DecodableType & commandData); + const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); /** * @brief Temperature Control Cluster SetTemperature Command callback (from client) */ diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h index 421e4a5bef8d8d..3b2f2bb2376c54 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-enums-check.h @@ -1333,9 +1333,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(LaundryWasherModeSelect } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RefrigeratorAndTemperatureControlledCabinet::SemanticTags val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags val) { - using EnumType = RefrigeratorAndTemperatureControlledCabinet::SemanticTags; + using EnumType = RefrigeratorAndTemperatureControlledCabinetModeSelect::SemanticTags; switch (val) { case EnumType::kRapidCool: @@ -1346,9 +1346,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RefrigeratorAndTemperat } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRun::ChangeToModeResponseStatus val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunModeSelect::ChangeToModeResponseStatus val) { - using EnumType = RvcRun::ChangeToModeResponseStatus; + using EnumType = RvcRunModeSelect::ChangeToModeResponseStatus; switch (val) { case EnumType::kBatteryLow: @@ -1363,9 +1363,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRun::ChangeToModeRes return static_cast(0); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRun::SemanticTags val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunModeSelect::SemanticTags val) { - using EnumType = RvcRun::SemanticTags; + using EnumType = RvcRunModeSelect::SemanticTags; switch (val) { case EnumType::kIdle: @@ -1376,9 +1376,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRun::SemanticTags va } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcClean::ChangeToModeResponseStatus val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanModeSelect::ChangeToModeResponseStatus val) { - using EnumType = RvcClean::ChangeToModeResponseStatus; + using EnumType = RvcCleanModeSelect::ChangeToModeResponseStatus; switch (val) { case EnumType::kCleaningInProgress: @@ -1387,9 +1387,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcClean::ChangeToModeR return static_cast(0); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcClean::SemanticTags val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanModeSelect::SemanticTags val) { - using EnumType = RvcClean::SemanticTags; + using EnumType = RvcCleanModeSelect::SemanticTags; switch (val) { case EnumType::kDeepClean: 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 2c77f77802e928..dd0d902ecaa1e2 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 @@ -1562,7 +1562,7 @@ enum class ModeSelectFeature : uint32_t }; } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { // Enum for SemanticTags enum class SemanticTags : uint16_t @@ -1582,9 +1582,9 @@ enum class ModeSelectFeature : uint32_t kOnOff = 0x1, kExtendedStatus = 0x2, }; -} // namespace RefrigeratorAndTemperatureControlledCabinet +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect -namespace RvcRun { +namespace RvcRunModeSelect { // Enum for ChangeToModeResponseStatus enum class ChangeToModeResponseStatus : uint8_t @@ -1621,9 +1621,9 @@ enum class ModeSelectFeature : uint32_t kOnOff = 0x1, kExtendedStatus = 0x2, }; -} // namespace RvcRun +} // namespace RvcRunModeSelect -namespace RvcClean { +namespace RvcCleanModeSelect { // Enum for ChangeToModeResponseStatus enum class ChangeToModeResponseStatus : uint8_t @@ -1655,7 +1655,7 @@ enum class ModeSelectFeature : uint32_t kOnOff = 0x1, kExtendedStatus = 0x2, }; -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { 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 1ee2d48540a87f..d409cd01835fe7 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 @@ -11457,6 +11457,9 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre case Attributes::Description::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, description)); break; + case Attributes::StandardNamespace::TypeInfo::GetAttributeId(): + ReturnErrorOnFailure(DataModel::Decode(reader, standardNamespace)); + break; case Attributes::SupportedModes::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, supportedModes)); break; @@ -11668,7 +11671,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { namespace Structs {} // namespace Structs namespace Commands { @@ -11837,8 +11840,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace RefrigeratorAndTemperatureControlledCabinet -namespace RvcRun { +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +namespace RvcRunModeSelect { namespace Structs {} // namespace Structs namespace Commands { @@ -12007,8 +12010,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace RvcRun -namespace RvcClean { +} // namespace RvcRunModeSelect +namespace RvcCleanModeSelect { namespace Structs {} // namespace Structs namespace Commands { @@ -12177,7 +12180,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { namespace Structs { namespace TemperatureLevelStruct { @@ -24916,21 +24919,21 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand) return false; } } - case Clusters::RefrigeratorAndTemperatureControlledCabinet::Id: { + case Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { switch (aCommand) { default: return false; } } - case Clusters::RvcRun::Id: { + case Clusters::RvcRunModeSelect::Id: { switch (aCommand) { default: return false; } } - case Clusters::RvcClean::Id: { + case Clusters::RvcCleanModeSelect::Id: { switch (aCommand) { default: 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 ccdff8d1778afe..4e4453871c5454 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 @@ -14194,6 +14194,18 @@ struct TypeInfo static constexpr size_t MaxLength() { return 64; } }; } // namespace Description +namespace StandardNamespace { +struct TypeInfo +{ + using Type = chip::app::DataModel::Nullable; + using DecodableType = chip::app::DataModel::Nullable; + using DecodableArgType = const chip::app::DataModel::Nullable &; + + static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; } + static constexpr AttributeId GetAttributeId() { return Attributes::StandardNamespace::Id; } + static constexpr bool MustUseTimedWrite() { return false; } +}; +} // namespace StandardNamespace namespace SupportedModes { struct TypeInfo { @@ -14290,6 +14302,7 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); Attributes::Description::TypeInfo::DecodableType description; + Attributes::StandardNamespace::TypeInfo::DecodableType standardNamespace; Attributes::SupportedModes::TypeInfo::DecodableType supportedModes; Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast(0); Attributes::StartUpMode::TypeInfo::DecodableType startUpMode; @@ -14581,7 +14594,7 @@ struct TypeInfo }; } // namespace Attributes } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { namespace Structs { namespace SemanticTagStruct { @@ -14643,7 +14656,7 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } uint8_t newMode = static_cast(0); @@ -14658,7 +14671,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -14675,13 +14688,14 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType; + using ResponseType = + Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14690,7 +14704,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -14708,7 +14722,7 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -14724,7 +14738,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -14742,7 +14756,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 64; } @@ -14752,13 +14766,13 @@ namespace SupportedModes { struct TypeInfo { using Type = chip::app::DataModel::List< - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::Type>; + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type>; using DecodableType = chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType>; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType>; using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> &; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> &; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14770,7 +14784,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14782,7 +14796,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14794,7 +14808,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14802,37 +14816,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } }; } // namespace ClusterRevision @@ -14840,7 +14854,7 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinet::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); @@ -14858,8 +14872,8 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinet -namespace RvcRun { +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +namespace RvcRunModeSelect { namespace Structs { namespace SemanticTagStruct { @@ -14921,7 +14935,7 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } uint8_t newMode = static_cast(0); @@ -14936,7 +14950,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -14953,13 +14967,13 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType; + using ResponseType = Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14968,7 +14982,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -14986,7 +15000,7 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15002,7 +15016,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15020,7 +15034,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 64; } @@ -15029,13 +15043,13 @@ struct TypeInfo namespace SupportedModes { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; - using DecodableArgType = - const chip::app::DataModel::DecodableList &; + chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList< + chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::DecodableType> &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15047,7 +15061,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15059,7 +15073,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15071,7 +15085,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15079,37 +15093,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } }; } // namespace ClusterRevision @@ -15117,7 +15131,7 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRun::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); @@ -15135,8 +15149,8 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace RvcRun -namespace RvcClean { +} // namespace RvcRunModeSelect +namespace RvcCleanModeSelect { namespace Structs { namespace SemanticTagStruct { @@ -15198,7 +15212,7 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } uint8_t newMode = static_cast(0); @@ -15213,7 +15227,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -15230,13 +15244,13 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType; + using ResponseType = Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15245,7 +15259,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -15263,7 +15277,7 @@ struct Type public: // Use GetCommandId instead of commandId directly to avoid naming conflict with CommandIdentification in ExecutionOfACommand static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15279,7 +15293,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15297,7 +15311,7 @@ struct TypeInfo using DecodableType = chip::CharSpan; using DecodableArgType = chip::CharSpan; - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; } static constexpr bool MustUseTimedWrite() { return false; } static constexpr size_t MaxLength() { return 64; } @@ -15306,13 +15320,13 @@ struct TypeInfo namespace SupportedModes { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; - using DecodableArgType = - const chip::app::DataModel::DecodableList &; + chip::app::DataModel::DecodableList; + using DecodableArgType = const chip::app::DataModel::DecodableList< + chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::DecodableType> &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15324,7 +15338,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15336,7 +15350,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15348,7 +15362,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15356,37 +15370,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } }; } // namespace ClusterRevision @@ -15394,7 +15408,7 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::RvcClean::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); @@ -15412,7 +15426,7 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { namespace Structs { namespace TemperatureLevelStruct { 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 58ffb24d354755..2dc97c2ea8c0d7 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 @@ -2412,6 +2412,10 @@ namespace Description { static constexpr AttributeId Id = 0x00000000; } // namespace Description +namespace StandardNamespace { +static constexpr AttributeId Id = 0x00000001; +} // namespace StandardNamespace + namespace SupportedModes { static constexpr AttributeId Id = 0x00000002; } // namespace SupportedModes @@ -2505,7 +2509,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { namespace Attributes { namespace Description { @@ -2553,9 +2557,9 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinet +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect -namespace RvcRun { +namespace RvcRunModeSelect { namespace Attributes { namespace Description { @@ -2603,9 +2607,9 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcRun +} // namespace RvcRunModeSelect -namespace RvcClean { +namespace RvcCleanModeSelect { namespace Attributes { namespace Description { @@ -2653,7 +2657,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { 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 ca7a8adf4a0766..71cfa1d7020204 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 @@ -154,15 +154,15 @@ static constexpr ClusterId Id = 0x00000050; namespace LaundryWasherModeSelect { static constexpr ClusterId Id = 0x00000051; } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { static constexpr ClusterId Id = 0x00000052; -} // namespace RefrigeratorAndTemperatureControlledCabinet -namespace RvcRun { +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +namespace RvcRunModeSelect { static constexpr ClusterId Id = 0x00000054; -} // namespace RvcRun -namespace RvcClean { +} // namespace RvcRunModeSelect +namespace RvcCleanModeSelect { static constexpr ClusterId Id = 0x00000055; -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { static constexpr ClusterId Id = 0x00000056; } // namespace TemperatureControl 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 245ac8f1ce2398..ceb38eccb7da31 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 @@ -667,7 +667,7 @@ static constexpr CommandId Id = 0x00000002; } // namespace Commands } // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinet { +namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { namespace Commands { namespace ChangeToMode { @@ -683,9 +683,9 @@ static constexpr CommandId Id = 0x00000002; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace RefrigeratorAndTemperatureControlledCabinet +} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect -namespace RvcRun { +namespace RvcRunModeSelect { namespace Commands { namespace ChangeToMode { @@ -701,9 +701,9 @@ static constexpr CommandId Id = 0x00000002; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace RvcRun +} // namespace RvcRunModeSelect -namespace RvcClean { +namespace RvcCleanModeSelect { namespace Commands { namespace ChangeToMode { @@ -719,7 +719,7 @@ static constexpr CommandId Id = 0x00000002; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace RvcClean +} // namespace RvcCleanModeSelect namespace TemperatureControl { namespace Commands { diff --git a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h index af027781720f78..6a49a5045ebabe 100644 --- a/zzz_generated/app-common/app-common/zap-generated/print-cluster.h +++ b/zzz_generated/app-common/app-common/zap-generated/print-cluster.h @@ -299,24 +299,25 @@ #define CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_SELECT_CLUSTER #endif -#if defined(ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_SERVER) || \ - defined(ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER \ - { chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Id, "Refrigerator And Temperature Controlled Cabinet" }, +#if defined(ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_SERVER) || \ + defined(ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER \ + { chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, \ + "Refrigerator And Temperature Controlled Cabinet Mode Select" }, #else -#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER +#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER #endif -#if defined(ZCL_USING_RVC_RUN_CLUSTER_SERVER) || defined(ZCL_USING_RVC_RUN_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_RVC_RUN_CLUSTER { chip::app::Clusters::RvcRun::Id, "RVC Run" }, +#if defined(ZCL_USING_RVC_RUN_MODE_SELECT_CLUSTER_SERVER) || defined(ZCL_USING_RVC_RUN_MODE_SELECT_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_RVC_RUN_MODE_SELECT_CLUSTER { chip::app::Clusters::RvcRunModeSelect::Id, "RVC Run Mode Select" }, #else -#define CHIP_PRINTCLUSTER_RVC_RUN_CLUSTER +#define CHIP_PRINTCLUSTER_RVC_RUN_MODE_SELECT_CLUSTER #endif -#if defined(ZCL_USING_RVC_CLEAN_CLUSTER_SERVER) || defined(ZCL_USING_RVC_CLEAN_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_RVC_CLEAN_CLUSTER { chip::app::Clusters::RvcClean::Id, "RVC Clean" }, +#if defined(ZCL_USING_RVC_CLEAN_MODE_SELECT_CLUSTER_SERVER) || defined(ZCL_USING_RVC_CLEAN_MODE_SELECT_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_SELECT_CLUSTER { chip::app::Clusters::RvcCleanModeSelect::Id, "RVC Clean Mode Select" }, #else -#define CHIP_PRINTCLUSTER_RVC_CLEAN_CLUSTER +#define CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_SELECT_CLUSTER #endif #if defined(ZCL_USING_TEMPERATURE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_TEMPERATURE_CONTROL_CLUSTER_CLIENT) @@ -660,9 +661,9 @@ CHIP_PRINTCLUSTER_ICD_MANAGEMENT_CLUSTER \ CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER \ CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_SELECT_CLUSTER \ - CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER \ - CHIP_PRINTCLUSTER_RVC_RUN_CLUSTER \ - CHIP_PRINTCLUSTER_RVC_CLEAN_CLUSTER \ + CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER \ + CHIP_PRINTCLUSTER_RVC_RUN_MODE_SELECT_CLUSTER \ + CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_SELECT_CLUSTER \ CHIP_PRINTCLUSTER_TEMPERATURE_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_DISHWASHER_MODE_SELECT_CLUSTER \ CHIP_PRINTCLUSTER_AIR_QUALITY_CLUSTER \ @@ -710,4 +711,4 @@ CHIP_PRINTCLUSTER_UNIT_TESTING_CLUSTER \ CHIP_PRINTCLUSTER_FAULT_INJECTION_CLUSTER -#define MAX_CLUSTER_NAME_LENGTH 47 +#define MAX_CLUSTER_NAME_LENGTH 59 diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index 96e2394604cdf3..cfdaa971155753 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -75,9 +75,9 @@ | IcdManagement | 0x0046 | | ModeSelect | 0x0050 | | LaundryWasherModeSelect | 0x0051 | -| RefrigeratorAndTemperatureControlledCabinet | 0x0052 | -| RvcRun | 0x0054 | -| RvcClean | 0x0055 | +| RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | +| RvcRunModeSelect | 0x0054 | +| RvcCleanModeSelect | 0x0055 | | TemperatureControl | 0x0056 | | DishwasherModeSelect | 0x0059 | | AirQuality | 0x005B | @@ -3999,6 +3999,7 @@ class IcdManagementStayActiveRequest : public ClusterCommand |------------------------------------------------------------------------------| | Attributes: | | | * Description | 0x0000 | +| * StandardNamespace | 0x0001 | | * SupportedModes | 0x0002 | | * CurrentMode | 0x0003 | | * StartUpMode | 0x0004 | @@ -4160,7 +4161,7 @@ class LaundryWasherModeSelectChangeToModeWithStatus : public ClusterCommand }; /*----------------------------------------------------------------------------*\ -| Cluster RefrigeratorAndTemperatureControlledCabinet | 0x0052 | +| Cluster RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | @@ -4185,10 +4186,10 @@ class LaundryWasherModeSelectChangeToModeWithStatus : public ClusterCommand /* * Command ChangeToMode */ -class RefrigeratorAndTemperatureControlledCabinetChangeToMode : public ClusterCommand +class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode : public ClusterCommand { public: - RefrigeratorAndTemperatureControlledCabinetChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : + RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -4210,16 +4211,16 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToMode : public ClusterCo } private: - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToMode::Type mRequest; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::Type mRequest; }; /* * Command ChangeToModeWithStatus */ -class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public ClusterCommand +class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatus : public ClusterCommand { public: - RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : + RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode-with-status", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -4241,11 +4242,11 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public } private: - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; }; /*----------------------------------------------------------------------------*\ -| Cluster RvcRun | 0x0054 | +| Cluster RvcRunModeSelect | 0x0054 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | @@ -4270,10 +4271,10 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public /* * Command ChangeToMode */ -class RvcRunChangeToMode : public ClusterCommand +class RvcRunModeSelectChangeToMode : public ClusterCommand { public: - RvcRunChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) + RvcRunModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); ClusterCommand::AddArguments(); @@ -4294,16 +4295,16 @@ class RvcRunChangeToMode : public ClusterCommand } private: - chip::app::Clusters::RvcRun::Commands::ChangeToMode::Type mRequest; + chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToMode::Type mRequest; }; /* * Command ChangeToModeWithStatus */ -class RvcRunChangeToModeWithStatus : public ClusterCommand +class RvcRunModeSelectChangeToModeWithStatus : public ClusterCommand { public: - RvcRunChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : + RvcRunModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode-with-status", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -4325,11 +4326,11 @@ class RvcRunChangeToModeWithStatus : public ClusterCommand } private: - chip::app::Clusters::RvcRun::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; }; /*----------------------------------------------------------------------------*\ -| Cluster RvcClean | 0x0055 | +| Cluster RvcCleanModeSelect | 0x0055 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | @@ -4354,10 +4355,11 @@ class RvcRunChangeToModeWithStatus : public ClusterCommand /* * Command ChangeToMode */ -class RvcCleanChangeToMode : public ClusterCommand +class RvcCleanModeSelectChangeToMode : public ClusterCommand { public: - RvcCleanChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) + RvcCleanModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : + ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); ClusterCommand::AddArguments(); @@ -4378,16 +4380,16 @@ class RvcCleanChangeToMode : public ClusterCommand } private: - chip::app::Clusters::RvcClean::Commands::ChangeToMode::Type mRequest; + chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToMode::Type mRequest; }; /* * Command ChangeToModeWithStatus */ -class RvcCleanChangeToModeWithStatus : public ClusterCommand +class RvcCleanModeSelectChangeToModeWithStatus : public ClusterCommand { public: - RvcCleanChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : + RvcCleanModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode-with-status", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -4409,7 +4411,7 @@ class RvcCleanChangeToModeWithStatus : public ClusterCommand } private: - chip::app::Clusters::RvcClean::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -13377,6 +13379,7 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c // make_unique(Id, credsIssuerConfig), // make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // + make_unique(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig), // make_unique(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig), // make_unique(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig), // make_unique(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig), // @@ -13390,6 +13393,9 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c make_unique>(Id, credsIssuerConfig), // make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // + make_unique>>(Id, "standard-namespace", 0, UINT16_MAX, + Attributes::StandardNamespace::Id, + WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -13414,6 +13420,7 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // make_unique(Id, "description", Attributes::Description::Id, credsIssuerConfig), // + make_unique(Id, "standard-namespace", Attributes::StandardNamespace::Id, credsIssuerConfig), // make_unique(Id, "supported-modes", Attributes::SupportedModes::Id, credsIssuerConfig), // make_unique(Id, "current-mode", Attributes::CurrentMode::Id, credsIssuerConfig), // make_unique(Id, "start-up-mode", Attributes::StartUpMode::Id, credsIssuerConfig), // @@ -13507,19 +13514,20 @@ void registerClusterLaundryWasherModeSelect(Commands & commands, CredentialIssue commands.Register(clusterName, clusterCommands); } -void registerClusterRefrigeratorAndTemperatureControlledCabinet(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(Commands & commands, + CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet; + using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; - const char * clusterName = "RefrigeratorAndTemperatureControlledCabinet"; + const char * clusterName = "RefrigeratorAndTemperatureControlledCabinetModeSelect"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // @@ -13539,7 +13547,7 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinet(Commands & comma make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type>>>( Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -13581,19 +13589,19 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinet(Commands & comma commands.Register(clusterName, clusterCommands); } -void registerClusterRvcRun(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterRvcRunModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::RvcRun; + using namespace chip::app::Clusters::RvcRunModeSelect; - const char * clusterName = "RvcRun"; + const char * clusterName = "RvcRunModeSelect"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // @@ -13613,7 +13621,7 @@ void registerClusterRvcRun(Commands & commands, CredentialIssuerCommands * creds make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( + chip::app::DataModel::List>>( Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -13655,19 +13663,19 @@ void registerClusterRvcRun(Commands & commands, CredentialIssuerCommands * creds commands.Register(clusterName, clusterCommands); } -void registerClusterRvcClean(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterRvcCleanModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::RvcClean; + using namespace chip::app::Clusters::RvcCleanModeSelect; - const char * clusterName = "RvcClean"; + const char * clusterName = "RvcCleanModeSelect"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // @@ -13687,7 +13695,7 @@ void registerClusterRvcClean(Commands & commands, CredentialIssuerCommands * cre make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>>( + chip::app::DataModel::List>>( Id, "supported-modes", Attributes::SupportedModes::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique>(Id, "current-mode", 0, UINT8_MAX, Attributes::CurrentMode::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // @@ -19081,9 +19089,9 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue registerClusterIcdManagement(commands, credsIssuerConfig); registerClusterModeSelect(commands, credsIssuerConfig); registerClusterLaundryWasherModeSelect(commands, credsIssuerConfig); - registerClusterRefrigeratorAndTemperatureControlledCabinet(commands, credsIssuerConfig); - registerClusterRvcRun(commands, credsIssuerConfig); - registerClusterRvcClean(commands, credsIssuerConfig); + registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(commands, credsIssuerConfig); + registerClusterRvcRunModeSelect(commands, credsIssuerConfig); + registerClusterRvcCleanModeSelect(commands, credsIssuerConfig); registerClusterTemperatureControl(commands, credsIssuerConfig); registerClusterDishwasherModeSelect(commands, credsIssuerConfig); registerClusterAirQuality(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 6bc62530d2c75f..62835e4040e50a 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -1949,7 +1949,7 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::LaundryWasherModeSelec CHIP_ERROR ComplexArgumentParser::Setup( const char * label, - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::SemanticTagStruct::Type & request, + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -1974,14 +1974,15 @@ CHIP_ERROR ComplexArgumentParser::Setup( } void ComplexArgumentParser::Finalize( - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::SemanticTagStruct::Type & request) + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::SemanticTagStruct::Type & request) { ComplexArgumentParser::Finalize(request.mfgCode); ComplexArgumentParser::Finalize(request.value); } CHIP_ERROR ComplexArgumentParser::Setup( - const char * label, chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::Type & request, + const char * label, + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -2011,14 +2012,15 @@ CHIP_ERROR ComplexArgumentParser::Setup( } void ComplexArgumentParser::Finalize( - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::Type & request) + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type & request) { ComplexArgumentParser::Finalize(request.label); ComplexArgumentParser::Finalize(request.mode); ComplexArgumentParser::Finalize(request.semanticTags); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::RvcRun::Structs::SemanticTagStruct::Type & request, +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::RvcRunModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -2042,13 +2044,14 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcRun::Structs::SemanticTagStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcRunModeSelect::Structs::SemanticTagStruct::Type & request) { ComplexArgumentParser::Finalize(request.mfgCode); ComplexArgumentParser::Finalize(request.value); } -CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::RvcRun::Structs::ModeOptionStruct::Type & request, +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -2077,7 +2080,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcRun::Structs::ModeOptionStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::Type & request) { ComplexArgumentParser::Finalize(request.label); ComplexArgumentParser::Finalize(request.mode); @@ -2085,7 +2088,7 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcRun::Structs::ModeO } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::RvcClean::Structs::SemanticTagStruct::Type & request, + chip::app::Clusters::RvcCleanModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -2109,14 +2112,14 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcClean::Structs::SemanticTagStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcCleanModeSelect::Structs::SemanticTagStruct::Type & request) { ComplexArgumentParser::Finalize(request.mfgCode); ComplexArgumentParser::Finalize(request.value); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, - chip::app::Clusters::RvcClean::Structs::ModeOptionStruct::Type & request, + chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::Type & request, Json::Value & value) { VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); @@ -2145,7 +2148,7 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } -void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcClean::Structs::ModeOptionStruct::Type & request) +void ComplexArgumentParser::Finalize(chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::Type & request) { ComplexArgumentParser::Finalize(request.label); ComplexArgumentParser::Finalize(request.mode); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index d1b9bca51b2e12..badd101d869334 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -246,36 +246,39 @@ static void Finalize(chip::app::Clusters::LaundryWasherModeSelect::Structs::Mode static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::SemanticTagStruct::Type & request, + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::SemanticTagStruct::Type & request); +static void +Finalize(chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::SemanticTagStruct::Type & request); -static CHIP_ERROR Setup(const char * label, - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::Type & request, - Json::Value & value); +static CHIP_ERROR +Setup(const char * label, + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type & request, + Json::Value & value); -static void Finalize(chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::Type & request); +static void +Finalize(chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcRun::Structs::SemanticTagStruct::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcRunModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::RvcRun::Structs::SemanticTagStruct::Type & request); +static void Finalize(chip::app::Clusters::RvcRunModeSelect::Structs::SemanticTagStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcRun::Structs::ModeOptionStruct::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::RvcRun::Structs::ModeOptionStruct::Type & request); +static void Finalize(chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcClean::Structs::SemanticTagStruct::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcCleanModeSelect::Structs::SemanticTagStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::RvcClean::Structs::SemanticTagStruct::Type & request); +static void Finalize(chip::app::Clusters::RvcCleanModeSelect::Structs::SemanticTagStruct::Type & request); -static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcClean::Structs::ModeOptionStruct::Type & request, +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::Type & request, Json::Value & value); -static void Finalize(chip::app::Clusters::RvcClean::Structs::ModeOptionStruct::Type & request); +static void Finalize(chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::Type & request); static CHIP_ERROR Setup(const char * label, chip::app::Clusters::TemperatureControl::Structs::TemperatureLevelStruct::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 4fe8b49498b087..6ed35ea120dbe5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -1771,7 +1771,8 @@ DataModelLogger::LogValue(const char * label, size_t indent, CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::SemanticTagStruct::DecodableType & value) + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::SemanticTagStruct::DecodableType & + value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1797,7 +1798,8 @@ CHIP_ERROR DataModelLogger::LogValue( CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType & value) + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType & + value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1830,7 +1832,7 @@ CHIP_ERROR DataModelLogger::LogValue( } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcRun::Structs::SemanticTagStruct::DecodableType & value) + const chip::app::Clusters::RvcRunModeSelect::Structs::SemanticTagStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1855,7 +1857,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcRun::Structs::ModeOptionStruct::DecodableType & value) + const chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1887,8 +1889,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcClean::Structs::SemanticTagStruct::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::RvcCleanModeSelect::Structs::SemanticTagStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -1912,8 +1915,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcClean::Structs::ModeOptionStruct::DecodableType & value) +CHIP_ERROR +DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); { @@ -4665,9 +4669,9 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; } -CHIP_ERROR -DataModelLogger::LogValue(const char * label, size_t indent, - const RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType & value) +CHIP_ERROR DataModelLogger::LogValue( + const char * label, size_t indent, + const RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -4676,7 +4680,7 @@ DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const RvcRun::Commands::ChangeToModeResponse::DecodableType & value) + const RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -4685,7 +4689,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const RvcClean::Commands::ChangeToModeResponse::DecodableType & value) + const RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -7936,6 +7940,11 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Description", 1, value); } + case ModeSelect::Attributes::StandardNamespace::Id: { + chip::app::DataModel::Nullable value; + ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); + return DataModelLogger::LogValue("StandardNamespace", 1, value); + } case ModeSelect::Attributes::SupportedModes::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); @@ -8052,62 +8061,62 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case RefrigeratorAndTemperatureControlledCabinet::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { switch (path.mAttributeId) { - case RefrigeratorAndTemperatureControlledCabinet::Attributes::Description::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::Description::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Description", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::CurrentMode::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::StartUpMode::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::OnMode::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::GeneratedCommandList::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::AcceptedCommandList::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::EventList::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::AttributeList::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::FeatureMap::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case RefrigeratorAndTemperatureControlledCabinet::Attributes::ClusterRevision::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -8115,60 +8124,61 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case RvcRun::Id: { + case RvcRunModeSelect::Id: { switch (path.mAttributeId) { - case RvcRun::Attributes::Description::Id: { + case RvcRunModeSelect::Attributes::Description::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Description", 1, value); } - case RvcRun::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList value; + case RvcRunModeSelect::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList + value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case RvcRun::Attributes::CurrentMode::Id: { + case RvcRunModeSelect::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case RvcRun::Attributes::StartUpMode::Id: { + case RvcRunModeSelect::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case RvcRun::Attributes::OnMode::Id: { + case RvcRunModeSelect::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case RvcRun::Attributes::GeneratedCommandList::Id: { + case RvcRunModeSelect::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case RvcRun::Attributes::AcceptedCommandList::Id: { + case RvcRunModeSelect::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case RvcRun::Attributes::EventList::Id: { + case RvcRunModeSelect::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case RvcRun::Attributes::AttributeList::Id: { + case RvcRunModeSelect::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case RvcRun::Attributes::FeatureMap::Id: { + case RvcRunModeSelect::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case RvcRun::Attributes::ClusterRevision::Id: { + case RvcRunModeSelect::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -8176,60 +8186,61 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case RvcClean::Id: { + case RvcCleanModeSelect::Id: { switch (path.mAttributeId) { - case RvcClean::Attributes::Description::Id: { + case RvcCleanModeSelect::Attributes::Description::Id: { chip::CharSpan value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("Description", 1, value); } - case RvcClean::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList value; + case RvcCleanModeSelect::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList + value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case RvcClean::Attributes::CurrentMode::Id: { + case RvcCleanModeSelect::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case RvcClean::Attributes::StartUpMode::Id: { + case RvcCleanModeSelect::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case RvcClean::Attributes::OnMode::Id: { + case RvcCleanModeSelect::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case RvcClean::Attributes::GeneratedCommandList::Id: { + case RvcCleanModeSelect::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case RvcClean::Attributes::AcceptedCommandList::Id: { + case RvcCleanModeSelect::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case RvcClean::Attributes::EventList::Id: { + case RvcCleanModeSelect::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case RvcClean::Attributes::AttributeList::Id: { + case RvcCleanModeSelect::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case RvcClean::Attributes::FeatureMap::Id: { + case RvcCleanModeSelect::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case RvcClean::Attributes::ClusterRevision::Id: { + case RvcCleanModeSelect::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -12993,33 +13004,33 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa } break; } - case RefrigeratorAndTemperatureControlledCabinet::Id: { + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { switch (path.mCommandId) { - case RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::Id: { - RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType value; + case RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::Id: { + RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } } break; } - case RvcRun::Id: { + case RvcRunModeSelect::Id: { switch (path.mCommandId) { - case RvcRun::Commands::ChangeToModeResponse::Id: { - RvcRun::Commands::ChangeToModeResponse::DecodableType value; + case RvcRunModeSelect::Commands::ChangeToModeResponse::Id: { + RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } } break; } - case RvcClean::Id: { + case RvcCleanModeSelect::Id: { switch (path.mCommandId) { - case RvcClean::Commands::ChangeToModeResponse::Id: { - RvcClean::Commands::ChangeToModeResponse::DecodableType value; + case RvcCleanModeSelect::Commands::ChangeToModeResponse::Id: { + RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } 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 29a4aab7565e3a..2d5af71e35b854 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -152,25 +152,27 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::LaundryWasherModeSelect::Structs::ModeOptionStruct::DecodableType & value); -static CHIP_ERROR -LogValue(const char * label, size_t indent, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::SemanticTagStruct::DecodableType & value); +static CHIP_ERROR LogValue( + const char * label, size_t indent, + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::SemanticTagStruct::DecodableType & + value); -static CHIP_ERROR -LogValue(const char * label, size_t indent, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType & value); +static CHIP_ERROR LogValue( + const char * label, size_t indent, + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType & + value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcRun::Structs::SemanticTagStruct::DecodableType & value); + const chip::app::Clusters::RvcRunModeSelect::Structs::SemanticTagStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcRun::Structs::ModeOptionStruct::DecodableType & value); + const chip::app::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcClean::Structs::SemanticTagStruct::DecodableType & value); + const chip::app::Clusters::RvcCleanModeSelect::Structs::SemanticTagStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcClean::Structs::ModeOptionStruct::DecodableType & value); + const chip::app::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::TemperatureControl::Structs::TemperatureLevelStruct::DecodableType & value); @@ -488,13 +490,13 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType & value); -static CHIP_ERROR LogValue( - const char * label, size_t indent, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcRun::Commands::ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands:: + ChangeToModeResponse::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcClean::Commands::ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, 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 fa7fa7587f1025..b1736efeda437b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -78,9 +78,9 @@ | IcdManagement | 0x0046 | | ModeSelect | 0x0050 | | LaundryWasherModeSelect | 0x0051 | -| RefrigeratorAndTemperatureControlledCabinet | 0x0052 | -| RvcRun | 0x0054 | -| RvcClean | 0x0055 | +| RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | +| RvcRunModeSelect | 0x0054 | +| RvcCleanModeSelect | 0x0055 | | TemperatureControl | 0x0056 | | DishwasherModeSelect | 0x0059 | | AirQuality | 0x005B | @@ -39469,6 +39469,7 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute |------------------------------------------------------------------------------| | Attributes: | | | * Description | 0x0000 | +| * StandardNamespace | 0x0001 | | * SupportedModes | 0x0002 | | * CurrentMode | 0x0003 | | * StartUpMode | 0x0004 | @@ -39647,6 +39648,76 @@ class SubscribeAttributeModeSelectDescription : public SubscribeAttribute { } }; +/* + * Attribute StandardNamespace + */ +class ReadModeSelectStandardNamespace : public ReadAttribute { +public: + ReadModeSelectStandardNamespace() + : ReadAttribute("standard-namespace") + { + } + + ~ReadModeSelectStandardNamespace() {} + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReadAttribute (0x00000001) on endpoint %u", endpointId); + + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + [cluster readAttributeStandardNamespaceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"ModeSelect.StandardNamespace response %@", [value description]); + if (error != nil) { + LogNSError("ModeSelect StandardNamespace read Error", error); + } + SetCommandExitStatus(error); + }]; + return CHIP_NO_ERROR; + } +}; + +class SubscribeAttributeModeSelectStandardNamespace : public SubscribeAttribute { +public: + SubscribeAttributeModeSelectStandardNamespace() + : SubscribeAttribute("standard-namespace") + { + } + + ~SubscribeAttributeModeSelectStandardNamespace() {} + + CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override + { + ChipLogProgress(chipTool, "Sending cluster (0x00000050) ReportAttribute (0x00000001) on endpoint %u", endpointId); + dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); + __auto_type * cluster = [[MTRBaseClusterModeSelect 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 subscribeAttributeStandardNamespaceWithParams:params + subscriptionEstablished:^() { + mSubscriptionEstablished = YES; + } + reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { + NSLog(@"ModeSelect.StandardNamespace response %@", [value description]); + SetCommandExitStatus(error); + }]; + + return CHIP_NO_ERROR; + } +}; + /* * Attribute SupportedModes */ @@ -41396,7 +41467,7 @@ class SubscribeAttributeLaundryWasherModeSelectClusterRevision : public Subscrib }; /*----------------------------------------------------------------------------*\ -| Cluster RefrigeratorAndTemperatureControlledCabinet | 0x0052 | +| Cluster RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | @@ -41421,9 +41492,9 @@ class SubscribeAttributeLaundryWasherModeSelectClusterRevision : public Subscrib /* * Command ChangeToMode */ -class RefrigeratorAndTemperatureControlledCabinetChangeToMode : public ClusterCommand { +class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode : public ClusterCommand { public: - RefrigeratorAndTemperatureControlledCabinetChangeToMode() + RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode() : ClusterCommand("change-to-mode") { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -41435,10 +41506,11 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToMode : public ClusterCo ChipLogProgress(chipTool, "Sending cluster (0x00000052) command (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; - __auto_type * params = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeParams alloc] init]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + __auto_type * params = [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode]; @@ -41461,15 +41533,15 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToMode : public ClusterCo } private: - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToMode::Type mRequest; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::Type mRequest; }; /* * Command ChangeToModeWithStatus */ -class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public ClusterCommand { +class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatus : public ClusterCommand { public: - RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus() + RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatus() : ClusterCommand("change-to-mode-with-status") { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -41481,10 +41553,12 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public ChipLogProgress(chipTool, "Sending cluster (0x00000052) command (0x00000001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; - __auto_type * params = [[MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeWithStatusParams alloc] init]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + __auto_type * params = + [[MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode]; @@ -41494,7 +41568,7 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public [cluster changeToModeWithStatusWithParams:params completion:^( - MTRRefrigeratorAndTemperatureControlledCabinetClusterChangeToModeResponseParams * _Nullable values, + MTRRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); responsesNeeded--; @@ -41511,33 +41585,34 @@ class RefrigeratorAndTemperatureControlledCabinetChangeToModeWithStatus : public } private: - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; }; /* * Attribute Description */ -class ReadRefrigeratorAndTemperatureControlledCabinetDescription : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectDescription : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetDescription() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectDescription() : ReadAttribute("description") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetDescription() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectDescription() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.Description response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.Description response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet Description read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect Description read Error", error); } SetCommandExitStatus(error); }]; @@ -41545,22 +41620,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetDescription : public ReadAt } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetDescription : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectDescription : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetDescription() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectDescription() : SubscribeAttribute("description") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetDescription() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectDescription() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -41576,7 +41652,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetDescription : mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.Description response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.Description response %@", [value description]); SetCommandExitStatus(error); }]; @@ -41587,27 +41663,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetDescription : /* * Attribute SupportedModes */ -class ReadRefrigeratorAndTemperatureControlledCabinetSupportedModes : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModes : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetSupportedModes() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModes() : ReadAttribute("supported-modes") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetSupportedModes() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModes() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.SupportedModes response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.SupportedModes response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet SupportedModes read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect SupportedModes read Error", error); } SetCommandExitStatus(error); }]; @@ -41615,22 +41692,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetSupportedModes : public Rea } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetSupportedModes : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModes : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetSupportedModes() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModes() : SubscribeAttribute("supported-modes") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetSupportedModes() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModes() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -41646,7 +41724,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetSupportedMode mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.SupportedModes response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.SupportedModes response %@", [value description]); SetCommandExitStatus(error); }]; @@ -41657,27 +41735,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetSupportedMode /* * Attribute CurrentMode */ -class ReadRefrigeratorAndTemperatureControlledCabinetCurrentMode : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentMode : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetCurrentMode() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentMode() : ReadAttribute("current-mode") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetCurrentMode() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.CurrentMode response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.CurrentMode response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet CurrentMode read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect CurrentMode read Error", error); } SetCommandExitStatus(error); }]; @@ -41685,22 +41764,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetCurrentMode : public ReadAt } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetCurrentMode : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentMode : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetCurrentMode() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentMode() : SubscribeAttribute("current-mode") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetCurrentMode() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -41716,7 +41796,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetCurrentMode : mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.CurrentMode response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.CurrentMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -41727,27 +41807,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetCurrentMode : /* * Attribute StartUpMode */ -class ReadRefrigeratorAndTemperatureControlledCabinetStartUpMode : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetStartUpMode() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode() : ReadAttribute("start-up-mode") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetStartUpMode() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.StartUpMode response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.StartUpMode response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet StartUpMode read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect StartUpMode read Error", error); } SetCommandExitStatus(error); }]; @@ -41755,9 +41836,9 @@ class ReadRefrigeratorAndTemperatureControlledCabinetStartUpMode : public ReadAt } }; -class WriteRefrigeratorAndTemperatureControlledCabinetStartUpMode : public WriteAttribute { +class WriteRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode : public WriteAttribute { public: - WriteRefrigeratorAndTemperatureControlledCabinetStartUpMode() + WriteRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode() : WriteAttribute("start-up-mode") { AddArgument("attr-name", "start-up-mode"); @@ -41765,30 +41846,33 @@ class WriteRefrigeratorAndTemperatureControlledCabinetStartUpMode : public Write WriteAttribute::AddArguments(); } - ~WriteRefrigeratorAndTemperatureControlledCabinetStartUpMode() {} + ~WriteRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) WriteAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.dataVersion = mDataVersion.HasValue() ? [NSNumber numberWithUnsignedInt:mDataVersion.Value()] : nil; NSNumber * _Nullable value = [NSNumber numberWithUnsignedChar:mValue]; - [cluster writeAttributeStartUpModeWithValue:value - params:params - completion:^(NSError * _Nullable error) { - if (error != nil) { - LogNSError( - "RefrigeratorAndTemperatureControlledCabinet StartUpMode write Error", error); - } - SetCommandExitStatus(error); - }]; + [cluster + writeAttributeStartUpModeWithValue:value + params:params + completion:^(NSError * _Nullable error) { + if (error != nil) { + LogNSError( + "RefrigeratorAndTemperatureControlledCabinetModeSelect StartUpMode write Error", + error); + } + SetCommandExitStatus(error); + }]; return CHIP_NO_ERROR; } @@ -41796,22 +41880,23 @@ class WriteRefrigeratorAndTemperatureControlledCabinetStartUpMode : public Write uint8_t mValue; }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetStartUpMode : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetStartUpMode() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode() : SubscribeAttribute("start-up-mode") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetStartUpMode() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -41827,7 +41912,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetStartUpMode : mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.StartUpMode response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.StartUpMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -41838,27 +41923,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetStartUpMode : /* * Attribute OnMode */ -class ReadRefrigeratorAndTemperatureControlledCabinetOnMode : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetOnMode() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode() : ReadAttribute("on-mode") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetOnMode() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.OnMode response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.OnMode response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet OnMode read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect OnMode read Error", error); } SetCommandExitStatus(error); }]; @@ -41866,9 +41952,9 @@ class ReadRefrigeratorAndTemperatureControlledCabinetOnMode : public ReadAttribu } }; -class WriteRefrigeratorAndTemperatureControlledCabinetOnMode : public WriteAttribute { +class WriteRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode : public WriteAttribute { public: - WriteRefrigeratorAndTemperatureControlledCabinetOnMode() + WriteRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode() : WriteAttribute("on-mode") { AddArgument("attr-name", "on-mode"); @@ -41876,15 +41962,16 @@ class WriteRefrigeratorAndTemperatureControlledCabinetOnMode : public WriteAttri WriteAttribute::AddArguments(); } - ~WriteRefrigeratorAndTemperatureControlledCabinetOnMode() {} + ~WriteRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) WriteAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; @@ -41895,7 +41982,8 @@ class WriteRefrigeratorAndTemperatureControlledCabinetOnMode : public WriteAttri params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet OnMode write Error", error); + LogNSError( + "RefrigeratorAndTemperatureControlledCabinetModeSelect OnMode write Error", error); } SetCommandExitStatus(error); }]; @@ -41906,22 +41994,23 @@ class WriteRefrigeratorAndTemperatureControlledCabinetOnMode : public WriteAttri uint8_t mValue; }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetOnMode : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetOnMode() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode() : SubscribeAttribute("on-mode") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetOnMode() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -41937,7 +42026,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetOnMode : publ mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.OnMode response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.OnMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -41948,27 +42037,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetOnMode : publ /* * Attribute GeneratedCommandList */ -class ReadRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandList : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandList() : ReadAttribute("generated-command-list") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.GeneratedCommandList response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.GeneratedCommandList response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet GeneratedCommandList read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect GeneratedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -41976,22 +42066,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList : publ } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandList : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandList() : SubscribeAttribute("generated-command-list") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetGeneratedCommandList() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42007,7 +42098,8 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetGeneratedComm mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.GeneratedCommandList response %@", [value description]); + NSLog( + @"RefrigeratorAndTemperatureControlledCabinetModeSelect.GeneratedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42018,27 +42110,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetGeneratedComm /* * Attribute AcceptedCommandList */ -class ReadRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandList : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandList() : ReadAttribute("accepted-command-list") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.AcceptedCommandList response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.AcceptedCommandList response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet AcceptedCommandList read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect AcceptedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -42046,22 +42139,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList : publi } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandList : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandList() : SubscribeAttribute("accepted-command-list") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAcceptedCommandList() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42077,7 +42171,8 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAcceptedComma mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.AcceptedCommandList response %@", [value description]); + NSLog( + @"RefrigeratorAndTemperatureControlledCabinetModeSelect.AcceptedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42088,27 +42183,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAcceptedComma /* * Attribute EventList */ -class ReadRefrigeratorAndTemperatureControlledCabinetEventList : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectEventList : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetEventList() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectEventList() : ReadAttribute("event-list") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetEventList() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectEventList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x0000FFFA) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.EventList response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.EventList response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet EventList read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect EventList read Error", error); } SetCommandExitStatus(error); }]; @@ -42116,22 +42212,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetEventList : public ReadAttr } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetEventList : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectEventList : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetEventList() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectEventList() : SubscribeAttribute("event-list") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetEventList() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectEventList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x0000FFFA) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42147,7 +42244,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetEventList : p mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.EventList response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.EventList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42158,27 +42255,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetEventList : p /* * Attribute AttributeList */ -class ReadRefrigeratorAndTemperatureControlledCabinetAttributeList : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeList : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetAttributeList() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeList() : ReadAttribute("attribute-list") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetAttributeList() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.AttributeList response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.AttributeList response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet AttributeList read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect AttributeList read Error", error); } SetCommandExitStatus(error); }]; @@ -42186,22 +42284,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetAttributeList : public Read } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAttributeList : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeList : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAttributeList() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeList() : SubscribeAttribute("attribute-list") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAttributeList() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42217,7 +42316,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAttributeList mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.AttributeList response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.AttributeList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42228,27 +42327,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetAttributeList /* * Attribute FeatureMap */ -class ReadRefrigeratorAndTemperatureControlledCabinetFeatureMap : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMap : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetFeatureMap() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMap() : ReadAttribute("feature-map") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetFeatureMap() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.FeatureMap response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.FeatureMap response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet FeatureMap read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect FeatureMap read Error", error); } SetCommandExitStatus(error); }]; @@ -42256,22 +42356,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetFeatureMap : public ReadAtt } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetFeatureMap : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMap : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetFeatureMap() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMap() : SubscribeAttribute("feature-map") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetFeatureMap() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42287,7 +42388,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetFeatureMap : mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.FeatureMap response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.FeatureMap response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42298,27 +42399,28 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetFeatureMap : /* * Attribute ClusterRevision */ -class ReadRefrigeratorAndTemperatureControlledCabinetClusterRevision : public ReadAttribute { +class ReadRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevision : public ReadAttribute { public: - ReadRefrigeratorAndTemperatureControlledCabinetClusterRevision() + ReadRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevision() : ReadAttribute("cluster-revision") { } - ~ReadRefrigeratorAndTemperatureControlledCabinetClusterRevision() {} + ~ReadRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.ClusterRevision response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.ClusterRevision response %@", [value description]); if (error != nil) { - LogNSError("RefrigeratorAndTemperatureControlledCabinet ClusterRevision read Error", error); + LogNSError("RefrigeratorAndTemperatureControlledCabinetModeSelect ClusterRevision read Error", error); } SetCommandExitStatus(error); }]; @@ -42326,22 +42428,23 @@ class ReadRefrigeratorAndTemperatureControlledCabinetClusterRevision : public Re } }; -class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetClusterRevision : public SubscribeAttribute { +class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevision : public SubscribeAttribute { public: - SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetClusterRevision() + SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevision() : SubscribeAttribute("cluster-revision") { } - ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetClusterRevision() {} + ~SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000052) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinet alloc] initWithDevice:device - endpointID:@(endpointId) - queue:callbackQueue]; + __auto_type * cluster = + [[MTRBaseClusterRefrigeratorAndTemperatureControlledCabinetModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42357,7 +42460,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetClusterRevisi mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RefrigeratorAndTemperatureControlledCabinet.ClusterRevision response %@", [value description]); + NSLog(@"RefrigeratorAndTemperatureControlledCabinetModeSelect.ClusterRevision response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42366,7 +42469,7 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetClusterRevisi }; /*----------------------------------------------------------------------------*\ -| Cluster RvcRun | 0x0054 | +| Cluster RvcRunModeSelect | 0x0054 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | @@ -42391,9 +42494,9 @@ class SubscribeAttributeRefrigeratorAndTemperatureControlledCabinetClusterRevisi /* * Command ChangeToMode */ -class RvcRunChangeToMode : public ClusterCommand { +class RvcRunModeSelectChangeToMode : public ClusterCommand { public: - RvcRunChangeToMode() + RvcRunModeSelectChangeToMode() : ClusterCommand("change-to-mode") { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -42405,8 +42508,10 @@ class RvcRunChangeToMode : public ClusterCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000054) command (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRRVCRunClusterChangeToModeParams alloc] init]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + __auto_type * params = [[MTRRVCRunModeSelectClusterChangeToModeParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode]; @@ -42429,15 +42534,15 @@ class RvcRunChangeToMode : public ClusterCommand { } private: - chip::app::Clusters::RvcRun::Commands::ChangeToMode::Type mRequest; + chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToMode::Type mRequest; }; /* * Command ChangeToModeWithStatus */ -class RvcRunChangeToModeWithStatus : public ClusterCommand { +class RvcRunModeSelectChangeToModeWithStatus : public ClusterCommand { public: - RvcRunChangeToModeWithStatus() + RvcRunModeSelectChangeToModeWithStatus() : ClusterCommand("change-to-mode-with-status") { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -42449,8 +42554,10 @@ class RvcRunChangeToModeWithStatus : public ClusterCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000054) command (0x00000001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRRVCRunClusterChangeToModeWithStatusParams alloc] init]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + __auto_type * params = [[MTRRVCRunModeSelectClusterChangeToModeWithStatusParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode]; @@ -42458,7 +42565,7 @@ class RvcRunChangeToModeWithStatus : public ClusterCommand { uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { [cluster changeToModeWithStatusWithParams:params - completion:^(MTRRVCRunClusterChangeToModeResponseParams * _Nullable values, + completion:^(MTRRVCRunModeSelectClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); responsesNeeded--; @@ -42475,31 +42582,33 @@ class RvcRunChangeToModeWithStatus : public ClusterCommand { } private: - chip::app::Clusters::RvcRun::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; }; /* * Attribute Description */ -class ReadRvcRunDescription : public ReadAttribute { +class ReadRvcRunModeSelectDescription : public ReadAttribute { public: - ReadRvcRunDescription() + ReadRvcRunModeSelectDescription() : ReadAttribute("description") { } - ~ReadRvcRunDescription() {} + ~ReadRvcRunModeSelectDescription() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.Description response %@", [value description]); + NSLog(@"RVCRunModeSelect.Description response %@", [value description]); if (error != nil) { - LogNSError("RVCRun Description read Error", error); + LogNSError("RVCRunModeSelect Description read Error", error); } SetCommandExitStatus(error); }]; @@ -42507,20 +42616,22 @@ class ReadRvcRunDescription : public ReadAttribute { } }; -class SubscribeAttributeRvcRunDescription : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectDescription : public SubscribeAttribute { public: - SubscribeAttributeRvcRunDescription() + SubscribeAttributeRvcRunModeSelectDescription() : SubscribeAttribute("description") { } - ~SubscribeAttributeRvcRunDescription() {} + ~SubscribeAttributeRvcRunModeSelectDescription() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42536,7 +42647,7 @@ class SubscribeAttributeRvcRunDescription : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.Description response %@", [value description]); + NSLog(@"RVCRunModeSelect.Description response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42547,25 +42658,27 @@ class SubscribeAttributeRvcRunDescription : public SubscribeAttribute { /* * Attribute SupportedModes */ -class ReadRvcRunSupportedModes : public ReadAttribute { +class ReadRvcRunModeSelectSupportedModes : public ReadAttribute { public: - ReadRvcRunSupportedModes() + ReadRvcRunModeSelectSupportedModes() : ReadAttribute("supported-modes") { } - ~ReadRvcRunSupportedModes() {} + ~ReadRvcRunModeSelectSupportedModes() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.SupportedModes response %@", [value description]); + NSLog(@"RVCRunModeSelect.SupportedModes response %@", [value description]); if (error != nil) { - LogNSError("RVCRun SupportedModes read Error", error); + LogNSError("RVCRunModeSelect SupportedModes read Error", error); } SetCommandExitStatus(error); }]; @@ -42573,20 +42686,22 @@ class ReadRvcRunSupportedModes : public ReadAttribute { } }; -class SubscribeAttributeRvcRunSupportedModes : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectSupportedModes : public SubscribeAttribute { public: - SubscribeAttributeRvcRunSupportedModes() + SubscribeAttributeRvcRunModeSelectSupportedModes() : SubscribeAttribute("supported-modes") { } - ~SubscribeAttributeRvcRunSupportedModes() {} + ~SubscribeAttributeRvcRunModeSelectSupportedModes() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42602,7 +42717,7 @@ class SubscribeAttributeRvcRunSupportedModes : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.SupportedModes response %@", [value description]); + NSLog(@"RVCRunModeSelect.SupportedModes response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42613,25 +42728,27 @@ class SubscribeAttributeRvcRunSupportedModes : public SubscribeAttribute { /* * Attribute CurrentMode */ -class ReadRvcRunCurrentMode : public ReadAttribute { +class ReadRvcRunModeSelectCurrentMode : public ReadAttribute { public: - ReadRvcRunCurrentMode() + ReadRvcRunModeSelectCurrentMode() : ReadAttribute("current-mode") { } - ~ReadRvcRunCurrentMode() {} + ~ReadRvcRunModeSelectCurrentMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.CurrentMode response %@", [value description]); + NSLog(@"RVCRunModeSelect.CurrentMode response %@", [value description]); if (error != nil) { - LogNSError("RVCRun CurrentMode read Error", error); + LogNSError("RVCRunModeSelect CurrentMode read Error", error); } SetCommandExitStatus(error); }]; @@ -42639,20 +42756,22 @@ class ReadRvcRunCurrentMode : public ReadAttribute { } }; -class SubscribeAttributeRvcRunCurrentMode : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectCurrentMode : public SubscribeAttribute { public: - SubscribeAttributeRvcRunCurrentMode() + SubscribeAttributeRvcRunModeSelectCurrentMode() : SubscribeAttribute("current-mode") { } - ~SubscribeAttributeRvcRunCurrentMode() {} + ~SubscribeAttributeRvcRunModeSelectCurrentMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42668,7 +42787,7 @@ class SubscribeAttributeRvcRunCurrentMode : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.CurrentMode response %@", [value description]); + NSLog(@"RVCRunModeSelect.CurrentMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42679,25 +42798,27 @@ class SubscribeAttributeRvcRunCurrentMode : public SubscribeAttribute { /* * Attribute StartUpMode */ -class ReadRvcRunStartUpMode : public ReadAttribute { +class ReadRvcRunModeSelectStartUpMode : public ReadAttribute { public: - ReadRvcRunStartUpMode() + ReadRvcRunModeSelectStartUpMode() : ReadAttribute("start-up-mode") { } - ~ReadRvcRunStartUpMode() {} + ~ReadRvcRunModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.StartUpMode response %@", [value description]); + NSLog(@"RVCRunModeSelect.StartUpMode response %@", [value description]); if (error != nil) { - LogNSError("RVCRun StartUpMode read Error", error); + LogNSError("RVCRunModeSelect StartUpMode read Error", error); } SetCommandExitStatus(error); }]; @@ -42705,9 +42826,9 @@ class ReadRvcRunStartUpMode : public ReadAttribute { } }; -class WriteRvcRunStartUpMode : public WriteAttribute { +class WriteRvcRunModeSelectStartUpMode : public WriteAttribute { public: - WriteRvcRunStartUpMode() + WriteRvcRunModeSelectStartUpMode() : WriteAttribute("start-up-mode") { AddArgument("attr-name", "start-up-mode"); @@ -42715,13 +42836,15 @@ class WriteRvcRunStartUpMode : public WriteAttribute { WriteAttribute::AddArguments(); } - ~WriteRvcRunStartUpMode() {} + ~WriteRvcRunModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) WriteAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; @@ -42732,7 +42855,7 @@ class WriteRvcRunStartUpMode : public WriteAttribute { params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("RVCRun StartUpMode write Error", error); + LogNSError("RVCRunModeSelect StartUpMode write Error", error); } SetCommandExitStatus(error); }]; @@ -42743,20 +42866,22 @@ class WriteRvcRunStartUpMode : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeRvcRunStartUpMode : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectStartUpMode : public SubscribeAttribute { public: - SubscribeAttributeRvcRunStartUpMode() + SubscribeAttributeRvcRunModeSelectStartUpMode() : SubscribeAttribute("start-up-mode") { } - ~SubscribeAttributeRvcRunStartUpMode() {} + ~SubscribeAttributeRvcRunModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42772,7 +42897,7 @@ class SubscribeAttributeRvcRunStartUpMode : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.StartUpMode response %@", [value description]); + NSLog(@"RVCRunModeSelect.StartUpMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42783,25 +42908,27 @@ class SubscribeAttributeRvcRunStartUpMode : public SubscribeAttribute { /* * Attribute OnMode */ -class ReadRvcRunOnMode : public ReadAttribute { +class ReadRvcRunModeSelectOnMode : public ReadAttribute { public: - ReadRvcRunOnMode() + ReadRvcRunModeSelectOnMode() : ReadAttribute("on-mode") { } - ~ReadRvcRunOnMode() {} + ~ReadRvcRunModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.OnMode response %@", [value description]); + NSLog(@"RVCRunModeSelect.OnMode response %@", [value description]); if (error != nil) { - LogNSError("RVCRun OnMode read Error", error); + LogNSError("RVCRunModeSelect OnMode read Error", error); } SetCommandExitStatus(error); }]; @@ -42809,9 +42936,9 @@ class ReadRvcRunOnMode : public ReadAttribute { } }; -class WriteRvcRunOnMode : public WriteAttribute { +class WriteRvcRunModeSelectOnMode : public WriteAttribute { public: - WriteRvcRunOnMode() + WriteRvcRunModeSelectOnMode() : WriteAttribute("on-mode") { AddArgument("attr-name", "on-mode"); @@ -42819,13 +42946,15 @@ class WriteRvcRunOnMode : public WriteAttribute { WriteAttribute::AddArguments(); } - ~WriteRvcRunOnMode() {} + ~WriteRvcRunModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) WriteAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; @@ -42836,7 +42965,7 @@ class WriteRvcRunOnMode : public WriteAttribute { params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("RVCRun OnMode write Error", error); + LogNSError("RVCRunModeSelect OnMode write Error", error); } SetCommandExitStatus(error); }]; @@ -42847,20 +42976,22 @@ class WriteRvcRunOnMode : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeRvcRunOnMode : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectOnMode : public SubscribeAttribute { public: - SubscribeAttributeRvcRunOnMode() + SubscribeAttributeRvcRunModeSelectOnMode() : SubscribeAttribute("on-mode") { } - ~SubscribeAttributeRvcRunOnMode() {} + ~SubscribeAttributeRvcRunModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42876,7 +43007,7 @@ class SubscribeAttributeRvcRunOnMode : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.OnMode response %@", [value description]); + NSLog(@"RVCRunModeSelect.OnMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42887,25 +43018,27 @@ class SubscribeAttributeRvcRunOnMode : public SubscribeAttribute { /* * Attribute GeneratedCommandList */ -class ReadRvcRunGeneratedCommandList : public ReadAttribute { +class ReadRvcRunModeSelectGeneratedCommandList : public ReadAttribute { public: - ReadRvcRunGeneratedCommandList() + ReadRvcRunModeSelectGeneratedCommandList() : ReadAttribute("generated-command-list") { } - ~ReadRvcRunGeneratedCommandList() {} + ~ReadRvcRunModeSelectGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.GeneratedCommandList response %@", [value description]); + NSLog(@"RVCRunModeSelect.GeneratedCommandList response %@", [value description]); if (error != nil) { - LogNSError("RVCRun GeneratedCommandList read Error", error); + LogNSError("RVCRunModeSelect GeneratedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -42913,20 +43046,22 @@ class ReadRvcRunGeneratedCommandList : public ReadAttribute { } }; -class SubscribeAttributeRvcRunGeneratedCommandList : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectGeneratedCommandList : public SubscribeAttribute { public: - SubscribeAttributeRvcRunGeneratedCommandList() + SubscribeAttributeRvcRunModeSelectGeneratedCommandList() : SubscribeAttribute("generated-command-list") { } - ~SubscribeAttributeRvcRunGeneratedCommandList() {} + ~SubscribeAttributeRvcRunModeSelectGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -42942,7 +43077,7 @@ class SubscribeAttributeRvcRunGeneratedCommandList : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.GeneratedCommandList response %@", [value description]); + NSLog(@"RVCRunModeSelect.GeneratedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -42953,25 +43088,27 @@ class SubscribeAttributeRvcRunGeneratedCommandList : public SubscribeAttribute { /* * Attribute AcceptedCommandList */ -class ReadRvcRunAcceptedCommandList : public ReadAttribute { +class ReadRvcRunModeSelectAcceptedCommandList : public ReadAttribute { public: - ReadRvcRunAcceptedCommandList() + ReadRvcRunModeSelectAcceptedCommandList() : ReadAttribute("accepted-command-list") { } - ~ReadRvcRunAcceptedCommandList() {} + ~ReadRvcRunModeSelectAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.AcceptedCommandList response %@", [value description]); + NSLog(@"RVCRunModeSelect.AcceptedCommandList response %@", [value description]); if (error != nil) { - LogNSError("RVCRun AcceptedCommandList read Error", error); + LogNSError("RVCRunModeSelect AcceptedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -42979,20 +43116,22 @@ class ReadRvcRunAcceptedCommandList : public ReadAttribute { } }; -class SubscribeAttributeRvcRunAcceptedCommandList : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectAcceptedCommandList : public SubscribeAttribute { public: - SubscribeAttributeRvcRunAcceptedCommandList() + SubscribeAttributeRvcRunModeSelectAcceptedCommandList() : SubscribeAttribute("accepted-command-list") { } - ~SubscribeAttributeRvcRunAcceptedCommandList() {} + ~SubscribeAttributeRvcRunModeSelectAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43008,7 +43147,7 @@ class SubscribeAttributeRvcRunAcceptedCommandList : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.AcceptedCommandList response %@", [value description]); + NSLog(@"RVCRunModeSelect.AcceptedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43019,25 +43158,27 @@ class SubscribeAttributeRvcRunAcceptedCommandList : public SubscribeAttribute { /* * Attribute EventList */ -class ReadRvcRunEventList : public ReadAttribute { +class ReadRvcRunModeSelectEventList : public ReadAttribute { public: - ReadRvcRunEventList() + ReadRvcRunModeSelectEventList() : ReadAttribute("event-list") { } - ~ReadRvcRunEventList() {} + ~ReadRvcRunModeSelectEventList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x0000FFFA) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.EventList response %@", [value description]); + NSLog(@"RVCRunModeSelect.EventList response %@", [value description]); if (error != nil) { - LogNSError("RVCRun EventList read Error", error); + LogNSError("RVCRunModeSelect EventList read Error", error); } SetCommandExitStatus(error); }]; @@ -43045,20 +43186,22 @@ class ReadRvcRunEventList : public ReadAttribute { } }; -class SubscribeAttributeRvcRunEventList : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectEventList : public SubscribeAttribute { public: - SubscribeAttributeRvcRunEventList() + SubscribeAttributeRvcRunModeSelectEventList() : SubscribeAttribute("event-list") { } - ~SubscribeAttributeRvcRunEventList() {} + ~SubscribeAttributeRvcRunModeSelectEventList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x0000FFFA) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43074,7 +43217,7 @@ class SubscribeAttributeRvcRunEventList : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.EventList response %@", [value description]); + NSLog(@"RVCRunModeSelect.EventList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43085,25 +43228,27 @@ class SubscribeAttributeRvcRunEventList : public SubscribeAttribute { /* * Attribute AttributeList */ -class ReadRvcRunAttributeList : public ReadAttribute { +class ReadRvcRunModeSelectAttributeList : public ReadAttribute { public: - ReadRvcRunAttributeList() + ReadRvcRunModeSelectAttributeList() : ReadAttribute("attribute-list") { } - ~ReadRvcRunAttributeList() {} + ~ReadRvcRunModeSelectAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.AttributeList response %@", [value description]); + NSLog(@"RVCRunModeSelect.AttributeList response %@", [value description]); if (error != nil) { - LogNSError("RVCRun AttributeList read Error", error); + LogNSError("RVCRunModeSelect AttributeList read Error", error); } SetCommandExitStatus(error); }]; @@ -43111,20 +43256,22 @@ class ReadRvcRunAttributeList : public ReadAttribute { } }; -class SubscribeAttributeRvcRunAttributeList : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectAttributeList : public SubscribeAttribute { public: - SubscribeAttributeRvcRunAttributeList() + SubscribeAttributeRvcRunModeSelectAttributeList() : SubscribeAttribute("attribute-list") { } - ~SubscribeAttributeRvcRunAttributeList() {} + ~SubscribeAttributeRvcRunModeSelectAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43140,7 +43287,7 @@ class SubscribeAttributeRvcRunAttributeList : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.AttributeList response %@", [value description]); + NSLog(@"RVCRunModeSelect.AttributeList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43151,25 +43298,27 @@ class SubscribeAttributeRvcRunAttributeList : public SubscribeAttribute { /* * Attribute FeatureMap */ -class ReadRvcRunFeatureMap : public ReadAttribute { +class ReadRvcRunModeSelectFeatureMap : public ReadAttribute { public: - ReadRvcRunFeatureMap() + ReadRvcRunModeSelectFeatureMap() : ReadAttribute("feature-map") { } - ~ReadRvcRunFeatureMap() {} + ~ReadRvcRunModeSelectFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.FeatureMap response %@", [value description]); + NSLog(@"RVCRunModeSelect.FeatureMap response %@", [value description]); if (error != nil) { - LogNSError("RVCRun FeatureMap read Error", error); + LogNSError("RVCRunModeSelect FeatureMap read Error", error); } SetCommandExitStatus(error); }]; @@ -43177,20 +43326,22 @@ class ReadRvcRunFeatureMap : public ReadAttribute { } }; -class SubscribeAttributeRvcRunFeatureMap : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectFeatureMap : public SubscribeAttribute { public: - SubscribeAttributeRvcRunFeatureMap() + SubscribeAttributeRvcRunModeSelectFeatureMap() : SubscribeAttribute("feature-map") { } - ~SubscribeAttributeRvcRunFeatureMap() {} + ~SubscribeAttributeRvcRunModeSelectFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43206,7 +43357,7 @@ class SubscribeAttributeRvcRunFeatureMap : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.FeatureMap response %@", [value description]); + NSLog(@"RVCRunModeSelect.FeatureMap response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43217,25 +43368,27 @@ class SubscribeAttributeRvcRunFeatureMap : public SubscribeAttribute { /* * Attribute ClusterRevision */ -class ReadRvcRunClusterRevision : public ReadAttribute { +class ReadRvcRunModeSelectClusterRevision : public ReadAttribute { public: - ReadRvcRunClusterRevision() + ReadRvcRunModeSelectClusterRevision() : ReadAttribute("cluster-revision") { } - ~ReadRvcRunClusterRevision() {} + ~ReadRvcRunModeSelectClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.ClusterRevision response %@", [value description]); + NSLog(@"RVCRunModeSelect.ClusterRevision response %@", [value description]); if (error != nil) { - LogNSError("RVCRun ClusterRevision read Error", error); + LogNSError("RVCRunModeSelect ClusterRevision read Error", error); } SetCommandExitStatus(error); }]; @@ -43243,20 +43396,22 @@ class ReadRvcRunClusterRevision : public ReadAttribute { } }; -class SubscribeAttributeRvcRunClusterRevision : public SubscribeAttribute { +class SubscribeAttributeRvcRunModeSelectClusterRevision : public SubscribeAttribute { public: - SubscribeAttributeRvcRunClusterRevision() + SubscribeAttributeRvcRunModeSelectClusterRevision() : SubscribeAttribute("cluster-revision") { } - ~SubscribeAttributeRvcRunClusterRevision() {} + ~SubscribeAttributeRvcRunModeSelectClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000054) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCRun alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCRunModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43272,7 +43427,7 @@ class SubscribeAttributeRvcRunClusterRevision : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCRun.ClusterRevision response %@", [value description]); + NSLog(@"RVCRunModeSelect.ClusterRevision response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43281,7 +43436,7 @@ class SubscribeAttributeRvcRunClusterRevision : public SubscribeAttribute { }; /*----------------------------------------------------------------------------*\ -| Cluster RvcClean | 0x0055 | +| Cluster RvcCleanModeSelect | 0x0055 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | @@ -43306,9 +43461,9 @@ class SubscribeAttributeRvcRunClusterRevision : public SubscribeAttribute { /* * Command ChangeToMode */ -class RvcCleanChangeToMode : public ClusterCommand { +class RvcCleanModeSelectChangeToMode : public ClusterCommand { public: - RvcCleanChangeToMode() + RvcCleanModeSelectChangeToMode() : ClusterCommand("change-to-mode") { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -43320,8 +43475,10 @@ class RvcCleanChangeToMode : public ClusterCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000055) command (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRRVCCleanClusterChangeToModeParams alloc] init]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + __auto_type * params = [[MTRRVCCleanModeSelectClusterChangeToModeParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode]; @@ -43344,15 +43501,15 @@ class RvcCleanChangeToMode : public ClusterCommand { } private: - chip::app::Clusters::RvcClean::Commands::ChangeToMode::Type mRequest; + chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToMode::Type mRequest; }; /* * Command ChangeToModeWithStatus */ -class RvcCleanChangeToModeWithStatus : public ClusterCommand { +class RvcCleanModeSelectChangeToModeWithStatus : public ClusterCommand { public: - RvcCleanChangeToModeWithStatus() + RvcCleanModeSelectChangeToModeWithStatus() : ClusterCommand("change-to-mode-with-status") { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -43364,8 +43521,10 @@ class RvcCleanChangeToModeWithStatus : public ClusterCommand { ChipLogProgress(chipTool, "Sending cluster (0x00000055) command (0x00000001) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; - __auto_type * params = [[MTRRVCCleanClusterChangeToModeWithStatusParams alloc] init]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; + __auto_type * params = [[MTRRVCCleanModeSelectClusterChangeToModeWithStatusParams alloc] init]; params.timedInvokeTimeoutMs = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; params.newMode = [NSNumber numberWithUnsignedChar:mRequest.newMode]; @@ -43373,7 +43532,7 @@ class RvcCleanChangeToModeWithStatus : public ClusterCommand { uint16_t __block responsesNeeded = repeatCount; while (repeatCount--) { [cluster changeToModeWithStatusWithParams:params - completion:^(MTRRVCCleanClusterChangeToModeResponseParams * _Nullable values, + completion:^(MTRRVCCleanModeSelectClusterChangeToModeResponseParams * _Nullable values, NSError * _Nullable error) { NSLog(@"Values: %@", values); responsesNeeded--; @@ -43390,31 +43549,33 @@ class RvcCleanChangeToModeWithStatus : public ClusterCommand { } private: - chip::app::Clusters::RvcClean::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; }; /* * Attribute Description */ -class ReadRvcCleanDescription : public ReadAttribute { +class ReadRvcCleanModeSelectDescription : public ReadAttribute { public: - ReadRvcCleanDescription() + ReadRvcCleanModeSelectDescription() : ReadAttribute("description") { } - ~ReadRvcCleanDescription() {} + ~ReadRvcCleanModeSelectDescription() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeDescriptionWithCompletion:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.Description response %@", [value description]); + NSLog(@"RVCCleanModeSelect.Description response %@", [value description]); if (error != nil) { - LogNSError("RVCClean Description read Error", error); + LogNSError("RVCCleanModeSelect Description read Error", error); } SetCommandExitStatus(error); }]; @@ -43422,20 +43583,22 @@ class ReadRvcCleanDescription : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanDescription : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectDescription : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanDescription() + SubscribeAttributeRvcCleanModeSelectDescription() : SubscribeAttribute("description") { } - ~SubscribeAttributeRvcCleanDescription() {} + ~SubscribeAttributeRvcCleanModeSelectDescription() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x00000000) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43451,7 +43614,7 @@ class SubscribeAttributeRvcCleanDescription : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSString * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.Description response %@", [value description]); + NSLog(@"RVCCleanModeSelect.Description response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43462,25 +43625,27 @@ class SubscribeAttributeRvcCleanDescription : public SubscribeAttribute { /* * Attribute SupportedModes */ -class ReadRvcCleanSupportedModes : public ReadAttribute { +class ReadRvcCleanModeSelectSupportedModes : public ReadAttribute { public: - ReadRvcCleanSupportedModes() + ReadRvcCleanModeSelectSupportedModes() : ReadAttribute("supported-modes") { } - ~ReadRvcCleanSupportedModes() {} + ~ReadRvcCleanModeSelectSupportedModes() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeSupportedModesWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.SupportedModes response %@", [value description]); + NSLog(@"RVCCleanModeSelect.SupportedModes response %@", [value description]); if (error != nil) { - LogNSError("RVCClean SupportedModes read Error", error); + LogNSError("RVCCleanModeSelect SupportedModes read Error", error); } SetCommandExitStatus(error); }]; @@ -43488,20 +43653,22 @@ class ReadRvcCleanSupportedModes : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanSupportedModes : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectSupportedModes : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanSupportedModes() + SubscribeAttributeRvcCleanModeSelectSupportedModes() : SubscribeAttribute("supported-modes") { } - ~SubscribeAttributeRvcCleanSupportedModes() {} + ~SubscribeAttributeRvcCleanModeSelectSupportedModes() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x00000002) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43517,7 +43684,7 @@ class SubscribeAttributeRvcCleanSupportedModes : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.SupportedModes response %@", [value description]); + NSLog(@"RVCCleanModeSelect.SupportedModes response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43528,25 +43695,27 @@ class SubscribeAttributeRvcCleanSupportedModes : public SubscribeAttribute { /* * Attribute CurrentMode */ -class ReadRvcCleanCurrentMode : public ReadAttribute { +class ReadRvcCleanModeSelectCurrentMode : public ReadAttribute { public: - ReadRvcCleanCurrentMode() + ReadRvcCleanModeSelectCurrentMode() : ReadAttribute("current-mode") { } - ~ReadRvcCleanCurrentMode() {} + ~ReadRvcCleanModeSelectCurrentMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeCurrentModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.CurrentMode response %@", [value description]); + NSLog(@"RVCCleanModeSelect.CurrentMode response %@", [value description]); if (error != nil) { - LogNSError("RVCClean CurrentMode read Error", error); + LogNSError("RVCCleanModeSelect CurrentMode read Error", error); } SetCommandExitStatus(error); }]; @@ -43554,20 +43723,22 @@ class ReadRvcCleanCurrentMode : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanCurrentMode : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectCurrentMode : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanCurrentMode() + SubscribeAttributeRvcCleanModeSelectCurrentMode() : SubscribeAttribute("current-mode") { } - ~SubscribeAttributeRvcCleanCurrentMode() {} + ~SubscribeAttributeRvcCleanModeSelectCurrentMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x00000003) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43583,7 +43754,7 @@ class SubscribeAttributeRvcCleanCurrentMode : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.CurrentMode response %@", [value description]); + NSLog(@"RVCCleanModeSelect.CurrentMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43594,25 +43765,27 @@ class SubscribeAttributeRvcCleanCurrentMode : public SubscribeAttribute { /* * Attribute StartUpMode */ -class ReadRvcCleanStartUpMode : public ReadAttribute { +class ReadRvcCleanModeSelectStartUpMode : public ReadAttribute { public: - ReadRvcCleanStartUpMode() + ReadRvcCleanModeSelectStartUpMode() : ReadAttribute("start-up-mode") { } - ~ReadRvcCleanStartUpMode() {} + ~ReadRvcCleanModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeStartUpModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.StartUpMode response %@", [value description]); + NSLog(@"RVCCleanModeSelect.StartUpMode response %@", [value description]); if (error != nil) { - LogNSError("RVCClean StartUpMode read Error", error); + LogNSError("RVCCleanModeSelect StartUpMode read Error", error); } SetCommandExitStatus(error); }]; @@ -43620,9 +43793,9 @@ class ReadRvcCleanStartUpMode : public ReadAttribute { } }; -class WriteRvcCleanStartUpMode : public WriteAttribute { +class WriteRvcCleanModeSelectStartUpMode : public WriteAttribute { public: - WriteRvcCleanStartUpMode() + WriteRvcCleanModeSelectStartUpMode() : WriteAttribute("start-up-mode") { AddArgument("attr-name", "start-up-mode"); @@ -43630,13 +43803,15 @@ class WriteRvcCleanStartUpMode : public WriteAttribute { WriteAttribute::AddArguments(); } - ~WriteRvcCleanStartUpMode() {} + ~WriteRvcCleanModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) WriteAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; @@ -43647,7 +43822,7 @@ class WriteRvcCleanStartUpMode : public WriteAttribute { params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("RVCClean StartUpMode write Error", error); + LogNSError("RVCCleanModeSelect StartUpMode write Error", error); } SetCommandExitStatus(error); }]; @@ -43658,20 +43833,22 @@ class WriteRvcCleanStartUpMode : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeRvcCleanStartUpMode : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectStartUpMode : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanStartUpMode() + SubscribeAttributeRvcCleanModeSelectStartUpMode() : SubscribeAttribute("start-up-mode") { } - ~SubscribeAttributeRvcCleanStartUpMode() {} + ~SubscribeAttributeRvcCleanModeSelectStartUpMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x00000004) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43687,7 +43864,7 @@ class SubscribeAttributeRvcCleanStartUpMode : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.StartUpMode response %@", [value description]); + NSLog(@"RVCCleanModeSelect.StartUpMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43698,25 +43875,27 @@ class SubscribeAttributeRvcCleanStartUpMode : public SubscribeAttribute { /* * Attribute OnMode */ -class ReadRvcCleanOnMode : public ReadAttribute { +class ReadRvcCleanModeSelectOnMode : public ReadAttribute { public: - ReadRvcCleanOnMode() + ReadRvcCleanModeSelectOnMode() : ReadAttribute("on-mode") { } - ~ReadRvcCleanOnMode() {} + ~ReadRvcCleanModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeOnModeWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.OnMode response %@", [value description]); + NSLog(@"RVCCleanModeSelect.OnMode response %@", [value description]); if (error != nil) { - LogNSError("RVCClean OnMode read Error", error); + LogNSError("RVCCleanModeSelect OnMode read Error", error); } SetCommandExitStatus(error); }]; @@ -43724,9 +43903,9 @@ class ReadRvcCleanOnMode : public ReadAttribute { } }; -class WriteRvcCleanOnMode : public WriteAttribute { +class WriteRvcCleanModeSelectOnMode : public WriteAttribute { public: - WriteRvcCleanOnMode() + WriteRvcCleanModeSelectOnMode() : WriteAttribute("on-mode") { AddArgument("attr-name", "on-mode"); @@ -43734,13 +43913,15 @@ class WriteRvcCleanOnMode : public WriteAttribute { WriteAttribute::AddArguments(); } - ~WriteRvcCleanOnMode() {} + ~WriteRvcCleanModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) WriteAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRWriteParams alloc] init]; params.timedWriteTimeout = mTimedInteractionTimeoutMs.HasValue() ? [NSNumber numberWithUnsignedShort:mTimedInteractionTimeoutMs.Value()] : nil; @@ -43751,7 +43932,7 @@ class WriteRvcCleanOnMode : public WriteAttribute { params:params completion:^(NSError * _Nullable error) { if (error != nil) { - LogNSError("RVCClean OnMode write Error", error); + LogNSError("RVCCleanModeSelect OnMode write Error", error); } SetCommandExitStatus(error); }]; @@ -43762,20 +43943,22 @@ class WriteRvcCleanOnMode : public WriteAttribute { uint8_t mValue; }; -class SubscribeAttributeRvcCleanOnMode : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectOnMode : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanOnMode() + SubscribeAttributeRvcCleanModeSelectOnMode() : SubscribeAttribute("on-mode") { } - ~SubscribeAttributeRvcCleanOnMode() {} + ~SubscribeAttributeRvcCleanModeSelectOnMode() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x00000005) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43791,7 +43974,7 @@ class SubscribeAttributeRvcCleanOnMode : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.OnMode response %@", [value description]); + NSLog(@"RVCCleanModeSelect.OnMode response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43802,25 +43985,27 @@ class SubscribeAttributeRvcCleanOnMode : public SubscribeAttribute { /* * Attribute GeneratedCommandList */ -class ReadRvcCleanGeneratedCommandList : public ReadAttribute { +class ReadRvcCleanModeSelectGeneratedCommandList : public ReadAttribute { public: - ReadRvcCleanGeneratedCommandList() + ReadRvcCleanModeSelectGeneratedCommandList() : ReadAttribute("generated-command-list") { } - ~ReadRvcCleanGeneratedCommandList() {} + ~ReadRvcCleanModeSelectGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.GeneratedCommandList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.GeneratedCommandList response %@", [value description]); if (error != nil) { - LogNSError("RVCClean GeneratedCommandList read Error", error); + LogNSError("RVCCleanModeSelect GeneratedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -43828,20 +44013,22 @@ class ReadRvcCleanGeneratedCommandList : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanGeneratedCommandList : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectGeneratedCommandList : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanGeneratedCommandList() + SubscribeAttributeRvcCleanModeSelectGeneratedCommandList() : SubscribeAttribute("generated-command-list") { } - ~SubscribeAttributeRvcCleanGeneratedCommandList() {} + ~SubscribeAttributeRvcCleanModeSelectGeneratedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x0000FFF8) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43857,7 +44044,7 @@ class SubscribeAttributeRvcCleanGeneratedCommandList : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.GeneratedCommandList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.GeneratedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43868,25 +44055,27 @@ class SubscribeAttributeRvcCleanGeneratedCommandList : public SubscribeAttribute /* * Attribute AcceptedCommandList */ -class ReadRvcCleanAcceptedCommandList : public ReadAttribute { +class ReadRvcCleanModeSelectAcceptedCommandList : public ReadAttribute { public: - ReadRvcCleanAcceptedCommandList() + ReadRvcCleanModeSelectAcceptedCommandList() : ReadAttribute("accepted-command-list") { } - ~ReadRvcCleanAcceptedCommandList() {} + ~ReadRvcCleanModeSelectAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.AcceptedCommandList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.AcceptedCommandList response %@", [value description]); if (error != nil) { - LogNSError("RVCClean AcceptedCommandList read Error", error); + LogNSError("RVCCleanModeSelect AcceptedCommandList read Error", error); } SetCommandExitStatus(error); }]; @@ -43894,20 +44083,22 @@ class ReadRvcCleanAcceptedCommandList : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanAcceptedCommandList : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectAcceptedCommandList : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanAcceptedCommandList() + SubscribeAttributeRvcCleanModeSelectAcceptedCommandList() : SubscribeAttribute("accepted-command-list") { } - ~SubscribeAttributeRvcCleanAcceptedCommandList() {} + ~SubscribeAttributeRvcCleanModeSelectAcceptedCommandList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x0000FFF9) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43923,7 +44114,7 @@ class SubscribeAttributeRvcCleanAcceptedCommandList : public SubscribeAttribute mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.AcceptedCommandList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.AcceptedCommandList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -43934,25 +44125,27 @@ class SubscribeAttributeRvcCleanAcceptedCommandList : public SubscribeAttribute /* * Attribute EventList */ -class ReadRvcCleanEventList : public ReadAttribute { +class ReadRvcCleanModeSelectEventList : public ReadAttribute { public: - ReadRvcCleanEventList() + ReadRvcCleanModeSelectEventList() : ReadAttribute("event-list") { } - ~ReadRvcCleanEventList() {} + ~ReadRvcCleanModeSelectEventList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x0000FFFA) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeEventListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.EventList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.EventList response %@", [value description]); if (error != nil) { - LogNSError("RVCClean EventList read Error", error); + LogNSError("RVCCleanModeSelect EventList read Error", error); } SetCommandExitStatus(error); }]; @@ -43960,20 +44153,22 @@ class ReadRvcCleanEventList : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanEventList : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectEventList : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanEventList() + SubscribeAttributeRvcCleanModeSelectEventList() : SubscribeAttribute("event-list") { } - ~SubscribeAttributeRvcCleanEventList() {} + ~SubscribeAttributeRvcCleanModeSelectEventList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x0000FFFA) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -43989,7 +44184,7 @@ class SubscribeAttributeRvcCleanEventList : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.EventList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.EventList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -44000,25 +44195,27 @@ class SubscribeAttributeRvcCleanEventList : public SubscribeAttribute { /* * Attribute AttributeList */ -class ReadRvcCleanAttributeList : public ReadAttribute { +class ReadRvcCleanModeSelectAttributeList : public ReadAttribute { public: - ReadRvcCleanAttributeList() + ReadRvcCleanModeSelectAttributeList() : ReadAttribute("attribute-list") { } - ~ReadRvcCleanAttributeList() {} + ~ReadRvcCleanModeSelectAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeAttributeListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.AttributeList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.AttributeList response %@", [value description]); if (error != nil) { - LogNSError("RVCClean AttributeList read Error", error); + LogNSError("RVCCleanModeSelect AttributeList read Error", error); } SetCommandExitStatus(error); }]; @@ -44026,20 +44223,22 @@ class ReadRvcCleanAttributeList : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanAttributeList : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectAttributeList : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanAttributeList() + SubscribeAttributeRvcCleanModeSelectAttributeList() : SubscribeAttribute("attribute-list") { } - ~SubscribeAttributeRvcCleanAttributeList() {} + ~SubscribeAttributeRvcCleanModeSelectAttributeList() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x0000FFFB) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -44055,7 +44254,7 @@ class SubscribeAttributeRvcCleanAttributeList : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSArray * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.AttributeList response %@", [value description]); + NSLog(@"RVCCleanModeSelect.AttributeList response %@", [value description]); SetCommandExitStatus(error); }]; @@ -44066,25 +44265,27 @@ class SubscribeAttributeRvcCleanAttributeList : public SubscribeAttribute { /* * Attribute FeatureMap */ -class ReadRvcCleanFeatureMap : public ReadAttribute { +class ReadRvcCleanModeSelectFeatureMap : public ReadAttribute { public: - ReadRvcCleanFeatureMap() + ReadRvcCleanModeSelectFeatureMap() : ReadAttribute("feature-map") { } - ~ReadRvcCleanFeatureMap() {} + ~ReadRvcCleanModeSelectFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeFeatureMapWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.FeatureMap response %@", [value description]); + NSLog(@"RVCCleanModeSelect.FeatureMap response %@", [value description]); if (error != nil) { - LogNSError("RVCClean FeatureMap read Error", error); + LogNSError("RVCCleanModeSelect FeatureMap read Error", error); } SetCommandExitStatus(error); }]; @@ -44092,20 +44293,22 @@ class ReadRvcCleanFeatureMap : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanFeatureMap : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectFeatureMap : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanFeatureMap() + SubscribeAttributeRvcCleanModeSelectFeatureMap() : SubscribeAttribute("feature-map") { } - ~SubscribeAttributeRvcCleanFeatureMap() {} + ~SubscribeAttributeRvcCleanModeSelectFeatureMap() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x0000FFFC) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -44121,7 +44324,7 @@ class SubscribeAttributeRvcCleanFeatureMap : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.FeatureMap response %@", [value description]); + NSLog(@"RVCCleanModeSelect.FeatureMap response %@", [value description]); SetCommandExitStatus(error); }]; @@ -44132,25 +44335,27 @@ class SubscribeAttributeRvcCleanFeatureMap : public SubscribeAttribute { /* * Attribute ClusterRevision */ -class ReadRvcCleanClusterRevision : public ReadAttribute { +class ReadRvcCleanModeSelectClusterRevision : public ReadAttribute { public: - ReadRvcCleanClusterRevision() + ReadRvcCleanModeSelectClusterRevision() : ReadAttribute("cluster-revision") { } - ~ReadRvcCleanClusterRevision() {} + ~ReadRvcCleanModeSelectClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReadAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; [cluster readAttributeClusterRevisionWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.ClusterRevision response %@", [value description]); + NSLog(@"RVCCleanModeSelect.ClusterRevision response %@", [value description]); if (error != nil) { - LogNSError("RVCClean ClusterRevision read Error", error); + LogNSError("RVCCleanModeSelect ClusterRevision read Error", error); } SetCommandExitStatus(error); }]; @@ -44158,20 +44363,22 @@ class ReadRvcCleanClusterRevision : public ReadAttribute { } }; -class SubscribeAttributeRvcCleanClusterRevision : public SubscribeAttribute { +class SubscribeAttributeRvcCleanModeSelectClusterRevision : public SubscribeAttribute { public: - SubscribeAttributeRvcCleanClusterRevision() + SubscribeAttributeRvcCleanModeSelectClusterRevision() : SubscribeAttribute("cluster-revision") { } - ~SubscribeAttributeRvcCleanClusterRevision() {} + ~SubscribeAttributeRvcCleanModeSelectClusterRevision() {} CHIP_ERROR SendCommand(MTRBaseDevice * device, chip::EndpointId endpointId) override { ChipLogProgress(chipTool, "Sending cluster (0x00000055) ReportAttribute (0x0000FFFD) on endpoint %u", endpointId); dispatch_queue_t callbackQueue = dispatch_queue_create("com.chip.command", DISPATCH_QUEUE_SERIAL); - __auto_type * cluster = [[MTRBaseClusterRVCClean alloc] initWithDevice:device endpointID:@(endpointId) queue:callbackQueue]; + __auto_type * cluster = [[MTRBaseClusterRVCCleanModeSelect alloc] initWithDevice:device + endpointID:@(endpointId) + queue:callbackQueue]; __auto_type * params = [[MTRSubscribeParams alloc] initWithMinInterval:@(mMinInterval) maxInterval:@(mMaxInterval)]; if (mKeepSubscriptions.HasValue()) { params.replaceExistingSubscriptions = !mKeepSubscriptions.Value(); @@ -44187,7 +44394,7 @@ class SubscribeAttributeRvcCleanClusterRevision : public SubscribeAttribute { mSubscriptionEstablished = YES; } reportHandler:^(NSNumber * _Nullable value, NSError * _Nullable error) { - NSLog(@"RVCClean.ClusterRevision response %@", [value description]); + NSLog(@"RVCCleanModeSelect.ClusterRevision response %@", [value description]); SetCommandExitStatus(error); }]; @@ -120559,6 +120766,8 @@ void registerClusterModeSelect(Commands & commands) make_unique(Id), // make_unique(Id), // make_unique(), // + make_unique(), // + make_unique(), // make_unique(), // make_unique(), // make_unique(), // @@ -120626,125 +120835,125 @@ void registerClusterLaundryWasherModeSelect(Commands & commands) commands.Register(clusterName, clusterCommands); } -void registerClusterRefrigeratorAndTemperatureControlledCabinet(Commands & commands) +void registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(Commands & commands) { - using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet; + using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; - const char * clusterName = "RefrigeratorAndTemperatureControlledCabinet"; + const char * clusterName = "RefrigeratorAndTemperatureControlledCabinetModeSelect"; commands_list clusterCommands = { make_unique(Id), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // make_unique(Id), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // }; commands.Register(clusterName, clusterCommands); } -void registerClusterRvcRun(Commands & commands) +void registerClusterRvcRunModeSelect(Commands & commands) { - using namespace chip::app::Clusters::RvcRun; + using namespace chip::app::Clusters::RvcRunModeSelect; - const char * clusterName = "RvcRun"; + const char * clusterName = "RvcRunModeSelect"; commands_list clusterCommands = { make_unique(Id), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // make_unique(Id), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // }; commands.Register(clusterName, clusterCommands); } -void registerClusterRvcClean(Commands & commands) +void registerClusterRvcCleanModeSelect(Commands & commands) { - using namespace chip::app::Clusters::RvcClean; + using namespace chip::app::Clusters::RvcCleanModeSelect; - const char * clusterName = "RvcClean"; + const char * clusterName = "RvcCleanModeSelect"; commands_list clusterCommands = { make_unique(Id), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // make_unique(Id), // - make_unique(), // + make_unique(), // make_unique(Id), // make_unique(Id), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // - make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // + make_unique(), // }; commands.Register(clusterName, clusterCommands); @@ -123482,9 +123691,9 @@ void registerClusters(Commands & commands) registerClusterBooleanState(commands); registerClusterModeSelect(commands); registerClusterLaundryWasherModeSelect(commands); - registerClusterRefrigeratorAndTemperatureControlledCabinet(commands); - registerClusterRvcRun(commands); - registerClusterRvcClean(commands); + registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(commands); + registerClusterRvcRunModeSelect(commands); + registerClusterRvcCleanModeSelect(commands); registerClusterTemperatureControl(commands); registerClusterDishwasherModeSelect(commands); registerClusterAirQuality(commands); diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h index 9787a60a128cbc..31e232bf9fe547 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClientCallbacks.h @@ -439,40 +439,43 @@ typedef void (*LaundryWasherModeSelectEventListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*LaundryWasherModeSelectAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetSupportedModesListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinet::Structs::ModeOptionStruct::DecodableType> & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetGeneratedCommandListListAttributeCallback)( + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & + data); +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetAcceptedCommandListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetEventListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetAttributeListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunSupportedModesListAttributeCallback)( +typedef void (*RvcRunModeSelectSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunGeneratedCommandListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunAcceptedCommandListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunEventListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunAttributeListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcCleanSupportedModesListAttributeCallback)( + const chip::app::DataModel::DecodableList & + data); +typedef void (*RvcRunModeSelectGeneratedCommandListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RvcRunModeSelectAcceptedCommandListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RvcRunModeSelectEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcRunModeSelectAttributeListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeSelectSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcCleanGeneratedCommandListListAttributeCallback)( + const chip::app::DataModel::DecodableList & + data); +typedef void (*RvcCleanModeSelectGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RvcCleanAcceptedCommandListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcCleanEventListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*RvcCleanAttributeListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeSelectAcceptedCommandListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeSelectEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeSelectAttributeListListAttributeCallback)( + void * context, const chip::app::DataModel::DecodableList & data); typedef void (*DishwasherModeSelectSupportedModesListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h index b186c31068f7ff..007e73953dabf2 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/CHIPClusters.h @@ -385,32 +385,32 @@ class DLL_EXPORT LaundryWasherModeSelectCluster : public ClusterBase ~LaundryWasherModeSelectCluster() {} }; -class DLL_EXPORT RefrigeratorAndTemperatureControlledCabinetCluster : public ClusterBase +class DLL_EXPORT RefrigeratorAndTemperatureControlledCabinetModeSelectCluster : public ClusterBase { public: - RefrigeratorAndTemperatureControlledCabinetCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, - EndpointId endpoint) : + RefrigeratorAndTemperatureControlledCabinetModeSelectCluster(Messaging::ExchangeManager & exchangeManager, + const SessionHandle & session, EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint) {} - ~RefrigeratorAndTemperatureControlledCabinetCluster() {} + ~RefrigeratorAndTemperatureControlledCabinetModeSelectCluster() {} }; -class DLL_EXPORT RvcRunCluster : public ClusterBase +class DLL_EXPORT RvcRunModeSelectCluster : public ClusterBase { public: - RvcRunCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : + RvcRunModeSelectCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint) {} - ~RvcRunCluster() {} + ~RvcRunModeSelectCluster() {} }; -class DLL_EXPORT RvcCleanCluster : public ClusterBase +class DLL_EXPORT RvcCleanModeSelectCluster : public ClusterBase { public: - RvcCleanCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : + RvcCleanModeSelectCluster(Messaging::ExchangeManager & exchangeManager, const SessionHandle & session, EndpointId endpoint) : ClusterBase(exchangeManager, session, endpoint) {} - ~RvcCleanCluster() {} + ~RvcCleanModeSelectCluster() {} }; class DLL_EXPORT DishwasherModeSelectCluster : public ClusterBase diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h index 86dd581f7d1ed5..9d8763dead50fb 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/endpoint_config.h @@ -557,7 +557,7 @@ .eventCount = 0, \ },\ { \ - /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet (client) */ \ + /* Endpoint: 1, Cluster: Refrigerator And Temperature Controlled Cabinet Mode Select (client) */ \ .clusterId = 0x00000052, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ @@ -570,7 +570,7 @@ .eventCount = 0, \ },\ { \ - /* Endpoint: 1, Cluster: RVC Run (client) */ \ + /* Endpoint: 1, Cluster: RVC Run Mode Select (client) */ \ .clusterId = 0x00000054, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ @@ -583,7 +583,7 @@ .eventCount = 0, \ },\ { \ - /* Endpoint: 1, Cluster: RVC Clean (client) */ \ + /* Endpoint: 1, Cluster: RVC Clean Mode Select (client) */ \ .clusterId = 0x00000055, \ .attributes = ZAP_ATTRIBUTE_INDEX(0), \ .attributeCount = 0, \ diff --git a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h index a1b9ee1dcc4145..406b3419718322 100644 --- a/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h +++ b/zzz_generated/darwin/controller-clusters/zap-generated/gen_config.h @@ -59,9 +59,9 @@ #define EMBER_AF_ICD_MANAGEMENT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_LAUNDRY_WASHER_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_RVC_RUN_CLUSTER_CLIENT_ENDPOINT_COUNT (1) -#define EMBER_AF_RVC_CLEAN_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_RVC_RUN_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) +#define EMBER_AF_RVC_CLEAN_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_DISHWASHER_MODE_SELECT_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_AIR_QUALITY_CLUSTER_CLIENT_ENDPOINT_COUNT (1) #define EMBER_AF_SMOKE_CO_ALARM_CLUSTER_CLIENT_ENDPOINT_COUNT (1) @@ -261,17 +261,17 @@ #define ZCL_USING_LAUNDRY_WASHER_MODE_SELECT_CLUSTER_CLIENT #define EMBER_AF_PLUGIN_LAUNDRY_WASHER_MODE_SELECT_CLIENT -// Use this macro to check if the client side of the Refrigerator And Temperature Controlled Cabinet cluster is included -#define ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_CLIENT +// Use this macro to check if the client side of the Refrigerator And Temperature Controlled Cabinet Mode Select cluster is included +#define ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_CLIENT +#define EMBER_AF_PLUGIN_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLIENT -// Use this macro to check if the client side of the RVC Run cluster is included -#define ZCL_USING_RVC_RUN_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_RVC_RUN_CLIENT +// Use this macro to check if the client side of the RVC Run Mode Select cluster is included +#define ZCL_USING_RVC_RUN_MODE_SELECT_CLUSTER_CLIENT +#define EMBER_AF_PLUGIN_RVC_RUN_MODE_SELECT_CLIENT -// Use this macro to check if the client side of the RVC Clean cluster is included -#define ZCL_USING_RVC_CLEAN_CLUSTER_CLIENT -#define EMBER_AF_PLUGIN_RVC_CLEAN_CLIENT +// Use this macro to check if the client side of the RVC Clean Mode Select cluster is included +#define ZCL_USING_RVC_CLEAN_MODE_SELECT_CLUSTER_CLIENT +#define EMBER_AF_PLUGIN_RVC_CLEAN_MODE_SELECT_CLIENT // Use this macro to check if the client side of the Dishwasher Mode Select cluster is included #define ZCL_USING_DISHWASHER_MODE_SELECT_CLUSTER_CLIENT