From 2477281834f0bbd8746ab44252c7637bf147c52a Mon Sep 17 00:00:00 2001 From: William Date: Fri, 16 Jun 2023 16:26:15 +0100 Subject: [PATCH] Update mode select xml following spec pr 7151 (#27249) * Renamed mode-select-cluster.xml to mode-base-cluster.xml and updated the contets to match the spec from PR 7151 * Renamed and updated the mode aliases to match the spec PR 7151. Updated the relevant lists. * Added the ModeSelect cluster xml from v1.1 * Updated the mode select aliase names in the cotroller BUILD.gn * Added the ModeSelect cluster and mode aliases to the contoller-clusters.zap * Generated the zap code. * Fixed typo in Mode Select * Regenerated code. * Reverted the mode select parts of the example source code to v1.1. * Update src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml Co-authored-by: Boris Zbarsky * Fixed typo. * Removed the use of the detail namespace for structs as it is failing tests. * Regenerated code. * Reverted the mode select test to v1.1. * Restyled by prettier-yaml * Regenerated code. * Authored by Boris Zbarsky: reverts fixes made when semantic tags where remaned to mode tags. * Regenerated code after merge. * Removed the description attribete from the mode base and all its aliased clusters. * Regenerated code after removing the description attribute. * Added a comment to explain why we have ModeBase enums commentd out. * Regenerated code after merge. * Removed duplicate entries in the data_modle/build.gn file caused by the merge. --------- Co-authored-by: Boris Zbarsky Co-authored-by: Restyled.io --- .github/workflows/tests.yaml | 11 +- .../all-clusters-app.matter | 28 +- .../src/static-supported-modes-manager.cpp | 23 +- .../all-clusters-minimal-app.matter | 28 +- .../bridge-common/bridge-app.matter | 1 - ...p_rootnode_dimmablelight_bCwGYSDpoe.matter | 1 - ...de_colortemperaturelight_hbUnzYVeyn.matter | 1 - .../rootnode_contactsensor_lFAGG1bfRO.matter | 1 - .../rootnode_dimmablelight_bCwGYSDpoe.matter | 1 - .../rootnode_doorlock_aNKYAreMXE.matter | 1 - ...tnode_extendedcolorlight_8lcaaYJVAa.matter | 1 - .../devices/rootnode_fan_7N2TobIlOX.matter | 1 - .../rootnode_flowsensor_1zVxHedlaV.matter | 1 - ...tnode_heatingcoolingunit_ncdGai1E5a.matter | 1 - .../rootnode_humiditysensor_Xyj4gda6Hb.matter | 1 - .../rootnode_lightsensor_lZQycTFcJK.matter | 1 - ...rootnode_occupancysensor_iHyVgifZuo.matter | 1 - .../rootnode_onofflight_bbs1b7IaOV.matter | 1 - ...ootnode_onofflightswitch_FsPlMr090Q.matter | 1 - ...rootnode_onoffpluginunit_Wtf8ss5EBY.matter | 1 - .../rootnode_pressuresensor_s0qC9wLH4k.matter | 1 - .../devices/rootnode_pump_a811bb33a0.matter | 1 - .../rootnode_speaker_RpzeXdimqA.matter | 1 - ...otnode_temperaturesensor_Qy1zkNW7c3.matter | 1 - .../rootnode_thermostat_bm3fb8dhYi.matter | 1 - .../rootnode_windowcovering_RLCxaGi9Yx.matter | 1 - .../contact-sensor-app.matter | 1 - .../light-switch-app.matter | 1 - .../data_model/lighting-app-thread.matter | 1 - .../data_model/lighting-app-wifi.matter | 1 - .../lighting-common/lighting-app.matter | 1 - .../nxp/zap/lighting-on-off.matter | 1 - examples/lighting-app/qpg/zap/light.matter | 1 - .../data_model/lighting-thread-app.matter | 1 - .../data_model/lighting-wifi-app.matter | 1 - examples/lock-app/lock-common/lock-app.matter | 1 - examples/lock-app/nxp/zap/lock-app.matter | 1 - examples/lock-app/qpg/zap/lock.matter | 1 - .../log-source-common/log-source-app.matter | 1 - .../ota-provider-app.matter | 1 - .../ota-requestor-app.matter | 1 - .../placeholder/linux/apps/app1/config.matter | 73 +- .../placeholder/linux/apps/app2/config.matter | 73 +- .../linux/static-supported-modes-manager.cpp | 23 +- .../static-supported-modes-manager.cpp | 45 +- .../static-supported-modes-manager.h | 2 +- examples/pump-app/pump-common/pump-app.matter | 1 - .../pump-controller-app.matter | 1 - .../smoke-co-alarm-app.matter | 1 - .../temperature-measurement.matter | 1 - .../thermostat-common/thermostat.matter | 1 - examples/tv-app/tv-common/tv-app.matter | 1 - .../tv-casting-common/tv-casting-app.matter | 1 - examples/window-app/common/window-app.matter | 1 - scripts/rules.matterlint | 11 +- .../tests/suites/TestModeSelectCluster.yaml | 20 +- src/app/zap-templates/zcl/data-model/all.xml | 11 +- .../chip/dishwasher-mode-cluster.xml | 59 ++ .../chip/dishwasher-mode-select-cluster.xml | 71 -- .../chip/laundry-washer-mode-cluster.xml | 60 ++ .../laundry-washer-mode-select-cluster.xml | 72 -- .../zcl/data-model/chip/mode-base-cluster.xml | 106 +++ .../data-model/chip/mode-select-cluster.xml | 91 +- ...rature-controlled-cabinet-mode-cluster.xml | 58 ++ ...controlled-cabinet-mode-select-cluster.xml | 70 -- .../chip/rvc-clean-mode-cluster.xml | 64 ++ .../chip/rvc-clean-mode-select-cluster.xml | 76 -- .../data-model/chip/rvc-run-mode-cluster.xml | 70 ++ .../chip/rvc-run-mode-select-cluster.xml | 81 -- .../zcl/zcl-with-test-extensions.json | 11 +- src/app/zap-templates/zcl/zcl.json | 11 +- src/app/zap_cluster_list.json | 20 +- src/controller/data_model/BUILD.gn | 20 +- .../data_model/controller-clusters.matter | 195 ++--- .../data_model/controller-clusters.zap | 252 +++--- .../devicecontroller/ClusterIDMapping.java | 195 +---- .../devicecontroller/ClusterReadMapping.java | 715 ++++++++-------- .../devicecontroller/ClusterWriteMapping.java | 180 ++-- .../CHIPAttributeTLVValueDecoder.cpp | 322 ++----- .../java/zap-generated/CHIPClientCallbacks.h | 77 +- .../zap-generated/CHIPClustersWrite-JNI.cpp | 80 +- .../CHIPEventTLVValueDecoder.cpp | 20 +- .../zap-generated/CHIPInvokeCallbacks.cpp | 175 ++-- .../java/zap-generated/CHIPInvokeCallbacks.h | 71 +- .../java/zap-generated/CHIPReadCallbacks.cpp | 796 ++++++++---------- .../chip/devicecontroller/ChipClusters.java | 245 +----- .../chip/devicecontroller/ChipIdLookup.java | 55 +- .../chip/devicecontroller/ChipStructs.java | 136 ++- .../devicecontroller/ClusterInfoMapping.java | 375 +++------ .../python/chip/clusters/CHIPClusters.py | 182 ++-- .../python/chip/clusters/Objects.py | 418 ++------- .../Framework/CHIP/MTRBackwardsCompatShims.h | 5 - .../Framework/CHIP/MTRBackwardsCompatShims.mm | 3 - .../CHIP/templates/availability.yaml | 54 +- .../MTRAttributeTLVValueDecoder.mm | 14 +- .../CHIP/zap-generated/MTRBaseClusters.h | 7 +- .../CHIP/zap-generated/MTRCallbackBridge.mm | 14 +- .../CHIP/zap-generated/MTRStructsObjc.h | 16 +- .../CHIP/zap-generated/MTRStructsObjc.mm | 26 +- src/platform/ESP32/ESP32Config.h | 6 +- .../zap-generated/attributes/Accessors.cpp | 317 ++----- .../zap-generated/attributes/Accessors.h | 45 +- .../app-common/zap-generated/callback.h | 279 +++--- .../zap-generated/cluster-enums-check.h | 62 +- .../app-common/zap-generated/cluster-enums.h | 71 +- .../zap-generated/cluster-objects.cpp | 297 ++----- .../zap-generated/cluster-objects.h | 587 ++++--------- .../app-common/zap-generated/ids/Attributes.h | 80 +- .../app-common/zap-generated/ids/Clusters.h | 20 +- .../app-common/zap-generated/ids/Commands.h | 58 +- .../app-common/zap-generated/print-cluster.h | 50 +- .../zap-generated/cluster/Commands.h | 391 ++------- .../cluster/ComplexArgumentParser.cpp | 76 +- .../cluster/ComplexArgumentParser.h | 10 + .../cluster/logging/DataModelLogger.cpp | 276 +++--- .../cluster/logging/DataModelLogger.h | 20 +- .../chip-tool/zap-generated/test/Commands.h | 218 ++--- .../zap-generated/cluster/Commands.h | 11 +- .../zap-generated/test/Commands.h | 234 ++--- 119 files changed, 3267 insertions(+), 5802 deletions(-) create mode 100644 src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml delete mode 100644 src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml create mode 100644 src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml delete mode 100644 src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml create mode 100644 src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml create mode 100644 src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml delete mode 100644 src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml create mode 100644 src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml delete mode 100644 src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml create mode 100644 src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml delete mode 100644 src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4004b39e13af68..75a29d165a3eba 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -140,7 +140,7 @@ jobs: src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \ - src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml \ @@ -155,12 +155,13 @@ jobs: src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml \ - src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml \ @@ -176,11 +177,11 @@ 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-mode-select-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml \ src/app/zap-templates/zcl/data-model/chip/refrigerator-alarm.xml \ src/app/zap-templates/zcl/data-model/chip/relative-humidity-measurement-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/rvc-clean-mode-cluster.xml \ + src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-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 1fd288a34aabd8..a28f341209feea 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 @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2315,40 +2314,19 @@ server cluster IcdManagement = 70 { /** Attributes and commands for selecting a mode from a list of supported options. */ server cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; diff --git a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp index a806a22c2757e2..17fa5d007b8493 100644 --- a/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp +++ b/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp @@ -8,30 +8,31 @@ using namespace chip::app::Clusters::ModeSelect; using chip::Protocols::InteractionModel::Status; using ModeOptionStructType = Structs::ModeOptionStruct::Type; -using ModeTagType = Structs::ModeTagStruct::Type; +using SemanticTag = Structs::SemanticTagStruct::Type; template using List = app::DataModel::List; using storage_value_type = const ModeOptionStructType; namespace { -Structs::ModeOptionStruct::Type buildModeOptionStruct(const char * label, uint8_t mode, const List & modeTags) +Structs::ModeOptionStruct::Type buildModeOptionStruct(const char * label, uint8_t mode, + const List & semanticTags) { Structs::ModeOptionStruct::Type option; - option.label = CharSpan::fromCharString(label); - option.mode = mode; - option.modeTags = modeTags; + option.label = CharSpan::fromCharString(label); + option.mode = mode; + option.semanticTags = semanticTags; return option; } } // namespace -ModeTagType modeTagsBlack[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } }; -ModeTagType modeTagsCappucino[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } }; -ModeTagType modeTagsEspresso[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } }; +constexpr SemanticTag semanticTagsBlack[] = { { .value = 0 } }; +constexpr SemanticTag semanticTagsCappucino[] = { { .value = 0 } }; +constexpr SemanticTag semanticTagsEspresso[] = { { .value = 0 } }; // TODO: Configure your options for each endpoint storage_value_type StaticSupportedModesManager::coffeeOptions[] = { - buildModeOptionStruct("Black", 0, List(modeTagsBlack)), - buildModeOptionStruct("Cappuccino", 4, List(modeTagsCappucino)), - buildModeOptionStruct("Espresso", 7, List(modeTagsEspresso)) + buildModeOptionStruct("Black", 0, List(semanticTagsBlack)), + buildModeOptionStruct("Cappuccino", 4, List(semanticTagsCappucino)), + buildModeOptionStruct("Espresso", 7, List(semanticTagsEspresso)) }; const StaticSupportedModesManager::EndpointSpanPair StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = { 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 104fa4b1dac252..38e86b0cb5f2cc 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 @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2048,40 +2047,19 @@ server cluster BooleanState = 69 { /** Attributes and commands for selecting a mode from a list of supported options. */ server cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 92cadc203dee65..599392b9eb050a 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index 50a92f95409d58..4fe62d78026e38 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter index 54efa018e7cfa0..e20b2a20749066 100644 --- a/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter +++ b/examples/chef/devices/rootnode_colortemperaturelight_hbUnzYVeyn.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index bb701a18ee67f0..a1cdce02596163 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index c2e5318a739ab1..44262827d12e56 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter index 44034fc276cd9a..8857e1811d611f 100644 --- a/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter +++ b/examples/chef/devices/rootnode_doorlock_aNKYAreMXE.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter index b3287ac4d76f5d..08fcbd0cf16e3a 100644 --- a/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter +++ b/examples/chef/devices/rootnode_extendedcolorlight_8lcaaYJVAa.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter index 7ce96d6a1b79cc..eb3add96d7e94f 100644 --- a/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter +++ b/examples/chef/devices/rootnode_fan_7N2TobIlOX.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index cf1217be0a4a81..3ad3bc94e5290f 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index 293c6f20d54f28..8fdba87ff344ac 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index c92b8e34fd8d89..abb002c4dbbad2 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index a4ce7b2f50b217..d541e513c8588d 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 2419ff7c662a6b..949a75f397e194 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 58b80e234217b1..56dd6a89aade6b 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index 75810385dd8bee..c44972ad3f5a9d 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 116c9888f85784..864754f15aa41f 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index 156127529e8d0b..33c92330fceb89 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_pump_a811bb33a0.matter b/examples/chef/devices/rootnode_pump_a811bb33a0.matter index 96c4e8ccf06ba9..eb515a6d1308a3 100644 --- a/examples/chef/devices/rootnode_pump_a811bb33a0.matter +++ b/examples/chef/devices/rootnode_pump_a811bb33a0.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index f9b2b1a0bf7fed..8e5bf49c509652 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 3271ad89c92a0f..0b82d5134ab9c2 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 694dc771797ce9..9c544afea2f3d7 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index c2eea25c88feb7..c5b23ad6e2492a 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter index a7a951c52a0ac2..a243adc44fb2cf 100644 --- a/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter +++ b/examples/contact-sensor-app/contact-sensor-common/contact-sensor-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 054967c1f9ec29..394f1f21915591 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter index 96ad29d946455b..eaf5d7f4a51eee 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-thread.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter index abea6c297c8826..618449050a7437 100644 --- a/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter +++ b/examples/lighting-app/bouffalolab/data_model/lighting-app-wifi.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 4a6f7909a556d7..533dba220fb674 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/nxp/zap/lighting-on-off.matter b/examples/lighting-app/nxp/zap/lighting-on-off.matter index 0ae348837f0df0..3e04d5c0db617f 100644 --- a/examples/lighting-app/nxp/zap/lighting-on-off.matter +++ b/examples/lighting-app/nxp/zap/lighting-on-off.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/qpg/zap/light.matter b/examples/lighting-app/qpg/zap/light.matter index 644724d1b7021c..d234be6ae3cfc3 100644 --- a/examples/lighting-app/qpg/zap/light.matter +++ b/examples/lighting-app/qpg/zap/light.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter index c53787eaf6418e..c872fe09b891f8 100644 --- a/examples/lighting-app/silabs/data_model/lighting-thread-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-thread-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter index 65ec6c1f964fd6..0855b1e51f8bc2 100644 --- a/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter +++ b/examples/lighting-app/silabs/data_model/lighting-wifi-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index bbe991722a17f7..904b86f5dbc8d9 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lock-app/nxp/zap/lock-app.matter b/examples/lock-app/nxp/zap/lock-app.matter index e006c0ff6baf09..b9a1e853428a3d 100644 --- a/examples/lock-app/nxp/zap/lock-app.matter +++ b/examples/lock-app/nxp/zap/lock-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/lock-app/qpg/zap/lock.matter b/examples/lock-app/qpg/zap/lock.matter index 77dade82d35019..ec736f3b188f9d 100644 --- a/examples/lock-app/qpg/zap/lock.matter +++ b/examples/lock-app/qpg/zap/lock.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index f982536f029c5c..cb248c52aac7d5 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 1048f1f23d986f..15deee36e5294c 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 624a7909f336f4..0d342e9d0d83a8 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index ced41db421494b..ff894c4b436aac 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2657,44 +2656,23 @@ server cluster BooleanState = 69 { /** Attributes and commands for selecting a mode from a list of supported options. */ client cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; - readonly attribute optional nullable enum16 standardNamespace = 1; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute optional nullable int8u startUpMode = 4; @@ -2710,60 +2688,25 @@ client cluster ModeSelect = 80 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { - ENUM8 status = 0; - optional CHAR_STRING statusText = 1; - } - - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ + /** On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. */ command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; } /** Attributes and commands for selecting a mode from a list of supported options. */ server cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 486524fe426c1b..8380ee4e47e109 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2616,44 +2615,23 @@ server cluster BooleanState = 69 { /** Attributes and commands for selecting a mode from a list of supported options. */ client cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; - readonly attribute optional nullable enum16 standardNamespace = 1; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute optional nullable int8u startUpMode = 4; @@ -2669,60 +2647,25 @@ client cluster ModeSelect = 80 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { - ENUM8 status = 0; - optional CHAR_STRING statusText = 1; - } - - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ + /** On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. */ command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; } /** Attributes and commands for selecting a mode from a list of supported options. */ server cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; diff --git a/examples/placeholder/linux/static-supported-modes-manager.cpp b/examples/placeholder/linux/static-supported-modes-manager.cpp index a806a22c2757e2..17fa5d007b8493 100644 --- a/examples/placeholder/linux/static-supported-modes-manager.cpp +++ b/examples/placeholder/linux/static-supported-modes-manager.cpp @@ -8,30 +8,31 @@ using namespace chip::app::Clusters::ModeSelect; using chip::Protocols::InteractionModel::Status; using ModeOptionStructType = Structs::ModeOptionStruct::Type; -using ModeTagType = Structs::ModeTagStruct::Type; +using SemanticTag = Structs::SemanticTagStruct::Type; template using List = app::DataModel::List; using storage_value_type = const ModeOptionStructType; namespace { -Structs::ModeOptionStruct::Type buildModeOptionStruct(const char * label, uint8_t mode, const List & modeTags) +Structs::ModeOptionStruct::Type buildModeOptionStruct(const char * label, uint8_t mode, + const List & semanticTags) { Structs::ModeOptionStruct::Type option; - option.label = CharSpan::fromCharString(label); - option.mode = mode; - option.modeTags = modeTags; + option.label = CharSpan::fromCharString(label); + option.mode = mode; + option.semanticTags = semanticTags; return option; } } // namespace -ModeTagType modeTagsBlack[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } }; -ModeTagType modeTagsCappucino[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } }; -ModeTagType modeTagsEspresso[] = { detail::Structs::ModeTagStruct::Type{ .value = 0 } }; +constexpr SemanticTag semanticTagsBlack[] = { { .value = 0 } }; +constexpr SemanticTag semanticTagsCappucino[] = { { .value = 0 } }; +constexpr SemanticTag semanticTagsEspresso[] = { { .value = 0 } }; // TODO: Configure your options for each endpoint storage_value_type StaticSupportedModesManager::coffeeOptions[] = { - buildModeOptionStruct("Black", 0, List(modeTagsBlack)), - buildModeOptionStruct("Cappuccino", 4, List(modeTagsCappucino)), - buildModeOptionStruct("Espresso", 7, List(modeTagsEspresso)) + buildModeOptionStruct("Black", 0, List(semanticTagsBlack)), + buildModeOptionStruct("Cappuccino", 4, List(semanticTagsCappucino)), + buildModeOptionStruct("Espresso", 7, List(semanticTagsEspresso)) }; const StaticSupportedModesManager::EndpointSpanPair StaticSupportedModesManager::supportedOptionsByEndpoints[EMBER_AF_MODE_SELECT_CLUSTER_SERVER_ENDPOINT_COUNT] = { diff --git a/examples/platform/esp32/mode-support/static-supported-modes-manager.cpp b/examples/platform/esp32/mode-support/static-supported-modes-manager.cpp index c5b744b3616dde..ed85f1068661f8 100644 --- a/examples/platform/esp32/mode-support/static-supported-modes-manager.cpp +++ b/examples/platform/esp32/mode-support/static-supported-modes-manager.cpp @@ -26,7 +26,7 @@ using namespace chip::app::Clusters::ModeSelect; using chip::Protocols::InteractionModel::Status; using ModeOptionStructType = Structs::ModeOptionStruct::Type; -using ModeTagType = Structs::ModeTagStruct::Type; +using SemanticTag = Structs::SemanticTagStruct::Type; template using List = app::DataModel::List; @@ -51,7 +51,7 @@ SupportedModesManager::ModeOptionsProvider StaticSupportedModesManager::getModeO } ModeOptionStructType * modeOptionStructList = nullptr; - ModeTagType * modeTags = nullptr; + SemanticTag * semanticTags = nullptr; char keyBuf[ESP32Config::kMaxConfigKeyNameLength]; uint32_t supportedModeCount = 0; @@ -74,7 +74,7 @@ SupportedModesManager::ModeOptionsProvider StaticSupportedModesManager::getModeO { Structs::ModeOptionStruct::Type option; uint32_t supportedModeMode = 0; - uint32_t modeTagCount = 0; + uint32_t semanticTagCount = 0; size_t outLen = 0; memset(keyBuf, 0, sizeof(char) * ESP32Config::kMaxConfigKeyNameLength); @@ -104,49 +104,50 @@ SupportedModesManager::ModeOptionsProvider StaticSupportedModesManager::getModeO ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); memset(keyBuf, 0, sizeof(char) * ESP32Config::kMaxConfigKeyNameLength); - VerifyOrReturnValue(ESP32Config::KeyAllocator::ModeTagsCount(keyBuf, sizeof(keyBuf), endpointId, index) == CHIP_NO_ERROR, + VerifyOrReturnValue(ESP32Config::KeyAllocator::SemanticTagsCount(keyBuf, sizeof(keyBuf), endpointId, index) == + CHIP_NO_ERROR, ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); ESP32Config::Key stCountKey(ESP32Config::kConfigNamespace_ChipFactory, keyBuf); - VerifyOrReturnValue(ESP32Config::ReadConfigValue(stCountKey, modeTagCount) == CHIP_NO_ERROR, + VerifyOrReturnValue(ESP32Config::ReadConfigValue(stCountKey, semanticTagCount) == CHIP_NO_ERROR, ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); - modeTags = new ModeTagType[modeTagCount]; - if (modeTags == nullptr) + semanticTags = new SemanticTag[semanticTagCount]; + if (semanticTags == nullptr) { CleanUp(endpointId); return ModeOptionsProvider(nullptr, nullptr); } - for (auto stIndex = 0; stIndex < modeTagCount; stIndex++) + for (auto stIndex = 0; stIndex < semanticTagCount; stIndex++) { - uint32_t modeTagValue = 0; - uint32_t modeTagMfgCode = 0; - ModeTagType tag; + uint32_t semanticTagValue = 0; + uint32_t semanticTagMfgCode = 0; + SemanticTag tag; memset(keyBuf, 0, sizeof(char) * ESP32Config::kMaxConfigKeyNameLength); - VerifyOrReturnValue(ESP32Config::KeyAllocator::ModeTagValue(keyBuf, sizeof(keyBuf), endpointId, index, stIndex) == + VerifyOrReturnValue(ESP32Config::KeyAllocator::SemanticTagValue(keyBuf, sizeof(keyBuf), endpointId, index, stIndex) == CHIP_NO_ERROR, ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); ESP32Config::Key stValueKey(ESP32Config::kConfigNamespace_ChipFactory, keyBuf); - VerifyOrReturnValue(ESP32Config::ReadConfigValue(stValueKey, modeTagValue) == CHIP_NO_ERROR, + VerifyOrReturnValue(ESP32Config::ReadConfigValue(stValueKey, semanticTagValue) == CHIP_NO_ERROR, ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); memset(keyBuf, 0, sizeof(char) * ESP32Config::kMaxConfigKeyNameLength); - VerifyOrReturnValue(ESP32Config::KeyAllocator::ModeTagMfgCode(keyBuf, sizeof(keyBuf), endpointId, index, stIndex) == + VerifyOrReturnValue(ESP32Config::KeyAllocator::SemanticTagMfgCode(keyBuf, sizeof(keyBuf), endpointId, index, stIndex) == CHIP_NO_ERROR, ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); ESP32Config::Key stMfgCodeKey(ESP32Config::kConfigNamespace_ChipFactory, keyBuf); - VerifyOrReturnValue(ESP32Config::ReadConfigValue(stMfgCodeKey, modeTagMfgCode) == CHIP_NO_ERROR, + VerifyOrReturnValue(ESP32Config::ReadConfigValue(stMfgCodeKey, semanticTagMfgCode) == CHIP_NO_ERROR, ModeOptionsProvider(nullptr, nullptr), CleanUp(endpointId)); - tag.value = static_cast(modeTagValue); - // tag.mfgCode = static_cast(modeTagMfgCode); - modeTags[stIndex] = tag; + tag.value = static_cast(semanticTagValue); + tag.mfgCode = static_cast(semanticTagMfgCode); + semanticTags[stIndex] = tag; } - option.label = chip::CharSpan::fromCharString(modeLabel); - option.mode = static_cast(supportedModeMode); - option.modeTags = DataModel::List(modeTags, modeTagCount); + option.label = chip::CharSpan::fromCharString(modeLabel); + option.mode = static_cast(supportedModeMode); + option.semanticTags = DataModel::List(semanticTags, semanticTagCount); modeOptionStructList[index] = option; } @@ -193,7 +194,7 @@ void StaticSupportedModesManager::FreeSupportedModes(EndpointId endpointId) cons { auto & modeOption = *it; delete[] modeOption.label.data(); - delete[] modeOption.modeTags.data(); + delete[] modeOption.semanticTags.data(); } delete[] begin; } diff --git a/examples/platform/esp32/mode-support/static-supported-modes-manager.h b/examples/platform/esp32/mode-support/static-supported-modes-manager.h index 9506f158e5d52a..689c9d059f4ab7 100644 --- a/examples/platform/esp32/mode-support/static-supported-modes-manager.h +++ b/examples/platform/esp32/mode-support/static-supported-modes-manager.h @@ -30,7 +30,7 @@ class StaticSupportedModesManager : public chip::app::Clusters::ModeSelect::Supp { private: using ModeOptionStructType = Structs::ModeOptionStruct::Type; - using ModeTag = Structs::ModeTagStruct::Type; + using SemanticTag = Structs::SemanticTagStruct::Type; static ModeOptionsProvider epModeOptionsProviderList[FIXED_ENDPOINT_COUNT]; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index e43d3afa2ca24c..075b8c7cc77237 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 0025fb8aa63a3c..418d7d4b82dd13 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter index 3ceab153db1fa4..c1a92de36a1b97 100644 --- a/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter +++ b/examples/smoke-co-alarm-app/smoke-co-alarm-common/smoke-co-alarm-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter index d7a1ec6b003f64..df4ac91800248b 100644 --- a/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter +++ b/examples/temperature-measurement-app/temperature-measurement-common/temperature-measurement.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index 85fcfa9afbbbdf..11cd0f27954c68 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index 11c4b348cbe8a2..87d84e6abb923f 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index 559e42c257415c..92dac22d2f131b 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index ba4f26b31b963b..1b555884166d66 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { diff --git a/scripts/rules.matterlint b/scripts/rules.matterlint index 7134768396864a..c026fb36a65a7a 100644 --- a/scripts/rules.matterlint +++ b/scripts/rules.matterlint @@ -23,7 +23,7 @@ load "../src/app/zap-templates/zcl/data-model/chip/concentration-measurement-clu load "../src/app/zap-templates/zcl/data-model/chip/content-launch-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/descriptor-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml"; -load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml"; @@ -37,13 +37,14 @@ load "../src/app/zap-templates/zcl/data-model/chip/group-key-mgmt-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/identify-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/illuminance-measurement-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/keypad-input-cluster.xml"; -load "../src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/level-control-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/localization-configuration-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/low-power-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/matter-devices.xml"; load "../src/app/zap-templates/zcl/data-model/chip/media-input-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/media-playback-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/network-commissioning-cluster.xml"; load "../src/app/zap-templates/zcl/data-model/chip/occupancy-sensing-cluster.xml"; @@ -59,10 +60,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-mode-select-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-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-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/rvc-clean-mode-cluster.xml"; +load "../src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-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/src/app/tests/suites/TestModeSelectCluster.yaml b/src/app/tests/suites/TestModeSelectCluster.yaml index 17b5a4cb3876a6..3df5462041b374 100644 --- a/src/app/tests/suites/TestModeSelectCluster.yaml +++ b/src/app/tests/suites/TestModeSelectCluster.yaml @@ -33,15 +33,29 @@ tests: response: value: "Coffee" + - label: "Read StandardNamespace" + command: "readAttribute" + attribute: "StandardNamespace" + response: + value: 0 + - label: "Read SupportedModes" command: "readAttribute" attribute: "SupportedModes" response: value: [ - { Label: "Black", Mode: 0, ModeTags: [{ "Value": 0 }] }, - { Label: "Cappuccino", Mode: 4, ModeTags: [{ "Value": 0 }] }, - { Label: "Espresso", Mode: 7, ModeTags: [{ "Value": 0 }] }, + { Label: "Black", Mode: 0, SemanticTags: [{ "Value": 0 }] }, + { + Label: "Cappuccino", + Mode: 4, + SemanticTags: [{ "Value": 0 }], + }, + { + Label: "Espresso", + Mode: 7, + SemanticTags: [{ "Value": 0 }], + }, ] constraints: type: list diff --git a/src/app/zap-templates/zcl/data-model/all.xml b/src/app/zap-templates/zcl/data-model/all.xml index 7aec7f0f260116..9364d830c45340 100644 --- a/src/app/zap-templates/zcl/data-model/all.xml +++ b/src/app/zap-templates/zcl/data-model/all.xml @@ -21,7 +21,7 @@ - + @@ -38,11 +38,12 @@ - + + @@ -58,10 +59,10 @@ - + - - + + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml new file mode 100644 index 00000000000000..49e4d4c86ff105 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + General + Dishwasher Mode + 0x0059 + DISHWASHER_MODE_CLUSTER + true + true + Attributes and commands for selecting a mode from a list of supported options. + + + SupportedModes + CurrentMode + StartUpMode + OnMode + + + + + This command is used to change device modes. + On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + + + + + + + This command is sent by the device on receipt of the ChangeToModeWithStatus command. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml deleted file mode 100644 index 5814edebd43452..00000000000000 --- a/src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-select-cluster.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - General - Dishwasher Mode Select - 0x0059 - DISHWASHER_MODE_SELECT_CLUSTER - true - true - This cluster is an alias of the Mode Select cluster, defining additional semantics and - namespaced enumerated values for dishwasher devices. - - - Description - SupportedModes - CurrentMode - StartUpMode - OnMode - - - - - If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. - - - - - - - This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. - - - - - - - This command is sent by the device on receipt of the ChangeToModeWithStatus command. - - - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml new file mode 100644 index 00000000000000..3bea0e59d015ef --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-cluster.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + General + Laundry Washer Mode + 0x0051 + LAUNDRY_WASHER_MODE_CLUSTER + true + true + Attributes and commands for selecting a mode from a list of supported options. + + + SupportedModes + CurrentMode + StartUpMode + OnMode + + + + + This command is used to change device modes. + On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + + + + + + + This command is sent by the device on receipt of the ChangeToModeWithStatus command. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml deleted file mode 100644 index 52cc7039d5c621..00000000000000 --- a/src/app/zap-templates/zcl/data-model/chip/laundry-washer-mode-select-cluster.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - General - Laundry Washer Mode Select - 0x0051 - LAUNDRY_WASHER_MODE_SELECT_CLUSTER - true - true - This cluster is an alias of the Mode Select cluster, defining additional semantics and - namespaced enumerated values for laundry washer devices. - - - Description - SupportedModes - CurrentMode - StartUpMode - OnMode - - - - - If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. - - - - - - - This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. - - - - - - - This command is sent by the device on receipt of the ChangeToModeWithStatus command. - - - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml new file mode 100644 index 00000000000000..f0bb878ce09b7a --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/mode-base-cluster.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml index 3df49aa9cdff84..7bf4c972972635 100644 --- a/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/mode-select-cluster.xml @@ -17,50 +17,17 @@ limitations under the License. - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + @@ -71,52 +38,26 @@ limitations under the License. true true Attributes and commands for selecting a mode from a list of supported options. - - Description - - StandardNamespace - SupportedModes - CurrentMode - StartUpMode - OnMode - - + Description + StandardNamespace + SupportedModes + CurrentMode + StartUpMode + OnMode + + - If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. - - - - - - - This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. - - - - - - - This command is sent by the device on receipt of the ChangeToModeWithStatus command. + On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. - - + - - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml new file mode 100644 index 00000000000000..aafc4f36af53f4 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + General + Refrigerator And Temperature Controlled Cabinet Mode + 0x0052 + REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER + true + true + Attributes and commands for selecting a mode from a list of supported options. + + + SupportedModes + CurrentMode + StartUpMode + OnMode + + + + + This command is used to change device modes. + On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + + + + + + + This command is sent by the device on receipt of the ChangeToModeWithStatus command. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml deleted file mode 100644 index 965dae53507ec4..00000000000000 --- a/src/app/zap-templates/zcl/data-model/chip/refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - General - Refrigerator And Temperature Controlled Cabinet Mode Select - 0x0052 - REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER - true - true - This cluster is an alias of the Mode Select cluster, defining additional semantics and - namespaced enumerated values for refrigerator and temperature controlled cabinet devices. - - - Description - SupportedModes - CurrentMode - StartUpMode - OnMode - - - - - If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. - - - - - - - This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. - - - - - - - This command is sent by the device on receipt of the ChangeToModeWithStatus command. - - - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml new file mode 100644 index 00000000000000..9ae08bb6cb6a3a --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-cluster.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + General + RVC Clean Mode + 0x0055 + RVC_CLEAN_MODE_CLUSTER + true + true + Attributes and commands for selecting a mode from a list of supported options. + + + SupportedModes + CurrentMode + StartUpMode + OnMode + + + + + This command is used to change device modes. + On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + + + + + + + This command is sent by the device on receipt of the ChangeToModeWithStatus command. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml deleted file mode 100644 index 9dcdc5e89dc569..00000000000000 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-clean-mode-select-cluster.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - General - RVC Clean Mode Select - 0x0055 - RVC_CLEAN_MODE_SELECT_CLUSTER - true - true - 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. - - - Description - SupportedModes - CurrentMode - StartUpMode - OnMode - - - - - If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. - - - - - - - This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. - - - - - - - This command is sent by the device on receipt of the ChangeToModeWithStatus command. - - - - - - - diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml new file mode 100644 index 00000000000000..ae5cc2163cc786 --- /dev/null +++ b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-cluster.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + General + RVC Run Mode + 0x0054 + RVC_RUN_MODE_CLUSTER + true + true + Attributes and commands for selecting a mode from a list of supported options. + + + SupportedModes + CurrentMode + StartUpMode + OnMode + + + + + This command is used to change device modes. + On receipt of this command the device SHALL respond with a ChangeToModeResponse command. + + + + + + + This command is sent by the device on receipt of the ChangeToModeWithStatus command. + + + + + + diff --git a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml deleted file mode 100644 index 6e1483d0be074b..00000000000000 --- a/src/app/zap-templates/zcl/data-model/chip/rvc-run-mode-select-cluster.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - General - RVC Run Mode Select - 0x0054 - 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. - - - Description - SupportedModes - CurrentMode - StartUpMode - OnMode - - - - - If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. - - - - - - - This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. - - - - - - - This command is sent by the device on receipt of the ChangeToModeWithStatus command. - - - - - - - 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 2e5c502b4ed72a..07eca6ae3db3d3 100644 --- a/src/app/zap-templates/zcl/zcl-with-test-extensions.json +++ b/src/app/zap-templates/zcl/zcl-with-test-extensions.json @@ -35,7 +35,7 @@ "content-launch-cluster.xml", "descriptor-cluster.xml", "diagnostic-logs-cluster.xml", - "dishwasher-mode-select-cluster.xml", + "dishwasher-mode-cluster.xml", "door-lock-cluster.xml", "electrical-measurement-cluster.xml", "ethernet-network-diagnostics-cluster.xml", @@ -53,12 +53,13 @@ "illuminance-measurement-cluster.xml", "input-output-value-clusters.xml", "keypad-input-cluster.xml", - "laundry-washer-mode-select-cluster.xml", + "laundry-washer-mode-cluster.xml", "level-control-cluster.xml", "localization-configuration-cluster.xml", "low-power-cluster.xml", "media-input-cluster.xml", "media-playback-cluster.xml", + "mode-base-cluster.xml", "mode-select-cluster.xml", "mode-select-extensions.xml", "network-commissioning-cluster.xml", @@ -76,12 +77,12 @@ "proxy-valid-cluster.xml", "pump-configuration-and-control-cluster.xml", "pwm-cluster.xml", - "refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml", + "refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml", "refrigerator-alarm.xml", "relative-humidity-measurement-cluster.xml", "replacable-monitoring-cluster.xml", - "rvc-clean-mode-select-cluster.xml ", - "rvc-run-mode-select-cluster.xml", + "rvc-clean-mode-cluster.xml ", + "rvc-run-mode-cluster.xml", "resource-monitoring-cluster.xml", "scene.xml", "smoke-co-alarm-cluster.xml", diff --git a/src/app/zap-templates/zcl/zcl.json b/src/app/zap-templates/zcl/zcl.json index c7459b16080edc..24cc5cb2c4a6d1 100644 --- a/src/app/zap-templates/zcl/zcl.json +++ b/src/app/zap-templates/zcl/zcl.json @@ -34,7 +34,7 @@ "content-launch-cluster.xml", "descriptor-cluster.xml", "diagnostic-logs-cluster.xml", - "dishwasher-mode-select-cluster.xml", + "dishwasher-mode-cluster.xml", "door-lock-cluster.xml", "electrical-measurement-cluster.xml", "ethernet-network-diagnostics-cluster.xml", @@ -52,12 +52,13 @@ "illuminance-measurement-cluster.xml", "input-output-value-clusters.xml", "keypad-input-cluster.xml", - "laundry-washer-mode-select-cluster.xml", + "laundry-washer-mode-cluster.xml", "level-control-cluster.xml", "localization-configuration-cluster.xml", "low-power-cluster.xml", "media-input-cluster.xml", "media-playback-cluster.xml", + "mode-base-cluster.xml", "mode-select-cluster.xml", "network-commissioning-cluster.xml", "occupancy-sensing-cluster.xml", @@ -74,11 +75,11 @@ "proxy-valid-cluster.xml", "pump-configuration-and-control-cluster.xml", "pwm-cluster.xml", - "refrigerator-and-temperature-controlled-cabinet-mode-select-cluster.xml", + "refrigerator-and-temperature-controlled-cabinet-mode-cluster.xml", "refrigerator-alarm.xml", "relative-humidity-measurement-cluster.xml", - "rvc-clean-mode-select-cluster.xml ", - "rvc-run-mode-select-cluster.xml", + "rvc-clean-mode-cluster.xml ", + "rvc-run-mode-cluster.xml", "replacable-monitoring-cluster.xml", "resource-monitoring-cluster.xml", "scene.xml", diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json index 0e7b0c1593cd6a..7925bbf5ee5fd9 100644 --- a/src/app/zap_cluster_list.json +++ b/src/app/zap_cluster_list.json @@ -36,7 +36,7 @@ "DESCRIPTOR_CLUSTER": [], "DEVICE_TEMP_CLUSTER": [], "DIAGNOSTIC_LOGS_CLUSTER": [], - "DISHWASHER_MODE_SELECT_CLUSTER": [], + "DISHWASHER_MODE_CLUSTER": [], "DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [], "DOOR_LOCK_CLUSTER": [], "ELECTRICAL_MEASUREMENT_CLUSTER": [], @@ -67,7 +67,7 @@ "INK_CARTRIDGE_MONITORING_CLUSTER": [], "IONIZING_FILTER_MONITORING_CLUSTER": [], "KEYPAD_INPUT_CLUSTER": [], - "LAUNDRY_WASHER_MODE_SELECT_CLUSTER": [], + "LAUNDRY_WASHER_MODE_CLUSTER": [], "LEAD_CONCENTRATION_MEASUREMENT_CLUSTER": [], "LEVEL_CONTROL_CLUSTER": [], "LOCALIZATION_CONFIGURATION_CLUSTER": [], @@ -107,12 +107,12 @@ "pump-configuration-and-control-client" ], "PWM_CLUSTER": [], - "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER": [], + "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [], "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [], "REFRIGERATOR_ALARM": [], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_MODE_SELECT_CLUSTER": [], - "RVC_RUN_MODE_SELECT_CLUSTER": [], + "RVC_CLEAN_MODE_CLUSTER": [], + "RVC_RUN_MODE_CLUSTER": [], "SCENES_CLUSTER": [], "SMOKE_CO_ALARM_CLUSTER": [], "SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER": [], @@ -187,7 +187,7 @@ "DESCRIPTOR_CLUSTER": ["descriptor"], "DEVICE_TEMP_CLUSTER": [], "DIAGNOSTIC_LOGS_CLUSTER": ["diagnostic-logs-server"], - "DISHWASHER_MODE_SELECT_CLUSTER": ["mode-select-server"], + "DISHWASHER_MODE_CLUSTER": ["mode-select-server"], "DISSOLVED_OXYGEN_CONCENTRATION_MEASUREMENT_CLUSTER": [], "DOOR_LOCK_CLUSTER": ["door-lock-server"], "ELECTRICAL_MEASUREMENT_CLUSTER": [], @@ -220,7 +220,7 @@ "INK_CARTRIDGE_MONITORING_CLUSTER": [], "IONIZING_FILTER_MONITORING_CLUSTER": [], "KEYPAD_INPUT_CLUSTER": ["keypad-input-server"], - "LAUNDRY_WASHER_MODE_SELECT_CLUSTER": ["mode-select-server"], + "LAUNDRY_WASHER_MODE_CLUSTER": ["mode-select-server"], "LEAD_CONCENTRATION_MEASUREMENT_CLUSTER": [], "LEVEL_CONTROL_CLUSTER": ["level-control"], "LOCALIZATION_CONFIGURATION_CLUSTER": [ @@ -264,13 +264,13 @@ "PWM_CLUSTER": [], "RADON_CONCENTRATION_MEASUREMENT_CLUSTER": [], "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"], - "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER": [ + "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER": [ "mode-select-server" ], "REFRIGERATOR_ALARM_CLUSTER": ["refrigerator-alarm-server"], "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [], - "RVC_CLEAN_MODE_SELECT_CLUSTER": ["mode-select-server"], - "RVC_RUN_MODE_SELECT_CLUSTER": ["mode-select-server"], + "RVC_CLEAN_MODE_CLUSTER": ["mode-select-server"], + "RVC_RUN_MODE_CLUSTER": ["mode-select-server"], "SCENES_CLUSTER": ["scenes-server"], "SMOKE_CO_ALARM_CLUSTER": ["smoke-co-alarm-server"], "SODIUM_CONCENTRATION_MEASUREMENT_CLUSTER": [], diff --git a/src/controller/data_model/BUILD.gn b/src/controller/data_model/BUILD.gn index 3df33e1df39464..22f59e0292cb80 100644 --- a/src/controller/data_model/BUILD.gn +++ b/src/controller/data_model/BUILD.gn @@ -108,8 +108,8 @@ if (current_os == "android" || matter_enable_java_compilation) { "jni/DescriptorClient-ReadImpl.cpp", "jni/DiagnosticLogsClient-InvokeSubscribeImpl.cpp", "jni/DiagnosticLogsClient-ReadImpl.cpp", - "jni/DishwasherModeSelectClient-InvokeSubscribeImpl.cpp", - "jni/DishwasherModeSelectClient-ReadImpl.cpp", + "jni/DishwasherModeClient-InvokeSubscribeImpl.cpp", + "jni/DishwasherModeClient-ReadImpl.cpp", "jni/DissolvedOxygenConcentrationMeasurementClient-InvokeSubscribeImpl.cpp", "jni/DissolvedOxygenConcentrationMeasurementClient-ReadImpl.cpp", "jni/DoorLockClient-InvokeSubscribeImpl.cpp", @@ -168,8 +168,8 @@ if (current_os == "android" || matter_enable_java_compilation) { "jni/IonizingFilterMonitoringClient-ReadImpl.cpp", "jni/KeypadInputClient-InvokeSubscribeImpl.cpp", "jni/KeypadInputClient-ReadImpl.cpp", - "jni/LaundryWasherModeSelectClient-InvokeSubscribeImpl.cpp", - "jni/LaundryWasherModeSelectClient-ReadImpl.cpp", + "jni/LaundryWasherModeClient-InvokeSubscribeImpl.cpp", + "jni/LaundryWasherModeClient-ReadImpl.cpp", "jni/LeadConcentrationMeasurementClient-InvokeSubscribeImpl.cpp", "jni/LeadConcentrationMeasurementClient-ReadImpl.cpp", "jni/LevelControlClient-InvokeSubscribeImpl.cpp", @@ -238,16 +238,16 @@ if (current_os == "android" || matter_enable_java_compilation) { "jni/RadonConcentrationMeasurementClient-ReadImpl.cpp", "jni/RefrigeratorAlarmClient-InvokeSubscribeImpl.cpp", "jni/RefrigeratorAlarmClient-ReadImpl.cpp", - "jni/RefrigeratorAndTemperatureControlledCabinetModeSelectClient-InvokeSubscribeImpl.cpp", - "jni/RefrigeratorAndTemperatureControlledCabinetModeSelectClient-ReadImpl.cpp", + "jni/RefrigeratorAndTemperatureControlledCabinetModeClient-InvokeSubscribeImpl.cpp", + "jni/RefrigeratorAndTemperatureControlledCabinetModeClient-ReadImpl.cpp", "jni/RelativeHumidityMeasurementClient-InvokeSubscribeImpl.cpp", "jni/RelativeHumidityMeasurementClient-ReadImpl.cpp", "jni/RvcOperationalStateClient-InvokeSubscribeImpl.cpp", "jni/RvcOperationalStateClient-ReadImpl.cpp", - "jni/RvcCleanModeSelectClient-InvokeSubscribeImpl.cpp", - "jni/RvcCleanModeSelectClient-ReadImpl.cpp", - "jni/RvcRunModeSelectClient-InvokeSubscribeImpl.cpp", - "jni/RvcRunModeSelectClient-ReadImpl.cpp", + "jni/RvcCleanModeClient-InvokeSubscribeImpl.cpp", + "jni/RvcCleanModeClient-ReadImpl.cpp", + "jni/RvcRunModeClient-InvokeSubscribeImpl.cpp", + "jni/RvcRunModeClient-ReadImpl.cpp", "jni/ScenesClient-InvokeSubscribeImpl.cpp", "jni/ScenesClient-ReadImpl.cpp", "jni/SmokeCoAlarmClient-InvokeSubscribeImpl.cpp", diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index 1117f47585b37e..a160909ea05ff4 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -4,7 +4,6 @@ struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2763,44 +2762,23 @@ client cluster IcdManagement = 70 { /** Attributes and commands for selecting a mode from a list of supported options. */ client cluster ModeSelect = 80 { - enum ModeTag : ENUM16 { - kAuto = 0; - kQuick = 1; - kQuiet = 2; - kLowNoise = 3; - kLowEnergy = 4; - kVacation = 5; - kMin = 6; - kMax = 7; - kNight = 8; - kDay = 9; - } - - enum StatusCode : ENUM8 { - kSuccess = 0; - kUnsupportedMode = 1; - kGenericFailure = 2; - } - bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } - struct ModeTagStruct { - optional vendor_id mfgCode = 0; + struct SemanticTagStruct { + vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { char_string<64> label = 0; int8u mode = 1; - ModeTagStruct modeTags[] = 2; + SemanticTagStruct semanticTags[] = 2; } readonly attribute char_string<64> description = 0; - readonly attribute optional nullable enum16 standardNamespace = 1; + readonly attribute nullable enum16 standardNamespace = 1; readonly attribute ModeOptionStruct supportedModes[] = 2; readonly attribute int8u currentMode = 3; attribute optional nullable int8u startUpMode = 4; @@ -2816,27 +2794,12 @@ client cluster ModeSelect = 80 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { - ENUM8 status = 0; - optional CHAR_STRING statusText = 1; - } - - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ + /** On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. */ command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; } -/** This cluster is an alias of the Mode Select cluster, defining additional semantics and - namespaced enumerated values for laundry washer devices. */ -client cluster LaundryWasherModeSelect = 81 { +/** Attributes and commands for selecting a mode from a list of supported options. */ +client cluster LaundryWasherMode = 81 { enum ModeTag : ENUM16 { kNormal = 16384; kDelicate = 16385; @@ -2846,13 +2809,11 @@ client cluster LaundryWasherModeSelect = 81 { bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2861,11 +2822,10 @@ client cluster LaundryWasherModeSelect = 81 { ModeTagStruct modeTags[] = 2; } - readonly attribute char_string<64> description = 0; - readonly attribute ModeOptionStruct supportedModes[] = 2; - readonly attribute int8u currentMode = 3; - attribute optional nullable int8u startUpMode = 4; - attribute optional nullable int8u onMode = 5; + readonly attribute ModeOptionStruct supportedModes[] = 0; + readonly attribute int8u currentMode = 1; + attribute optional nullable int8u startUpMode = 2; + attribute optional nullable int8u onMode = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -2877,27 +2837,18 @@ client cluster LaundryWasherModeSelect = 81 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { + response struct ChangeToModeResponse = 1 { ENUM8 status = 0; optional CHAR_STRING statusText = 1; } - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ - command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. + /** This command is used to change device modes. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; + command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } -/** 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 RefrigeratorAndTemperatureControlledCabinetModeSelect = 82 { +/** Attributes and commands for selecting a mode from a list of supported options. */ +client cluster RefrigeratorAndTemperatureControlledCabinetMode = 82 { enum ModeTag : ENUM16 { kRapidCool = 16384; kRapidFreeze = 16385; @@ -2905,13 +2856,11 @@ client cluster RefrigeratorAndTemperatureControlledCabinetModeSelect = 82 { bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -2920,11 +2869,10 @@ client cluster RefrigeratorAndTemperatureControlledCabinetModeSelect = 82 { ModeTagStruct modeTags[] = 2; } - readonly attribute char_string<64> description = 0; - readonly attribute ModeOptionStruct supportedModes[] = 2; - readonly attribute int8u currentMode = 3; - attribute optional nullable int8u startUpMode = 4; - attribute optional nullable int8u onMode = 5; + readonly attribute ModeOptionStruct supportedModes[] = 0; + readonly attribute int8u currentMode = 1; + attribute optional nullable int8u startUpMode = 2; + attribute optional nullable int8u onMode = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -2936,22 +2884,14 @@ client cluster RefrigeratorAndTemperatureControlledCabinetModeSelect = 82 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { + response struct ChangeToModeResponse = 1 { ENUM8 status = 0; optional CHAR_STRING statusText = 1; } - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ - command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. + /** This command is used to change device modes. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; + command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } /** This cluster supports remotely monitoring and controling the different typs of functionality available to a washing device, such as a washing machine. */ @@ -2973,8 +2913,8 @@ client cluster WasherControls = 83 { readonly attribute int16u clusterRevision = 65533; } -/** 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 RvcRunModeSelect = 84 { +/** Attributes and commands for selecting a mode from a list of supported options. */ +client cluster RvcRunMode = 84 { enum ModeTag : ENUM16 { kIdle = 16384; kCleaning = 16385; @@ -2993,13 +2933,11 @@ client cluster RvcRunModeSelect = 84 { bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -3008,11 +2946,10 @@ client cluster RvcRunModeSelect = 84 { ModeTagStruct modeTags[] = 2; } - readonly attribute char_string<64> description = 0; - readonly attribute ModeOptionStruct supportedModes[] = 2; - readonly attribute int8u currentMode = 3; - attribute optional nullable int8u startUpMode = 4; - attribute optional nullable int8u onMode = 5; + readonly attribute ModeOptionStruct supportedModes[] = 0; + readonly attribute int8u currentMode = 1; + attribute optional nullable int8u startUpMode = 2; + attribute optional nullable int8u onMode = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -3024,27 +2961,18 @@ client cluster RvcRunModeSelect = 84 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { + response struct ChangeToModeResponse = 1 { ENUM8 status = 0; optional CHAR_STRING statusText = 1; } - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ - command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. + /** This command is used to change device modes. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; + command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } -/** 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 RvcCleanModeSelect = 85 { +/** Attributes and commands for selecting a mode from a list of supported options. */ +client cluster RvcCleanMode = 85 { enum ModeTag : ENUM16 { kDeepClean = 16384; kVacuum = 16385; @@ -3057,13 +2985,11 @@ client cluster RvcCleanModeSelect = 85 { bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -3072,11 +2998,10 @@ client cluster RvcCleanModeSelect = 85 { ModeTagStruct modeTags[] = 2; } - readonly attribute char_string<64> description = 0; - readonly attribute ModeOptionStruct supportedModes[] = 2; - readonly attribute int8u currentMode = 3; - attribute optional nullable int8u startUpMode = 4; - attribute optional nullable int8u onMode = 5; + readonly attribute ModeOptionStruct supportedModes[] = 0; + readonly attribute int8u currentMode = 1; + attribute optional nullable int8u startUpMode = 2; + attribute optional nullable int8u onMode = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -3088,22 +3013,14 @@ client cluster RvcCleanModeSelect = 85 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { + response struct ChangeToModeResponse = 1 { ENUM8 status = 0; optional CHAR_STRING statusText = 1; } - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ - command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. + /** This command is used to change device modes. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; + command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } /** Attributes and commands for configuring the temperature control, and reporting temperature. */ @@ -3159,9 +3076,8 @@ client cluster RefrigeratorAlarm = 87 { readonly attribute int16u clusterRevision = 65533; } -/** This cluster is an alias of the Mode Select cluster, defining additional semantics and - namespaced enumerated values for dishwasher devices. */ -client cluster DishwasherModeSelect = 89 { +/** Attributes and commands for selecting a mode from a list of supported options. */ +client cluster DishwasherMode = 89 { enum ModeTag : ENUM16 { kNormal = 16384; kHeavy = 16385; @@ -3170,13 +3086,11 @@ client cluster DishwasherModeSelect = 89 { bitmap Feature : BITMAP32 { kOnOff = 0x1; - kExtendedStatus = 0x2; } struct ModeTagStruct { optional vendor_id mfgCode = 0; enum16 value = 1; - optional char_string<64> tagName = 2; } struct ModeOptionStruct { @@ -3185,11 +3099,10 @@ client cluster DishwasherModeSelect = 89 { ModeTagStruct modeTags[] = 2; } - readonly attribute char_string<64> description = 0; - readonly attribute ModeOptionStruct supportedModes[] = 2; - readonly attribute int8u currentMode = 3; - attribute optional nullable int8u startUpMode = 4; - attribute optional nullable int8u onMode = 5; + readonly attribute ModeOptionStruct supportedModes[] = 0; + readonly attribute int8u currentMode = 1; + attribute optional nullable int8u startUpMode = 2; + attribute optional nullable int8u onMode = 3; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute event_id eventList[] = 65530; @@ -3201,22 +3114,14 @@ client cluster DishwasherModeSelect = 89 { INT8U newMode = 0; } - request struct ChangeToModeWithStatusRequest { - INT8U newMode = 0; - } - - response struct ChangeToModeResponse = 2 { + response struct ChangeToModeResponse = 1 { ENUM8 status = 0; optional CHAR_STRING statusText = 1; } - /** If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an INVALID_COMMAND status response. - If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device is unable to transition as requested, the server SHALL respond with a FAILURE status response. - If the NewMode field matches the 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. */ - command ChangeToMode(ChangeToModeRequest): DefaultSuccess = 0; - /** This command is used to change device modes using the same mechanism and semantics as ChangeToMode, and additionally obtaining a 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. + /** This command is used to change device modes. On receipt of this command the device SHALL respond with a ChangeToModeResponse command. */ - command ChangeToModeWithStatus(ChangeToModeWithStatusRequest): ChangeToModeResponse = 1; + command ChangeToMode(ChangeToModeRequest): ChangeToModeResponse = 0; } /** Attributes for reporting air quality classification */ diff --git a/src/controller/data_model/controller-clusters.zap b/src/controller/data_model/controller-clusters.zap index 9c13134213893e..4f78819037b7ef 100644 --- a/src/controller/data_model/controller-clusters.zap +++ b/src/controller/data_model/controller-clusters.zap @@ -10466,14 +10466,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "ChangeToModeWithStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -10487,7 +10479,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10503,7 +10495,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "1", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10518,16 +10510,6 @@ "define": "MODE_SELECT_CLUSTER", "side": "server", "enabled": 0, - "commands": [ - { - "name": "ChangeToModeResponse", - "code": 2, - "mfgCode": null, - "source": "server", - "incoming": 1, - "outgoing": 0 - } - ], "attributes": [ { "name": "Description", @@ -10552,7 +10534,7 @@ "side": "server", "type": "enum16", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10568,10 +10550,10 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10599,7 +10581,7 @@ "mfgCode": null, "side": "server", "type": "int8u", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, @@ -10615,11 +10597,11 @@ "mfgCode": null, "side": "server", "type": "int8u", - "included": 1, + "included": 0, "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "0", + "defaultValue": "", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10632,7 +10614,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10648,7 +10630,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10664,7 +10646,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10680,7 +10662,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10724,10 +10706,10 @@ ] }, { - "name": "Laundry Washer Mode Select", + "name": "Laundry Washer Mode", "code": 81, "mfgCode": null, - "define": "LAUNDRY_WASHER_MODE_SELECT_CLUSTER", + "define": "LAUNDRY_WASHER_MODE_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -10738,14 +10720,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "ChangeToModeWithStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -10759,7 +10733,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10775,7 +10749,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10784,16 +10758,16 @@ ] }, { - "name": "Laundry Washer Mode Select", + "name": "Laundry Washer Mode", "code": 81, "mfgCode": null, - "define": "LAUNDRY_WASHER_MODE_SELECT_CLUSTER", + "define": "LAUNDRY_WASHER_MODE_CLUSTER", "side": "server", "enabled": 0, "commands": [ { "name": "ChangeToModeResponse", - "code": 2, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -10819,12 +10793,12 @@ }, { "name": "SupportedModes", - "code": 2, + "code": 1, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10835,7 +10809,7 @@ }, { "name": "CurrentMode", - "code": 3, + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", @@ -10851,7 +10825,7 @@ }, { "name": "StartUpMode", - "code": 4, + "code": 3, "mfgCode": null, "side": "server", "type": "int8u", @@ -10867,7 +10841,7 @@ }, { "name": "OnMode", - "code": 5, + "code": 4, "mfgCode": null, "side": "server", "type": "int8u", @@ -10888,7 +10862,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10904,7 +10878,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10920,7 +10894,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10936,7 +10910,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -10971,7 +10945,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -10980,10 +10954,10 @@ ] }, { - "name": "Refrigerator And Temperature Controlled Cabinet Mode Select", + "name": "Refrigerator And Temperature Controlled Cabinet Mode", "code": 82, "mfgCode": null, - "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER", + "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -10994,14 +10968,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "ChangeToModeWithStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -11015,7 +10981,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11031,7 +10997,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11040,16 +11006,16 @@ ] }, { - "name": "Refrigerator And Temperature Controlled Cabinet Mode Select", + "name": "Refrigerator And Temperature Controlled Cabinet Mode", "code": 82, "mfgCode": null, - "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER", + "define": "REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER", "side": "server", "enabled": 0, "commands": [ { "name": "ChangeToModeResponse", - "code": 2, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -11075,12 +11041,12 @@ }, { "name": "SupportedModes", - "code": 2, + "code": 1, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11091,7 +11057,7 @@ }, { "name": "CurrentMode", - "code": 3, + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", @@ -11107,7 +11073,7 @@ }, { "name": "StartUpMode", - "code": 4, + "code": 3, "mfgCode": null, "side": "server", "type": "int8u", @@ -11123,7 +11089,7 @@ }, { "name": "OnMode", - "code": 5, + "code": 4, "mfgCode": null, "side": "server", "type": "int8u", @@ -11144,7 +11110,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11160,7 +11126,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11176,7 +11142,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11192,7 +11158,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11227,7 +11193,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11448,10 +11414,10 @@ ] }, { - "name": "RVC Run Mode Select", + "name": "RVC Run Mode", "code": 84, "mfgCode": null, - "define": "RVC_RUN_MODE_SELECT_CLUSTER", + "define": "RVC_RUN_MODE_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -11462,14 +11428,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "ChangeToModeWithStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -11483,7 +11441,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11499,7 +11457,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11508,16 +11466,16 @@ ] }, { - "name": "RVC Run Mode Select", + "name": "RVC Run Mode", "code": 84, "mfgCode": null, - "define": "RVC_RUN_MODE_SELECT_CLUSTER", + "define": "RVC_RUN_MODE_CLUSTER", "side": "server", "enabled": 0, "commands": [ { "name": "ChangeToModeResponse", - "code": 2, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -11543,12 +11501,12 @@ }, { "name": "SupportedModes", - "code": 2, + "code": 1, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11559,7 +11517,7 @@ }, { "name": "CurrentMode", - "code": 3, + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", @@ -11575,7 +11533,7 @@ }, { "name": "StartUpMode", - "code": 4, + "code": 3, "mfgCode": null, "side": "server", "type": "int8u", @@ -11591,7 +11549,7 @@ }, { "name": "OnMode", - "code": 5, + "code": 4, "mfgCode": null, "side": "server", "type": "int8u", @@ -11612,7 +11570,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11628,7 +11586,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11644,7 +11602,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11660,7 +11618,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11695,7 +11653,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11704,10 +11662,10 @@ ] }, { - "name": "RVC Clean Mode Select", + "name": "RVC Clean Mode", "code": 85, "mfgCode": null, - "define": "RVC_CLEAN_MODE_SELECT_CLUSTER", + "define": "RVC_CLEAN_MODE_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -11718,14 +11676,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "ChangeToModeWithStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -11739,7 +11689,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11755,7 +11705,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -11764,16 +11714,16 @@ ] }, { - "name": "RVC Clean Mode Select", + "name": "RVC Clean Mode", "code": 85, "mfgCode": null, - "define": "RVC_CLEAN_MODE_SELECT_CLUSTER", + "define": "RVC_CLEAN_MODE_CLUSTER", "side": "server", "enabled": 0, "commands": [ { "name": "ChangeToModeResponse", - "code": 2, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -11799,12 +11749,12 @@ }, { "name": "SupportedModes", - "code": 2, + "code": 1, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11815,7 +11765,7 @@ }, { "name": "CurrentMode", - "code": 3, + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", @@ -11831,7 +11781,7 @@ }, { "name": "StartUpMode", - "code": 4, + "code": 3, "mfgCode": null, "side": "server", "type": "int8u", @@ -11847,7 +11797,7 @@ }, { "name": "OnMode", - "code": 5, + "code": 4, "mfgCode": null, "side": "server", "type": "int8u", @@ -11868,7 +11818,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11884,7 +11834,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11900,7 +11850,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11916,7 +11866,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -11951,7 +11901,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -12140,10 +12090,10 @@ ] }, { - "name": "Dishwasher Mode Select", + "name": "Dishwasher Mode", "code": 89, "mfgCode": null, - "define": "DISHWASHER_MODE_SELECT_CLUSTER", + "define": "DISHWASHER_MODE_CLUSTER", "side": "client", "enabled": 1, "commands": [ @@ -12154,14 +12104,6 @@ "source": "client", "incoming": 0, "outgoing": 1 - }, - { - "name": "ChangeToModeWithStatus", - "code": 1, - "mfgCode": null, - "source": "client", - "incoming": 0, - "outgoing": 1 } ], "attributes": [ @@ -12175,7 +12117,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "2", + "defaultValue": "0", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -12191,7 +12133,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, @@ -12200,16 +12142,16 @@ ] }, { - "name": "Dishwasher Mode Select", + "name": "Dishwasher Mode", "code": 89, "mfgCode": null, - "define": "DISHWASHER_MODE_SELECT_CLUSTER", + "define": "DISHWASHER_MODE_CLUSTER", "side": "server", "enabled": 0, "commands": [ { "name": "ChangeToModeResponse", - "code": 2, + "code": 1, "mfgCode": null, "source": "server", "incoming": 1, @@ -12235,12 +12177,12 @@ }, { "name": "SupportedModes", - "code": 2, + "code": 1, "mfgCode": null, "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -12251,7 +12193,7 @@ }, { "name": "CurrentMode", - "code": 3, + "code": 2, "mfgCode": null, "side": "server", "type": "int8u", @@ -12267,7 +12209,7 @@ }, { "name": "StartUpMode", - "code": 4, + "code": 3, "mfgCode": null, "side": "server", "type": "int8u", @@ -12283,7 +12225,7 @@ }, { "name": "OnMode", - "code": 5, + "code": 4, "mfgCode": null, "side": "server", "type": "int8u", @@ -12304,7 +12246,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -12320,7 +12262,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -12336,7 +12278,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -12352,7 +12294,7 @@ "side": "server", "type": "array", "included": 1, - "storageOption": "External", + "storageOption": "RAM", "singleton": 0, "bounded": 0, "defaultValue": "", @@ -12387,7 +12329,7 @@ "storageOption": "RAM", "singleton": 0, "bounded": 0, - "defaultValue": "1", + "defaultValue": "2", "reportable": 1, "minInterval": 1, "maxInterval": 65534, diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java index aca7a3f14c1079..3cd260b9e1aaf9 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java @@ -154,20 +154,20 @@ public static BaseCluster getCluster(long clusterId) { if (clusterId == ModeSelect.ID) { return new ModeSelect(); } - if (clusterId == LaundryWasherModeSelect.ID) { - return new LaundryWasherModeSelect(); + if (clusterId == LaundryWasherMode.ID) { + return new LaundryWasherMode(); } - if (clusterId == RefrigeratorAndTemperatureControlledCabinetModeSelect.ID) { - return new RefrigeratorAndTemperatureControlledCabinetModeSelect(); + if (clusterId == RefrigeratorAndTemperatureControlledCabinetMode.ID) { + return new RefrigeratorAndTemperatureControlledCabinetMode(); } if (clusterId == WasherControls.ID) { return new WasherControls(); } - if (clusterId == RvcRunModeSelect.ID) { - return new RvcRunModeSelect(); + if (clusterId == RvcRunMode.ID) { + return new RvcRunMode(); } - if (clusterId == RvcCleanModeSelect.ID) { - return new RvcCleanModeSelect(); + if (clusterId == RvcCleanMode.ID) { + return new RvcCleanMode(); } if (clusterId == TemperatureControl.ID) { return new TemperatureControl(); @@ -175,8 +175,8 @@ public static BaseCluster getCluster(long clusterId) { if (clusterId == RefrigeratorAlarm.ID) { return new RefrigeratorAlarm(); } - if (clusterId == DishwasherModeSelect.ID) { - return new DishwasherModeSelect(); + if (clusterId == DishwasherMode.ID) { + return new DishwasherMode(); } if (clusterId == AirQuality.ID) { return new AirQuality(); @@ -6253,8 +6253,7 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - ChangeToMode(0L), - ChangeToModeWithStatus(1L),; + ChangeToMode(0L),; private final long id; Command(long id) { this.id = id; @@ -6289,23 +6288,6 @@ public static ChangeToModeCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum ChangeToModeWithStatusCommandField {NewMode(0),; - private final int id; - ChangeToModeWithStatusCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static ChangeToModeWithStatusCommandField value(int id) throws NoSuchFieldError { - for (ChangeToModeWithStatusCommandField field : ChangeToModeWithStatusCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); @@ -6336,18 +6318,17 @@ public long getCommandID(String name) throws IllegalArgumentException { return Command.valueOf(name).getID(); } } - public static class LaundryWasherModeSelect implements BaseCluster { + public static class LaundryWasherMode implements BaseCluster { public static final long ID = 81L; public long getID() { return ID; } public enum Attribute { - Description(0L), - SupportedModes(2L), - CurrentMode(3L), - StartUpMode(4L), - OnMode(5L), + SupportedModes(0L), + CurrentMode(1L), + StartUpMode(2L), + OnMode(3L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), @@ -6394,8 +6375,7 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - ChangeToMode(0L), - ChangeToModeWithStatus(1L),; + ChangeToMode(0L),; private final long id; Command(long id) { this.id = id; @@ -6430,23 +6410,6 @@ public static ChangeToModeCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum ChangeToModeWithStatusCommandField {NewMode(0),; - private final int id; - ChangeToModeWithStatusCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static ChangeToModeWithStatusCommandField value(int id) throws NoSuchFieldError { - for (ChangeToModeWithStatusCommandField field : ChangeToModeWithStatusCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); @@ -6477,18 +6440,17 @@ public long getCommandID(String name) throws IllegalArgumentException { return Command.valueOf(name).getID(); } } - public static class RefrigeratorAndTemperatureControlledCabinetModeSelect implements BaseCluster { + public static class RefrigeratorAndTemperatureControlledCabinetMode implements BaseCluster { public static final long ID = 82L; public long getID() { return ID; } public enum Attribute { - Description(0L), - SupportedModes(2L), - CurrentMode(3L), - StartUpMode(4L), - OnMode(5L), + SupportedModes(0L), + CurrentMode(1L), + StartUpMode(2L), + OnMode(3L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), @@ -6535,8 +6497,7 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - ChangeToMode(0L), - ChangeToModeWithStatus(1L),; + ChangeToMode(0L),; private final long id; Command(long id) { this.id = id; @@ -6571,23 +6532,6 @@ public static ChangeToModeCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum ChangeToModeWithStatusCommandField {NewMode(0),; - private final int id; - ChangeToModeWithStatusCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static ChangeToModeWithStatusCommandField value(int id) throws NoSuchFieldError { - for (ChangeToModeWithStatusCommandField field : ChangeToModeWithStatusCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); @@ -6722,18 +6666,17 @@ public long getCommandID(String name) throws IllegalArgumentException { return Command.valueOf(name).getID(); } } - public static class RvcRunModeSelect implements BaseCluster { + public static class RvcRunMode implements BaseCluster { public static final long ID = 84L; public long getID() { return ID; } public enum Attribute { - Description(0L), - SupportedModes(2L), - CurrentMode(3L), - StartUpMode(4L), - OnMode(5L), + SupportedModes(0L), + CurrentMode(1L), + StartUpMode(2L), + OnMode(3L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), @@ -6780,8 +6723,7 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - ChangeToMode(0L), - ChangeToModeWithStatus(1L),; + ChangeToMode(0L),; private final long id; Command(long id) { this.id = id; @@ -6816,23 +6758,6 @@ public static ChangeToModeCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum ChangeToModeWithStatusCommandField {NewMode(0),; - private final int id; - ChangeToModeWithStatusCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static ChangeToModeWithStatusCommandField value(int id) throws NoSuchFieldError { - for (ChangeToModeWithStatusCommandField field : ChangeToModeWithStatusCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); @@ -6863,18 +6788,17 @@ public long getCommandID(String name) throws IllegalArgumentException { return Command.valueOf(name).getID(); } } - public static class RvcCleanModeSelect implements BaseCluster { + public static class RvcCleanMode implements BaseCluster { public static final long ID = 85L; public long getID() { return ID; } public enum Attribute { - Description(0L), - SupportedModes(2L), - CurrentMode(3L), - StartUpMode(4L), - OnMode(5L), + SupportedModes(0L), + CurrentMode(1L), + StartUpMode(2L), + OnMode(3L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), @@ -6921,8 +6845,7 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - ChangeToMode(0L), - ChangeToModeWithStatus(1L),; + ChangeToMode(0L),; private final long id; Command(long id) { this.id = id; @@ -6957,23 +6880,6 @@ public static ChangeToModeCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum ChangeToModeWithStatusCommandField {NewMode(0),; - private final int id; - ChangeToModeWithStatusCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static ChangeToModeWithStatusCommandField value(int id) throws NoSuchFieldError { - for (ChangeToModeWithStatusCommandField field : ChangeToModeWithStatusCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); @@ -7231,18 +7137,17 @@ public long getCommandID(String name) throws IllegalArgumentException { return Command.valueOf(name).getID(); } } - public static class DishwasherModeSelect implements BaseCluster { + public static class DishwasherMode implements BaseCluster { public static final long ID = 89L; public long getID() { return ID; } public enum Attribute { - Description(0L), - SupportedModes(2L), - CurrentMode(3L), - StartUpMode(4L), - OnMode(5L), + SupportedModes(0L), + CurrentMode(1L), + StartUpMode(2L), + OnMode(3L), GeneratedCommandList(65528L), AcceptedCommandList(65529L), EventList(65530L), @@ -7289,8 +7194,7 @@ public static Event value(long id) throws NoSuchFieldError { } public enum Command { - ChangeToMode(0L), - ChangeToModeWithStatus(1L),; + ChangeToMode(0L),; private final long id; Command(long id) { this.id = id; @@ -7325,23 +7229,6 @@ public static ChangeToModeCommandField value(int id) throws NoSuchFieldError { } throw new NoSuchFieldError(); } - }public enum ChangeToModeWithStatusCommandField {NewMode(0),; - private final int id; - ChangeToModeWithStatusCommandField(int id) { - this.id = id; - } - - public int getID() { - return id; - } - public static ChangeToModeWithStatusCommandField value(int id) throws NoSuchFieldError { - for (ChangeToModeWithStatusCommandField field : ChangeToModeWithStatusCommandField.values()) { - if (field.getID() == id) { - return field; - } - } - throw new NoSuchFieldError(); - } }@Override public String getAttributeName(long id) throws NoSuchFieldError { return Attribute.value(id).toString(); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java index 71d3eded1bdba3..3faa2661db449f 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java @@ -6056,253 +6056,231 @@ private static Map readModeSelectInteractionInfo() { return result; } - private static Map readLaundryWasherModeSelectInteractionInfo() { - Map result = new LinkedHashMap<>();Map readLaundryWasherModeSelectDescriptionCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectDescriptionAttributeInteractionInfo = new InteractionInfo( + private static Map readLaundryWasherModeInteractionInfo() { + Map result = new LinkedHashMap<>();Map readLaundryWasherModeSupportedModesCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeSupportedModesAttributeInteractionInfo = 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 + ((ChipClusters.LaundryWasherModeCluster) cluster).readSupportedModesAttribute( + (ChipClusters.LaundryWasherModeCluster.SupportedModesAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterSupportedModesAttributeCallback(), - readLaundryWasherModeSelectSupportedModesCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterSupportedModesAttributeCallback(), + readLaundryWasherModeSupportedModesCommandParams ); - result.put("readSupportedModesAttribute", readLaundryWasherModeSelectSupportedModesAttributeInteractionInfo); - Map readLaundryWasherModeSelectCurrentModeCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectCurrentModeAttributeInteractionInfo = new InteractionInfo( + result.put("readSupportedModesAttribute", readLaundryWasherModeSupportedModesAttributeInteractionInfo); + Map readLaundryWasherModeCurrentModeCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeCurrentModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readCurrentModeAttribute( + ((ChipClusters.LaundryWasherModeCluster) cluster).readCurrentModeAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readLaundryWasherModeSelectCurrentModeCommandParams + readLaundryWasherModeCurrentModeCommandParams ); - result.put("readCurrentModeAttribute", readLaundryWasherModeSelectCurrentModeAttributeInteractionInfo); - Map readLaundryWasherModeSelectStartUpModeCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + result.put("readCurrentModeAttribute", readLaundryWasherModeCurrentModeAttributeInteractionInfo); + Map readLaundryWasherModeStartUpModeCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readStartUpModeAttribute( - (ChipClusters.LaundryWasherModeSelectCluster.StartUpModeAttributeCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster).readStartUpModeAttribute( + (ChipClusters.LaundryWasherModeCluster.StartUpModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterStartUpModeAttributeCallback(), - readLaundryWasherModeSelectStartUpModeCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback(), + readLaundryWasherModeStartUpModeCommandParams ); - result.put("readStartUpModeAttribute", readLaundryWasherModeSelectStartUpModeAttributeInteractionInfo); - Map readLaundryWasherModeSelectOnModeCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + result.put("readStartUpModeAttribute", readLaundryWasherModeStartUpModeAttributeInteractionInfo); + Map readLaundryWasherModeOnModeCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readOnModeAttribute( - (ChipClusters.LaundryWasherModeSelectCluster.OnModeAttributeCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster).readOnModeAttribute( + (ChipClusters.LaundryWasherModeCluster.OnModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterOnModeAttributeCallback(), - readLaundryWasherModeSelectOnModeCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterOnModeAttributeCallback(), + readLaundryWasherModeOnModeCommandParams ); - result.put("readOnModeAttribute", readLaundryWasherModeSelectOnModeAttributeInteractionInfo); - Map readLaundryWasherModeSelectGeneratedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readOnModeAttribute", readLaundryWasherModeOnModeAttributeInteractionInfo); + Map readLaundryWasherModeGeneratedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readGeneratedCommandListAttribute( - (ChipClusters.LaundryWasherModeSelectCluster.GeneratedCommandListAttributeCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster).readGeneratedCommandListAttribute( + (ChipClusters.LaundryWasherModeCluster.GeneratedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterGeneratedCommandListAttributeCallback(), - readLaundryWasherModeSelectGeneratedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback(), + readLaundryWasherModeGeneratedCommandListCommandParams ); - result.put("readGeneratedCommandListAttribute", readLaundryWasherModeSelectGeneratedCommandListAttributeInteractionInfo); - Map readLaundryWasherModeSelectAcceptedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readGeneratedCommandListAttribute", readLaundryWasherModeGeneratedCommandListAttributeInteractionInfo); + Map readLaundryWasherModeAcceptedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readAcceptedCommandListAttribute( - (ChipClusters.LaundryWasherModeSelectCluster.AcceptedCommandListAttributeCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster).readAcceptedCommandListAttribute( + (ChipClusters.LaundryWasherModeCluster.AcceptedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterAcceptedCommandListAttributeCallback(), - readLaundryWasherModeSelectAcceptedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback(), + readLaundryWasherModeAcceptedCommandListCommandParams ); - result.put("readAcceptedCommandListAttribute", readLaundryWasherModeSelectAcceptedCommandListAttributeInteractionInfo); - Map readLaundryWasherModeSelectEventListCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectEventListAttributeInteractionInfo = new InteractionInfo( + result.put("readAcceptedCommandListAttribute", readLaundryWasherModeAcceptedCommandListAttributeInteractionInfo); + Map readLaundryWasherModeEventListCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeEventListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readEventListAttribute( - (ChipClusters.LaundryWasherModeSelectCluster.EventListAttributeCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster).readEventListAttribute( + (ChipClusters.LaundryWasherModeCluster.EventListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterEventListAttributeCallback(), - readLaundryWasherModeSelectEventListCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterEventListAttributeCallback(), + readLaundryWasherModeEventListCommandParams ); - result.put("readEventListAttribute", readLaundryWasherModeSelectEventListAttributeInteractionInfo); - Map readLaundryWasherModeSelectAttributeListCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectAttributeListAttributeInteractionInfo = new InteractionInfo( + result.put("readEventListAttribute", readLaundryWasherModeEventListAttributeInteractionInfo); + Map readLaundryWasherModeAttributeListCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeAttributeListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readAttributeListAttribute( - (ChipClusters.LaundryWasherModeSelectCluster.AttributeListAttributeCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster).readAttributeListAttribute( + (ChipClusters.LaundryWasherModeCluster.AttributeListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedLaundryWasherModeSelectClusterAttributeListAttributeCallback(), - readLaundryWasherModeSelectAttributeListCommandParams + () -> new ClusterInfoMapping.DelegatedLaundryWasherModeClusterAttributeListAttributeCallback(), + readLaundryWasherModeAttributeListCommandParams ); - result.put("readAttributeListAttribute", readLaundryWasherModeSelectAttributeListAttributeInteractionInfo); - Map readLaundryWasherModeSelectFeatureMapCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectFeatureMapAttributeInteractionInfo = new InteractionInfo( + result.put("readAttributeListAttribute", readLaundryWasherModeAttributeListAttributeInteractionInfo); + Map readLaundryWasherModeFeatureMapCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeFeatureMapAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readFeatureMapAttribute( + ((ChipClusters.LaundryWasherModeCluster) cluster).readFeatureMapAttribute( (ChipClusters.LongAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readLaundryWasherModeSelectFeatureMapCommandParams + readLaundryWasherModeFeatureMapCommandParams ); - result.put("readFeatureMapAttribute", readLaundryWasherModeSelectFeatureMapAttributeInteractionInfo); - Map readLaundryWasherModeSelectClusterRevisionCommandParams = new LinkedHashMap(); - InteractionInfo readLaundryWasherModeSelectClusterRevisionAttributeInteractionInfo = new InteractionInfo( + result.put("readFeatureMapAttribute", readLaundryWasherModeFeatureMapAttributeInteractionInfo); + Map readLaundryWasherModeClusterRevisionCommandParams = new LinkedHashMap(); + InteractionInfo readLaundryWasherModeClusterRevisionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).readClusterRevisionAttribute( + ((ChipClusters.LaundryWasherModeCluster) cluster).readClusterRevisionAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readLaundryWasherModeSelectClusterRevisionCommandParams + readLaundryWasherModeClusterRevisionCommandParams ); - result.put("readClusterRevisionAttribute", readLaundryWasherModeSelectClusterRevisionAttributeInteractionInfo); + result.put("readClusterRevisionAttribute", readLaundryWasherModeClusterRevisionAttributeInteractionInfo); return result; } - private static Map readRefrigeratorAndTemperatureControlledCabinetModeSelectInteractionInfo() { - Map result = new LinkedHashMap<>();Map readRefrigeratorAndTemperatureControlledCabinetModeSelectDescriptionCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectDescriptionAttributeInteractionInfo = new InteractionInfo( + private static Map readRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo() { + Map result = new LinkedHashMap<>();Map readRefrigeratorAndTemperatureControlledCabinetModeSupportedModesCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readDescriptionAttribute( - (ChipClusters.CharStringAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readSupportedModesAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectDescriptionCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeSupportedModesCommandParams ); - result.put("readDescriptionAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectDescriptionAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeInteractionInfo = new InteractionInfo( + result.put("readSupportedModesAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeCurrentModeCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeCurrentModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readSupportedModesAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.SupportedModesAttributeCallback) callback - ); - }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSupportedModesAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesCommandParams - ); - result.put("readSupportedModesAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentModeCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentModeAttributeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readCurrentModeAttribute( + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readCurrentModeAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentModeCommandParams + readRefrigeratorAndTemperatureControlledCabinetModeCurrentModeCommandParams ); - result.put("readCurrentModeAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectCurrentModeAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + result.put("readCurrentModeAttribute", readRefrigeratorAndTemperatureControlledCabinetModeCurrentModeAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeStartUpModeCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readStartUpModeAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.StartUpModeAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readStartUpModeAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterStartUpModeAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeStartUpModeCommandParams ); - result.put("readStartUpModeAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + result.put("readStartUpModeAttribute", readRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeOnModeCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readOnModeAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.OnModeAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readOnModeAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterOnModeAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeOnModeCommandParams ); - result.put("readOnModeAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readOnModeAttribute", readRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readGeneratedCommandListAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.GeneratedCommandListAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readGeneratedCommandListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterGeneratedCommandListAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListCommandParams ); - result.put("readGeneratedCommandListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readGeneratedCommandListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readAcceptedCommandListAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.AcceptedCommandListAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readAcceptedCommandListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AcceptedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAcceptedCommandListAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListCommandParams ); - result.put("readAcceptedCommandListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectEventListCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeInteractionInfo = new InteractionInfo( + result.put("readAcceptedCommandListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeEventListCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readEventListAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.EventListAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readEventListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.EventListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterEventListAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectEventListCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeEventListCommandParams ); - result.put("readEventListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeInteractionInfo = new InteractionInfo( + result.put("readEventListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeAttributeListCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readAttributeListAttribute( - (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.AttributeListAttributeCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readAttributeListAttribute( + (ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AttributeListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAttributeListAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListCommandParams + () -> new ClusterInfoMapping.DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback(), + readRefrigeratorAndTemperatureControlledCabinetModeAttributeListCommandParams ); - result.put("readAttributeListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMapCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMapAttributeInteractionInfo = new InteractionInfo( + result.put("readAttributeListAttribute", readRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeFeatureMapCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeFeatureMapAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readFeatureMapAttribute( + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readFeatureMapAttribute( (ChipClusters.LongAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMapCommandParams + readRefrigeratorAndTemperatureControlledCabinetModeFeatureMapCommandParams ); - result.put("readFeatureMapAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectFeatureMapAttributeInteractionInfo); - Map readRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevisionCommandParams = new LinkedHashMap(); - InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevisionAttributeInteractionInfo = new InteractionInfo( + result.put("readFeatureMapAttribute", readRefrigeratorAndTemperatureControlledCabinetModeFeatureMapAttributeInteractionInfo); + Map readRefrigeratorAndTemperatureControlledCabinetModeClusterRevisionCommandParams = new LinkedHashMap(); + InteractionInfo readRefrigeratorAndTemperatureControlledCabinetModeClusterRevisionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).readClusterRevisionAttribute( + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).readClusterRevisionAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevisionCommandParams + readRefrigeratorAndTemperatureControlledCabinetModeClusterRevisionCommandParams ); - result.put("readClusterRevisionAttribute", readRefrigeratorAndTemperatureControlledCabinetModeSelectClusterRevisionAttributeInteractionInfo); + result.put("readClusterRevisionAttribute", readRefrigeratorAndTemperatureControlledCabinetModeClusterRevisionAttributeInteractionInfo); return result; } @@ -6420,253 +6398,231 @@ private static Map readWasherControlsInteractionInfo() return result; } - private static Map readRvcRunModeSelectInteractionInfo() { - Map result = new LinkedHashMap<>();Map readRvcRunModeSelectDescriptionCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectDescriptionAttributeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readDescriptionAttribute( - (ChipClusters.CharStringAttributeCallback) callback - ); - }, - () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readRvcRunModeSelectDescriptionCommandParams - ); - result.put("readDescriptionAttribute", readRvcRunModeSelectDescriptionAttributeInteractionInfo); - Map readRvcRunModeSelectSupportedModesCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectSupportedModesAttributeInteractionInfo = new InteractionInfo( + private static Map readRvcRunModeInteractionInfo() { + Map result = new LinkedHashMap<>();Map readRvcRunModeSupportedModesCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeSupportedModesAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readSupportedModesAttribute( - (ChipClusters.RvcRunModeSelectCluster.SupportedModesAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readSupportedModesAttribute( + (ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterSupportedModesAttributeCallback(), - readRvcRunModeSelectSupportedModesCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterSupportedModesAttributeCallback(), + readRvcRunModeSupportedModesCommandParams ); - result.put("readSupportedModesAttribute", readRvcRunModeSelectSupportedModesAttributeInteractionInfo); - Map readRvcRunModeSelectCurrentModeCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectCurrentModeAttributeInteractionInfo = new InteractionInfo( + result.put("readSupportedModesAttribute", readRvcRunModeSupportedModesAttributeInteractionInfo); + Map readRvcRunModeCurrentModeCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeCurrentModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readCurrentModeAttribute( + ((ChipClusters.RvcRunModeCluster) cluster).readCurrentModeAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readRvcRunModeSelectCurrentModeCommandParams + readRvcRunModeCurrentModeCommandParams ); - result.put("readCurrentModeAttribute", readRvcRunModeSelectCurrentModeAttributeInteractionInfo); - Map readRvcRunModeSelectStartUpModeCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + result.put("readCurrentModeAttribute", readRvcRunModeCurrentModeAttributeInteractionInfo); + Map readRvcRunModeStartUpModeCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readStartUpModeAttribute( - (ChipClusters.RvcRunModeSelectCluster.StartUpModeAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readStartUpModeAttribute( + (ChipClusters.RvcRunModeCluster.StartUpModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterStartUpModeAttributeCallback(), - readRvcRunModeSelectStartUpModeCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterStartUpModeAttributeCallback(), + readRvcRunModeStartUpModeCommandParams ); - result.put("readStartUpModeAttribute", readRvcRunModeSelectStartUpModeAttributeInteractionInfo); - Map readRvcRunModeSelectOnModeCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + result.put("readStartUpModeAttribute", readRvcRunModeStartUpModeAttributeInteractionInfo); + Map readRvcRunModeOnModeCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readOnModeAttribute( - (ChipClusters.RvcRunModeSelectCluster.OnModeAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readOnModeAttribute( + (ChipClusters.RvcRunModeCluster.OnModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterOnModeAttributeCallback(), - readRvcRunModeSelectOnModeCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterOnModeAttributeCallback(), + readRvcRunModeOnModeCommandParams ); - result.put("readOnModeAttribute", readRvcRunModeSelectOnModeAttributeInteractionInfo); - Map readRvcRunModeSelectGeneratedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readOnModeAttribute", readRvcRunModeOnModeAttributeInteractionInfo); + Map readRvcRunModeGeneratedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readGeneratedCommandListAttribute( - (ChipClusters.RvcRunModeSelectCluster.GeneratedCommandListAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readGeneratedCommandListAttribute( + (ChipClusters.RvcRunModeCluster.GeneratedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterGeneratedCommandListAttributeCallback(), - readRvcRunModeSelectGeneratedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback(), + readRvcRunModeGeneratedCommandListCommandParams ); - result.put("readGeneratedCommandListAttribute", readRvcRunModeSelectGeneratedCommandListAttributeInteractionInfo); - Map readRvcRunModeSelectAcceptedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readGeneratedCommandListAttribute", readRvcRunModeGeneratedCommandListAttributeInteractionInfo); + Map readRvcRunModeAcceptedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readAcceptedCommandListAttribute( - (ChipClusters.RvcRunModeSelectCluster.AcceptedCommandListAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readAcceptedCommandListAttribute( + (ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterAcceptedCommandListAttributeCallback(), - readRvcRunModeSelectAcceptedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback(), + readRvcRunModeAcceptedCommandListCommandParams ); - result.put("readAcceptedCommandListAttribute", readRvcRunModeSelectAcceptedCommandListAttributeInteractionInfo); - Map readRvcRunModeSelectEventListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectEventListAttributeInteractionInfo = new InteractionInfo( + result.put("readAcceptedCommandListAttribute", readRvcRunModeAcceptedCommandListAttributeInteractionInfo); + Map readRvcRunModeEventListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeEventListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readEventListAttribute( - (ChipClusters.RvcRunModeSelectCluster.EventListAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readEventListAttribute( + (ChipClusters.RvcRunModeCluster.EventListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterEventListAttributeCallback(), - readRvcRunModeSelectEventListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterEventListAttributeCallback(), + readRvcRunModeEventListCommandParams ); - result.put("readEventListAttribute", readRvcRunModeSelectEventListAttributeInteractionInfo); - Map readRvcRunModeSelectAttributeListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectAttributeListAttributeInteractionInfo = new InteractionInfo( + result.put("readEventListAttribute", readRvcRunModeEventListAttributeInteractionInfo); + Map readRvcRunModeAttributeListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeAttributeListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readAttributeListAttribute( - (ChipClusters.RvcRunModeSelectCluster.AttributeListAttributeCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster).readAttributeListAttribute( + (ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcRunModeSelectClusterAttributeListAttributeCallback(), - readRvcRunModeSelectAttributeListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcRunModeClusterAttributeListAttributeCallback(), + readRvcRunModeAttributeListCommandParams ); - result.put("readAttributeListAttribute", readRvcRunModeSelectAttributeListAttributeInteractionInfo); - Map readRvcRunModeSelectFeatureMapCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectFeatureMapAttributeInteractionInfo = new InteractionInfo( + result.put("readAttributeListAttribute", readRvcRunModeAttributeListAttributeInteractionInfo); + Map readRvcRunModeFeatureMapCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeFeatureMapAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readFeatureMapAttribute( + ((ChipClusters.RvcRunModeCluster) cluster).readFeatureMapAttribute( (ChipClusters.LongAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readRvcRunModeSelectFeatureMapCommandParams + readRvcRunModeFeatureMapCommandParams ); - result.put("readFeatureMapAttribute", readRvcRunModeSelectFeatureMapAttributeInteractionInfo); - Map readRvcRunModeSelectClusterRevisionCommandParams = new LinkedHashMap(); - InteractionInfo readRvcRunModeSelectClusterRevisionAttributeInteractionInfo = new InteractionInfo( + result.put("readFeatureMapAttribute", readRvcRunModeFeatureMapAttributeInteractionInfo); + Map readRvcRunModeClusterRevisionCommandParams = new LinkedHashMap(); + InteractionInfo readRvcRunModeClusterRevisionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).readClusterRevisionAttribute( + ((ChipClusters.RvcRunModeCluster) cluster).readClusterRevisionAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readRvcRunModeSelectClusterRevisionCommandParams + readRvcRunModeClusterRevisionCommandParams ); - result.put("readClusterRevisionAttribute", readRvcRunModeSelectClusterRevisionAttributeInteractionInfo); + result.put("readClusterRevisionAttribute", readRvcRunModeClusterRevisionAttributeInteractionInfo); return result; } - private static Map readRvcCleanModeSelectInteractionInfo() { - Map result = new LinkedHashMap<>();Map readRvcCleanModeSelectDescriptionCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectDescriptionAttributeInteractionInfo = new InteractionInfo( + private static Map readRvcCleanModeInteractionInfo() { + Map result = new LinkedHashMap<>();Map readRvcCleanModeSupportedModesCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeSupportedModesAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readDescriptionAttribute( - (ChipClusters.CharStringAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readSupportedModesAttribute( + (ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedCharStringAttributeCallback(), - readRvcCleanModeSelectDescriptionCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterSupportedModesAttributeCallback(), + readRvcCleanModeSupportedModesCommandParams ); - result.put("readDescriptionAttribute", readRvcCleanModeSelectDescriptionAttributeInteractionInfo); - Map readRvcCleanModeSelectSupportedModesCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectSupportedModesAttributeInteractionInfo = new InteractionInfo( + result.put("readSupportedModesAttribute", readRvcCleanModeSupportedModesAttributeInteractionInfo); + Map readRvcCleanModeCurrentModeCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeCurrentModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readSupportedModesAttribute( - (ChipClusters.RvcCleanModeSelectCluster.SupportedModesAttributeCallback) callback - ); - }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterSupportedModesAttributeCallback(), - readRvcCleanModeSelectSupportedModesCommandParams - ); - result.put("readSupportedModesAttribute", readRvcCleanModeSelectSupportedModesAttributeInteractionInfo); - Map readRvcCleanModeSelectCurrentModeCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectCurrentModeAttributeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readCurrentModeAttribute( + ((ChipClusters.RvcCleanModeCluster) cluster).readCurrentModeAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readRvcCleanModeSelectCurrentModeCommandParams + readRvcCleanModeCurrentModeCommandParams ); - result.put("readCurrentModeAttribute", readRvcCleanModeSelectCurrentModeAttributeInteractionInfo); - Map readRvcCleanModeSelectStartUpModeCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + result.put("readCurrentModeAttribute", readRvcCleanModeCurrentModeAttributeInteractionInfo); + Map readRvcCleanModeStartUpModeCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readStartUpModeAttribute( - (ChipClusters.RvcCleanModeSelectCluster.StartUpModeAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readStartUpModeAttribute( + (ChipClusters.RvcCleanModeCluster.StartUpModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterStartUpModeAttributeCallback(), - readRvcCleanModeSelectStartUpModeCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterStartUpModeAttributeCallback(), + readRvcCleanModeStartUpModeCommandParams ); - result.put("readStartUpModeAttribute", readRvcCleanModeSelectStartUpModeAttributeInteractionInfo); - Map readRvcCleanModeSelectOnModeCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + result.put("readStartUpModeAttribute", readRvcCleanModeStartUpModeAttributeInteractionInfo); + Map readRvcCleanModeOnModeCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readOnModeAttribute( - (ChipClusters.RvcCleanModeSelectCluster.OnModeAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readOnModeAttribute( + (ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterOnModeAttributeCallback(), - readRvcCleanModeSelectOnModeCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterOnModeAttributeCallback(), + readRvcCleanModeOnModeCommandParams ); - result.put("readOnModeAttribute", readRvcCleanModeSelectOnModeAttributeInteractionInfo); - Map readRvcCleanModeSelectGeneratedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readOnModeAttribute", readRvcCleanModeOnModeAttributeInteractionInfo); + Map readRvcCleanModeGeneratedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readGeneratedCommandListAttribute( - (ChipClusters.RvcCleanModeSelectCluster.GeneratedCommandListAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readGeneratedCommandListAttribute( + (ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterGeneratedCommandListAttributeCallback(), - readRvcCleanModeSelectGeneratedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback(), + readRvcCleanModeGeneratedCommandListCommandParams ); - result.put("readGeneratedCommandListAttribute", readRvcCleanModeSelectGeneratedCommandListAttributeInteractionInfo); - Map readRvcCleanModeSelectAcceptedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readGeneratedCommandListAttribute", readRvcCleanModeGeneratedCommandListAttributeInteractionInfo); + Map readRvcCleanModeAcceptedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readAcceptedCommandListAttribute( - (ChipClusters.RvcCleanModeSelectCluster.AcceptedCommandListAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readAcceptedCommandListAttribute( + (ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterAcceptedCommandListAttributeCallback(), - readRvcCleanModeSelectAcceptedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback(), + readRvcCleanModeAcceptedCommandListCommandParams ); - result.put("readAcceptedCommandListAttribute", readRvcCleanModeSelectAcceptedCommandListAttributeInteractionInfo); - Map readRvcCleanModeSelectEventListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectEventListAttributeInteractionInfo = new InteractionInfo( + result.put("readAcceptedCommandListAttribute", readRvcCleanModeAcceptedCommandListAttributeInteractionInfo); + Map readRvcCleanModeEventListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeEventListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readEventListAttribute( - (ChipClusters.RvcCleanModeSelectCluster.EventListAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readEventListAttribute( + (ChipClusters.RvcCleanModeCluster.EventListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterEventListAttributeCallback(), - readRvcCleanModeSelectEventListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterEventListAttributeCallback(), + readRvcCleanModeEventListCommandParams ); - result.put("readEventListAttribute", readRvcCleanModeSelectEventListAttributeInteractionInfo); - Map readRvcCleanModeSelectAttributeListCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectAttributeListAttributeInteractionInfo = new InteractionInfo( + result.put("readEventListAttribute", readRvcCleanModeEventListAttributeInteractionInfo); + Map readRvcCleanModeAttributeListCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeAttributeListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readAttributeListAttribute( - (ChipClusters.RvcCleanModeSelectCluster.AttributeListAttributeCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster).readAttributeListAttribute( + (ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedRvcCleanModeSelectClusterAttributeListAttributeCallback(), - readRvcCleanModeSelectAttributeListCommandParams + () -> new ClusterInfoMapping.DelegatedRvcCleanModeClusterAttributeListAttributeCallback(), + readRvcCleanModeAttributeListCommandParams ); - result.put("readAttributeListAttribute", readRvcCleanModeSelectAttributeListAttributeInteractionInfo); - Map readRvcCleanModeSelectFeatureMapCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectFeatureMapAttributeInteractionInfo = new InteractionInfo( + result.put("readAttributeListAttribute", readRvcCleanModeAttributeListAttributeInteractionInfo); + Map readRvcCleanModeFeatureMapCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeFeatureMapAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readFeatureMapAttribute( + ((ChipClusters.RvcCleanModeCluster) cluster).readFeatureMapAttribute( (ChipClusters.LongAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readRvcCleanModeSelectFeatureMapCommandParams + readRvcCleanModeFeatureMapCommandParams ); - result.put("readFeatureMapAttribute", readRvcCleanModeSelectFeatureMapAttributeInteractionInfo); - Map readRvcCleanModeSelectClusterRevisionCommandParams = new LinkedHashMap(); - InteractionInfo readRvcCleanModeSelectClusterRevisionAttributeInteractionInfo = new InteractionInfo( + result.put("readFeatureMapAttribute", readRvcCleanModeFeatureMapAttributeInteractionInfo); + Map readRvcCleanModeClusterRevisionCommandParams = new LinkedHashMap(); + InteractionInfo readRvcCleanModeClusterRevisionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).readClusterRevisionAttribute( + ((ChipClusters.RvcCleanModeCluster) cluster).readClusterRevisionAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readRvcCleanModeSelectClusterRevisionCommandParams + readRvcCleanModeClusterRevisionCommandParams ); - result.put("readClusterRevisionAttribute", readRvcCleanModeSelectClusterRevisionAttributeInteractionInfo); + result.put("readClusterRevisionAttribute", readRvcCleanModeClusterRevisionAttributeInteractionInfo); return result; } @@ -6898,128 +6854,117 @@ private static Map readRefrigeratorAlarmInteractionInfo 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( + private static Map readDishwasherModeInteractionInfo() { + Map result = new LinkedHashMap<>();Map readDishwasherModeSupportedModesCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeSupportedModesAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readSupportedModesAttribute( - (ChipClusters.DishwasherModeSelectCluster.SupportedModesAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readSupportedModesAttribute( + (ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterSupportedModesAttributeCallback(), - readDishwasherModeSelectSupportedModesCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterSupportedModesAttributeCallback(), + readDishwasherModeSupportedModesCommandParams ); - result.put("readSupportedModesAttribute", readDishwasherModeSelectSupportedModesAttributeInteractionInfo); - Map readDishwasherModeSelectCurrentModeCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectCurrentModeAttributeInteractionInfo = new InteractionInfo( + result.put("readSupportedModesAttribute", readDishwasherModeSupportedModesAttributeInteractionInfo); + Map readDishwasherModeCurrentModeCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeCurrentModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readCurrentModeAttribute( + ((ChipClusters.DishwasherModeCluster) cluster).readCurrentModeAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readDishwasherModeSelectCurrentModeCommandParams + readDishwasherModeCurrentModeCommandParams ); - result.put("readCurrentModeAttribute", readDishwasherModeSelectCurrentModeAttributeInteractionInfo); - Map readDishwasherModeSelectStartUpModeCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + result.put("readCurrentModeAttribute", readDishwasherModeCurrentModeAttributeInteractionInfo); + Map readDishwasherModeStartUpModeCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readStartUpModeAttribute( - (ChipClusters.DishwasherModeSelectCluster.StartUpModeAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readStartUpModeAttribute( + (ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterStartUpModeAttributeCallback(), - readDishwasherModeSelectStartUpModeCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterStartUpModeAttributeCallback(), + readDishwasherModeStartUpModeCommandParams ); - result.put("readStartUpModeAttribute", readDishwasherModeSelectStartUpModeAttributeInteractionInfo); - Map readDishwasherModeSelectOnModeCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + result.put("readStartUpModeAttribute", readDishwasherModeStartUpModeAttributeInteractionInfo); + Map readDishwasherModeOnModeCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readOnModeAttribute( - (ChipClusters.DishwasherModeSelectCluster.OnModeAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readOnModeAttribute( + (ChipClusters.DishwasherModeCluster.OnModeAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterOnModeAttributeCallback(), - readDishwasherModeSelectOnModeCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterOnModeAttributeCallback(), + readDishwasherModeOnModeCommandParams ); - result.put("readOnModeAttribute", readDishwasherModeSelectOnModeAttributeInteractionInfo); - Map readDishwasherModeSelectGeneratedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readOnModeAttribute", readDishwasherModeOnModeAttributeInteractionInfo); + Map readDishwasherModeGeneratedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeGeneratedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readGeneratedCommandListAttribute( - (ChipClusters.DishwasherModeSelectCluster.GeneratedCommandListAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readGeneratedCommandListAttribute( + (ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterGeneratedCommandListAttributeCallback(), - readDishwasherModeSelectGeneratedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback(), + readDishwasherModeGeneratedCommandListCommandParams ); - result.put("readGeneratedCommandListAttribute", readDishwasherModeSelectGeneratedCommandListAttributeInteractionInfo); - Map readDishwasherModeSelectAcceptedCommandListCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( + result.put("readGeneratedCommandListAttribute", readDishwasherModeGeneratedCommandListAttributeInteractionInfo); + Map readDishwasherModeAcceptedCommandListCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeAcceptedCommandListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readAcceptedCommandListAttribute( - (ChipClusters.DishwasherModeSelectCluster.AcceptedCommandListAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readAcceptedCommandListAttribute( + (ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterAcceptedCommandListAttributeCallback(), - readDishwasherModeSelectAcceptedCommandListCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback(), + readDishwasherModeAcceptedCommandListCommandParams ); - result.put("readAcceptedCommandListAttribute", readDishwasherModeSelectAcceptedCommandListAttributeInteractionInfo); - Map readDishwasherModeSelectEventListCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectEventListAttributeInteractionInfo = new InteractionInfo( + result.put("readAcceptedCommandListAttribute", readDishwasherModeAcceptedCommandListAttributeInteractionInfo); + Map readDishwasherModeEventListCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeEventListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readEventListAttribute( - (ChipClusters.DishwasherModeSelectCluster.EventListAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readEventListAttribute( + (ChipClusters.DishwasherModeCluster.EventListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterEventListAttributeCallback(), - readDishwasherModeSelectEventListCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterEventListAttributeCallback(), + readDishwasherModeEventListCommandParams ); - result.put("readEventListAttribute", readDishwasherModeSelectEventListAttributeInteractionInfo); - Map readDishwasherModeSelectAttributeListCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectAttributeListAttributeInteractionInfo = new InteractionInfo( + result.put("readEventListAttribute", readDishwasherModeEventListAttributeInteractionInfo); + Map readDishwasherModeAttributeListCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeAttributeListAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readAttributeListAttribute( - (ChipClusters.DishwasherModeSelectCluster.AttributeListAttributeCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster).readAttributeListAttribute( + (ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback) callback ); }, - () -> new ClusterInfoMapping.DelegatedDishwasherModeSelectClusterAttributeListAttributeCallback(), - readDishwasherModeSelectAttributeListCommandParams + () -> new ClusterInfoMapping.DelegatedDishwasherModeClusterAttributeListAttributeCallback(), + readDishwasherModeAttributeListCommandParams ); - result.put("readAttributeListAttribute", readDishwasherModeSelectAttributeListAttributeInteractionInfo); - Map readDishwasherModeSelectFeatureMapCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectFeatureMapAttributeInteractionInfo = new InteractionInfo( + result.put("readAttributeListAttribute", readDishwasherModeAttributeListAttributeInteractionInfo); + Map readDishwasherModeFeatureMapCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeFeatureMapAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readFeatureMapAttribute( + ((ChipClusters.DishwasherModeCluster) cluster).readFeatureMapAttribute( (ChipClusters.LongAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedLongAttributeCallback(), - readDishwasherModeSelectFeatureMapCommandParams + readDishwasherModeFeatureMapCommandParams ); - result.put("readFeatureMapAttribute", readDishwasherModeSelectFeatureMapAttributeInteractionInfo); - Map readDishwasherModeSelectClusterRevisionCommandParams = new LinkedHashMap(); - InteractionInfo readDishwasherModeSelectClusterRevisionAttributeInteractionInfo = new InteractionInfo( + result.put("readFeatureMapAttribute", readDishwasherModeFeatureMapAttributeInteractionInfo); + Map readDishwasherModeClusterRevisionCommandParams = new LinkedHashMap(); + InteractionInfo readDishwasherModeClusterRevisionAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).readClusterRevisionAttribute( + ((ChipClusters.DishwasherModeCluster) cluster).readClusterRevisionAttribute( (ChipClusters.IntegerAttributeCallback) callback ); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), - readDishwasherModeSelectClusterRevisionCommandParams + readDishwasherModeClusterRevisionCommandParams ); - result.put("readClusterRevisionAttribute", readDishwasherModeSelectClusterRevisionAttributeInteractionInfo); + result.put("readClusterRevisionAttribute", readDishwasherModeClusterRevisionAttributeInteractionInfo); return result; } @@ -23325,14 +23270,14 @@ public Map> getReadAttributeMap() { put("booleanState", readBooleanStateInteractionInfo()); put("icdManagement", readIcdManagementInteractionInfo()); put("modeSelect", readModeSelectInteractionInfo()); - put("laundryWasherModeSelect", readLaundryWasherModeSelectInteractionInfo()); - put("refrigeratorAndTemperatureControlledCabinetModeSelect", readRefrigeratorAndTemperatureControlledCabinetModeSelectInteractionInfo()); + put("laundryWasherMode", readLaundryWasherModeInteractionInfo()); + put("refrigeratorAndTemperatureControlledCabinetMode", readRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo()); put("washerControls", readWasherControlsInteractionInfo()); - put("rvcRunModeSelect", readRvcRunModeSelectInteractionInfo()); - put("rvcCleanModeSelect", readRvcCleanModeSelectInteractionInfo()); + put("rvcRunMode", readRvcRunModeInteractionInfo()); + put("rvcCleanMode", readRvcCleanModeInteractionInfo()); put("temperatureControl", readTemperatureControlInteractionInfo()); put("refrigeratorAlarm", readRefrigeratorAlarmInteractionInfo()); - put("dishwasherModeSelect", readDishwasherModeSelectInteractionInfo()); + put("dishwasherMode", readDishwasherModeInteractionInfo()); put("airQuality", readAirQualityInteractionInfo()); put("smokeCoAlarm", readSmokeCoAlarmInteractionInfo()); put("operationalState", readOperationalStateInteractionInfo()); diff --git a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java index 02f94db6e7a63d..a3e32eb5a39671 100644 --- a/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java +++ b/src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java @@ -770,98 +770,98 @@ public Map> getWriteAttributeMap() { ); writeModeSelectInteractionInfo.put("writeOnModeAttribute", writeModeSelectOnModeAttributeInteractionInfo); writeAttributeMap.put("modeSelect", writeModeSelectInteractionInfo); - Map writeLaundryWasherModeSelectInteractionInfo = new LinkedHashMap<>(); - Map writeLaundryWasherModeSelectStartUpModeCommandParams = new LinkedHashMap(); - CommandParameterInfo laundryWasherModeSelectstartUpModeCommandParameterInfo = + Map writeLaundryWasherModeInteractionInfo = new LinkedHashMap<>(); + Map writeLaundryWasherModeStartUpModeCommandParams = new LinkedHashMap(); + CommandParameterInfo laundryWasherModestartUpModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeLaundryWasherModeSelectStartUpModeCommandParams.put( + writeLaundryWasherModeStartUpModeCommandParams.put( "value", - laundryWasherModeSelectstartUpModeCommandParameterInfo + laundryWasherModestartUpModeCommandParameterInfo ); - InteractionInfo writeLaundryWasherModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeLaundryWasherModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).writeStartUpModeAttribute( + ((ChipClusters.LaundryWasherModeCluster) cluster).writeStartUpModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeLaundryWasherModeSelectStartUpModeCommandParams + writeLaundryWasherModeStartUpModeCommandParams ); - writeLaundryWasherModeSelectInteractionInfo.put("writeStartUpModeAttribute", writeLaundryWasherModeSelectStartUpModeAttributeInteractionInfo); - Map writeLaundryWasherModeSelectOnModeCommandParams = new LinkedHashMap(); - CommandParameterInfo laundryWasherModeSelectonModeCommandParameterInfo = + writeLaundryWasherModeInteractionInfo.put("writeStartUpModeAttribute", writeLaundryWasherModeStartUpModeAttributeInteractionInfo); + Map writeLaundryWasherModeOnModeCommandParams = new LinkedHashMap(); + CommandParameterInfo laundryWasherModeonModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeLaundryWasherModeSelectOnModeCommandParams.put( + writeLaundryWasherModeOnModeCommandParams.put( "value", - laundryWasherModeSelectonModeCommandParameterInfo + laundryWasherModeonModeCommandParameterInfo ); - InteractionInfo writeLaundryWasherModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeLaundryWasherModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster).writeOnModeAttribute( + ((ChipClusters.LaundryWasherModeCluster) cluster).writeOnModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeLaundryWasherModeSelectOnModeCommandParams + writeLaundryWasherModeOnModeCommandParams ); - writeLaundryWasherModeSelectInteractionInfo.put("writeOnModeAttribute", writeLaundryWasherModeSelectOnModeAttributeInteractionInfo); - writeAttributeMap.put("laundryWasherModeSelect", writeLaundryWasherModeSelectInteractionInfo); - Map writeRefrigeratorAndTemperatureControlledCabinetModeSelectInteractionInfo = new LinkedHashMap<>(); - Map writeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeCommandParams = new LinkedHashMap(); - CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModeSelectstartUpModeCommandParameterInfo = + writeLaundryWasherModeInteractionInfo.put("writeOnModeAttribute", writeLaundryWasherModeOnModeAttributeInteractionInfo); + writeAttributeMap.put("laundryWasherMode", writeLaundryWasherModeInteractionInfo); + Map writeRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo = new LinkedHashMap<>(); + Map writeRefrigeratorAndTemperatureControlledCabinetModeStartUpModeCommandParams = new LinkedHashMap(); + CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModestartUpModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeCommandParams.put( + writeRefrigeratorAndTemperatureControlledCabinetModeStartUpModeCommandParams.put( "value", - refrigeratorAndTemperatureControlledCabinetModeSelectstartUpModeCommandParameterInfo + refrigeratorAndTemperatureControlledCabinetModestartUpModeCommandParameterInfo ); - InteractionInfo writeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).writeStartUpModeAttribute( + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).writeStartUpModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeCommandParams + writeRefrigeratorAndTemperatureControlledCabinetModeStartUpModeCommandParams ); - writeRefrigeratorAndTemperatureControlledCabinetModeSelectInteractionInfo.put("writeStartUpModeAttribute", writeRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeInteractionInfo); - Map writeRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeCommandParams = new LinkedHashMap(); - CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModeSelectonModeCommandParameterInfo = + writeRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo.put("writeStartUpModeAttribute", writeRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeInteractionInfo); + Map writeRefrigeratorAndTemperatureControlledCabinetModeOnModeCommandParams = new LinkedHashMap(); + CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModeonModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeCommandParams.put( + writeRefrigeratorAndTemperatureControlledCabinetModeOnModeCommandParams.put( "value", - refrigeratorAndTemperatureControlledCabinetModeSelectonModeCommandParameterInfo + refrigeratorAndTemperatureControlledCabinetModeonModeCommandParameterInfo ); - InteractionInfo writeRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster).writeOnModeAttribute( + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster).writeOnModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeCommandParams + writeRefrigeratorAndTemperatureControlledCabinetModeOnModeCommandParams ); - writeRefrigeratorAndTemperatureControlledCabinetModeSelectInteractionInfo.put("writeOnModeAttribute", writeRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeInteractionInfo); - writeAttributeMap.put("refrigeratorAndTemperatureControlledCabinetModeSelect", writeRefrigeratorAndTemperatureControlledCabinetModeSelectInteractionInfo); + writeRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo.put("writeOnModeAttribute", writeRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeInteractionInfo); + writeAttributeMap.put("refrigeratorAndTemperatureControlledCabinetMode", writeRefrigeratorAndTemperatureControlledCabinetModeInteractionInfo); Map writeWasherControlsInteractionInfo = new LinkedHashMap<>(); Map writeWasherControlsSpinSpeedCurrentCommandParams = new LinkedHashMap(); CommandParameterInfo washerControlsspinSpeedCurrentCommandParameterInfo = @@ -908,148 +908,148 @@ public Map> getWriteAttributeMap() { ); writeWasherControlsInteractionInfo.put("writeNumberOfRinsesAttribute", writeWasherControlsNumberOfRinsesAttributeInteractionInfo); writeAttributeMap.put("washerControls", writeWasherControlsInteractionInfo); - Map writeRvcRunModeSelectInteractionInfo = new LinkedHashMap<>(); - Map writeRvcRunModeSelectStartUpModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcRunModeSelectstartUpModeCommandParameterInfo = + Map writeRvcRunModeInteractionInfo = new LinkedHashMap<>(); + Map writeRvcRunModeStartUpModeCommandParams = new LinkedHashMap(); + CommandParameterInfo rvcRunModestartUpModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeRvcRunModeSelectStartUpModeCommandParams.put( + writeRvcRunModeStartUpModeCommandParams.put( "value", - rvcRunModeSelectstartUpModeCommandParameterInfo + rvcRunModestartUpModeCommandParameterInfo ); - InteractionInfo writeRvcRunModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeRvcRunModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).writeStartUpModeAttribute( + ((ChipClusters.RvcRunModeCluster) cluster).writeStartUpModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeRvcRunModeSelectStartUpModeCommandParams + writeRvcRunModeStartUpModeCommandParams ); - writeRvcRunModeSelectInteractionInfo.put("writeStartUpModeAttribute", writeRvcRunModeSelectStartUpModeAttributeInteractionInfo); - Map writeRvcRunModeSelectOnModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcRunModeSelectonModeCommandParameterInfo = + writeRvcRunModeInteractionInfo.put("writeStartUpModeAttribute", writeRvcRunModeStartUpModeAttributeInteractionInfo); + Map writeRvcRunModeOnModeCommandParams = new LinkedHashMap(); + CommandParameterInfo rvcRunModeonModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeRvcRunModeSelectOnModeCommandParams.put( + writeRvcRunModeOnModeCommandParams.put( "value", - rvcRunModeSelectonModeCommandParameterInfo + rvcRunModeonModeCommandParameterInfo ); - InteractionInfo writeRvcRunModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeRvcRunModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster).writeOnModeAttribute( + ((ChipClusters.RvcRunModeCluster) cluster).writeOnModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeRvcRunModeSelectOnModeCommandParams + writeRvcRunModeOnModeCommandParams ); - writeRvcRunModeSelectInteractionInfo.put("writeOnModeAttribute", writeRvcRunModeSelectOnModeAttributeInteractionInfo); - writeAttributeMap.put("rvcRunModeSelect", writeRvcRunModeSelectInteractionInfo); - Map writeRvcCleanModeSelectInteractionInfo = new LinkedHashMap<>(); - Map writeRvcCleanModeSelectStartUpModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcCleanModeSelectstartUpModeCommandParameterInfo = + writeRvcRunModeInteractionInfo.put("writeOnModeAttribute", writeRvcRunModeOnModeAttributeInteractionInfo); + writeAttributeMap.put("rvcRunMode", writeRvcRunModeInteractionInfo); + Map writeRvcCleanModeInteractionInfo = new LinkedHashMap<>(); + Map writeRvcCleanModeStartUpModeCommandParams = new LinkedHashMap(); + CommandParameterInfo rvcCleanModestartUpModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeRvcCleanModeSelectStartUpModeCommandParams.put( + writeRvcCleanModeStartUpModeCommandParams.put( "value", - rvcCleanModeSelectstartUpModeCommandParameterInfo + rvcCleanModestartUpModeCommandParameterInfo ); - InteractionInfo writeRvcCleanModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeRvcCleanModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).writeStartUpModeAttribute( + ((ChipClusters.RvcCleanModeCluster) cluster).writeStartUpModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeRvcCleanModeSelectStartUpModeCommandParams + writeRvcCleanModeStartUpModeCommandParams ); - writeRvcCleanModeSelectInteractionInfo.put("writeStartUpModeAttribute", writeRvcCleanModeSelectStartUpModeAttributeInteractionInfo); - Map writeRvcCleanModeSelectOnModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcCleanModeSelectonModeCommandParameterInfo = + writeRvcCleanModeInteractionInfo.put("writeStartUpModeAttribute", writeRvcCleanModeStartUpModeAttributeInteractionInfo); + Map writeRvcCleanModeOnModeCommandParams = new LinkedHashMap(); + CommandParameterInfo rvcCleanModeonModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeRvcCleanModeSelectOnModeCommandParams.put( + writeRvcCleanModeOnModeCommandParams.put( "value", - rvcCleanModeSelectonModeCommandParameterInfo + rvcCleanModeonModeCommandParameterInfo ); - InteractionInfo writeRvcCleanModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeRvcCleanModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster).writeOnModeAttribute( + ((ChipClusters.RvcCleanModeCluster) cluster).writeOnModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeRvcCleanModeSelectOnModeCommandParams + writeRvcCleanModeOnModeCommandParams ); - writeRvcCleanModeSelectInteractionInfo.put("writeOnModeAttribute", writeRvcCleanModeSelectOnModeAttributeInteractionInfo); - writeAttributeMap.put("rvcCleanModeSelect", writeRvcCleanModeSelectInteractionInfo); + writeRvcCleanModeInteractionInfo.put("writeOnModeAttribute", writeRvcCleanModeOnModeAttributeInteractionInfo); + writeAttributeMap.put("rvcCleanMode", writeRvcCleanModeInteractionInfo); Map writeTemperatureControlInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("temperatureControl", writeTemperatureControlInteractionInfo); Map writeRefrigeratorAlarmInteractionInfo = new LinkedHashMap<>(); writeAttributeMap.put("refrigeratorAlarm", writeRefrigeratorAlarmInteractionInfo); - Map writeDishwasherModeSelectInteractionInfo = new LinkedHashMap<>(); - Map writeDishwasherModeSelectStartUpModeCommandParams = new LinkedHashMap(); - CommandParameterInfo dishwasherModeSelectstartUpModeCommandParameterInfo = + Map writeDishwasherModeInteractionInfo = new LinkedHashMap<>(); + Map writeDishwasherModeStartUpModeCommandParams = new LinkedHashMap(); + CommandParameterInfo dishwasherModestartUpModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeDishwasherModeSelectStartUpModeCommandParams.put( + writeDishwasherModeStartUpModeCommandParams.put( "value", - dishwasherModeSelectstartUpModeCommandParameterInfo + dishwasherModestartUpModeCommandParameterInfo ); - InteractionInfo writeDishwasherModeSelectStartUpModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeDishwasherModeStartUpModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).writeStartUpModeAttribute( + ((ChipClusters.DishwasherModeCluster) cluster).writeStartUpModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeDishwasherModeSelectStartUpModeCommandParams + writeDishwasherModeStartUpModeCommandParams ); - writeDishwasherModeSelectInteractionInfo.put("writeStartUpModeAttribute", writeDishwasherModeSelectStartUpModeAttributeInteractionInfo); - Map writeDishwasherModeSelectOnModeCommandParams = new LinkedHashMap(); - CommandParameterInfo dishwasherModeSelectonModeCommandParameterInfo = + writeDishwasherModeInteractionInfo.put("writeStartUpModeAttribute", writeDishwasherModeStartUpModeAttributeInteractionInfo); + Map writeDishwasherModeOnModeCommandParams = new LinkedHashMap(); + CommandParameterInfo dishwasherModeonModeCommandParameterInfo = new CommandParameterInfo( "value", Integer.class, Integer.class ); - writeDishwasherModeSelectOnModeCommandParams.put( + writeDishwasherModeOnModeCommandParams.put( "value", - dishwasherModeSelectonModeCommandParameterInfo + dishwasherModeonModeCommandParameterInfo ); - InteractionInfo writeDishwasherModeSelectOnModeAttributeInteractionInfo = new InteractionInfo( + InteractionInfo writeDishwasherModeOnModeAttributeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster).writeOnModeAttribute( + ((ChipClusters.DishwasherModeCluster) cluster).writeOnModeAttribute( (DefaultClusterCallback) callback, (Integer) commandArguments.get("value") ); }, () -> new ClusterInfoMapping.DelegatedDefaultClusterCallback(), - writeDishwasherModeSelectOnModeCommandParams + writeDishwasherModeOnModeCommandParams ); - writeDishwasherModeSelectInteractionInfo.put("writeOnModeAttribute", writeDishwasherModeSelectOnModeAttributeInteractionInfo); - writeAttributeMap.put("dishwasherModeSelect", writeDishwasherModeSelectInteractionInfo); + writeDishwasherModeInteractionInfo.put("writeOnModeAttribute", writeDishwasherModeOnModeAttributeInteractionInfo); + writeAttributeMap.put("dishwasherMode", writeDishwasherModeInteractionInfo); 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 638e49c7024a79..12585d03b60a16 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -11953,68 +11953,47 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string newElement_0_modeCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), entry_0.mode, newElement_0_mode); - jobject newElement_0_modeTags; - chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags); + jobject newElement_0_semanticTags; + chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags); - auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin(); - while (iter_newElement_0_modeTags_2.Next()) + auto iter_newElement_0_semanticTags_2 = entry_0.semanticTags.begin(); + while (iter_newElement_0_semanticTags_2.Next()) { - auto & entry_2 = iter_newElement_0_modeTags_2.GetValue(); + auto & entry_2 = iter_newElement_0_semanticTags_2.GetValue(); jobject newElement_2; jobject newElement_2_mfgCode; - if (!entry_2.mfgCode.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode); - } - else - { - jobject newElement_2_mfgCodeInsideOptional; - std::string newElement_2_mfgCodeInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_2_mfgCodeInsideOptionalClassName.c_str(), - newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), static_cast(entry_2.mfgCode.Value()), - newElement_2_mfgCodeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode); - } + std::string newElement_2_mfgCodeClassName = "java/lang/Integer"; + std::string newElement_2_mfgCodeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_2_mfgCodeClassName.c_str(), newElement_2_mfgCodeCtorSignature.c_str(), + static_cast(entry_2.mfgCode), newElement_2_mfgCode); jobject newElement_2_value; std::string newElement_2_valueClassName = "java/lang/Integer"; std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } - jclass modeTagStructStructClass_3; + jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct", + semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct"); return nullptr; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); - if (modeTagStructStructCtor_3 == 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$ModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor"); return nullptr; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); - chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); + newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, + newElement_2_mfgCode, newElement_2_value); + chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2); } jclass modeOptionStructStructClass_1; @@ -12034,7 +12013,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label, - newElement_0_mode, newElement_0_modeTags); + newElement_0_mode, newElement_0_semanticTags); chip::JniReferences::GetInstance().AddToList(value, newElement_0); } return value; @@ -12230,22 +12209,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::LaundryWasherModeSelect::Id: { - using namespace app::Clusters::LaundryWasherModeSelect; + case app::Clusters::LaundryWasherMode::Id: { + using namespace app::Clusters::LaundryWasherMode; switch (aPath.mAttributeId) { - case Attributes::Description::Id: { - using TypeInfo = Attributes::Description::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value)); - return value; - } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -12299,55 +12266,42 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$LaundryWasherModeSelectClusterModeTagStruct", - modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct"); return nullptr; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeTagStruct constructor"); return nullptr; } newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$LaundryWasherModeSelectClusterModeOptionStruct", + env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeOptionStruct"); 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$LaundryWasherModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct constructor"); return nullptr; } @@ -12548,22 +12502,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { - using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; + case app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: { + using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode; switch (aPath.mAttributeId) { - case Attributes::Description::Id: { - using TypeInfo = Attributes::Description::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value)); - return value; - } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -12617,69 +12559,52 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( env, - "chip/devicecontroller/" - "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct", + "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, - "Could not find class " - "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct"); + ChipLogError( + Zcl, + "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct"); return nullptr; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError( - Zcl, - "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct " - "constructor"); + ChipLogError(Zcl, + "Could not find " + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor"); return nullptr; } newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, - "chip/devicecontroller/" - "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct", + env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, - "Could not find class " - "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct"); + ChipLogError( + Zcl, + "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct"); 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$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct " - "constructor"); + ChipLogError(Zcl, + "Could not find " + "ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor"); return nullptr; } @@ -13096,22 +13021,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::RvcRunModeSelect::Id: { - using namespace app::Clusters::RvcRunModeSelect; + case app::Clusters::RvcRunMode::Id: { + using namespace app::Clusters::RvcRunMode; switch (aPath.mAttributeId) { - case Attributes::Description::Id: { - using TypeInfo = Attributes::Description::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value)); - return value; - } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -13165,54 +13078,41 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct"); return nullptr; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor"); return nullptr; } newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterModeOptionStruct", - modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct"); 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$RvcRunModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeOptionStruct constructor"); return nullptr; } @@ -13413,22 +13313,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::RvcCleanModeSelect::Id: { - using namespace app::Clusters::RvcCleanModeSelect; + case app::Clusters::RvcCleanMode::Id: { + using namespace app::Clusters::RvcCleanMode; switch (aPath.mAttributeId) { - case Attributes::Description::Id: { - using TypeInfo = Attributes::Description::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value)); - return value; - } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -13482,55 +13370,41 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterModeTagStruct", - modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeTagStruct"); return nullptr; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor"); return nullptr; } newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterModeOptionStruct", - modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeOptionStruct"); 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$RvcCleanModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor"); return nullptr; } @@ -14129,22 +14003,10 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR } break; } - case app::Clusters::DishwasherModeSelect::Id: { - using namespace app::Clusters::DishwasherModeSelect; + case app::Clusters::DishwasherMode::Id: { + using namespace app::Clusters::DishwasherMode; switch (aPath.mAttributeId) { - case Attributes::Description::Id: { - using TypeInfo = Attributes::Description::TypeInfo; - TypeInfo::DecodableType cppValue; - *aError = app::DataModel::Decode(aReader, cppValue); - if (*aError != CHIP_NO_ERROR) - { - return nullptr; - } - jobject value; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(cppValue, value)); - return value; - } case Attributes::SupportedModes::Id: { using TypeInfo = Attributes::SupportedModes::TypeInfo; TypeInfo::DecodableType cppValue; @@ -14198,55 +14060,41 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR chip::JniReferences::GetInstance().CreateBoxedObject(newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DishwasherModeSelectClusterModeTagStruct", - modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeTagStruct"); return nullptr; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor"); return nullptr; } newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DishwasherModeSelectClusterModeOptionStruct", - modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct"); 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$DishwasherModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeOptionStruct constructor"); return nullptr; } diff --git a/src/controller/java/zap-generated/CHIPClientCallbacks.h b/src/controller/java/zap-generated/CHIPClientCallbacks.h index e924882fb0d898..9e3c8a92513186 100644 --- a/src/controller/java/zap-generated/CHIPClientCallbacks.h +++ b/src/controller/java/zap-generated/CHIPClientCallbacks.h @@ -475,30 +475,29 @@ typedef void (*ModeSelectEventListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*ModeSelectAttributeListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*LaundryWasherModeSelectSupportedModesListAttributeCallback)( +typedef void (*LaundryWasherModeSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::LaundryWasherModeSelect::Structs::ModeOptionStruct::DecodableType> & data); -typedef void (*LaundryWasherModeSelectGeneratedCommandListListAttributeCallback)( + const chip::app::DataModel::DecodableList & + data); +typedef void (*LaundryWasherModeGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*LaundryWasherModeSelectAcceptedCommandListListAttributeCallback)( +typedef void (*LaundryWasherModeAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*LaundryWasherModeSelectEventListListAttributeCallback)( - void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*LaundryWasherModeSelectAttributeListListAttributeCallback)( +typedef void (*LaundryWasherModeEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*LaundryWasherModeAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSupportedModesListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & - data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListListAttributeCallback)( + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> & data); +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectEventListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeEventListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListListAttributeCallback)( +typedef void (*RefrigeratorAndTemperatureControlledCabinetModeAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*WasherControlsSpinSpeedsListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); @@ -510,30 +509,28 @@ typedef void (*WasherControlsEventListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*WasherControlsAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunModeSelectSupportedModesListAttributeCallback)( +typedef void (*RvcRunModeSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & - data); -typedef void (*RvcRunModeSelectGeneratedCommandListListAttributeCallback)( + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcRunModeGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RvcRunModeSelectAcceptedCommandListListAttributeCallback)( +typedef void (*RvcRunModeAcceptedCommandListListAttributeCallback)( 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)( +typedef void (*RvcRunModeEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcRunModeAttributeListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & - data); -typedef void (*RvcCleanModeSelectGeneratedCommandListListAttributeCallback)( + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*RvcCleanModeSelectAcceptedCommandListListAttributeCallback)( +typedef void (*RvcCleanModeAcceptedCommandListListAttributeCallback)( 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 (*RvcCleanModeEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*RvcCleanModeAttributeListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); typedef void (*TemperatureControlSupportedTemperatureLevelsListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*TemperatureControlGeneratedCommandListListAttributeCallback)( @@ -552,17 +549,17 @@ typedef void (*RefrigeratorAlarmEventListListAttributeCallback)(void * context, const chip::app::DataModel::DecodableList & data); typedef void (*RefrigeratorAlarmAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*DishwasherModeSelectSupportedModesListAttributeCallback)( +typedef void (*DishwasherModeSupportedModesListAttributeCallback)( void * context, - const chip::app::DataModel::DecodableList & + const chip::app::DataModel::DecodableList & data); -typedef void (*DishwasherModeSelectGeneratedCommandListListAttributeCallback)( +typedef void (*DishwasherModeGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*DishwasherModeSelectAcceptedCommandListListAttributeCallback)( +typedef void (*DishwasherModeAcceptedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); -typedef void (*DishwasherModeSelectEventListListAttributeCallback)(void * context, - const chip::app::DataModel::DecodableList & data); -typedef void (*DishwasherModeSelectAttributeListListAttributeCallback)( +typedef void (*DishwasherModeEventListListAttributeCallback)(void * context, + const chip::app::DataModel::DecodableList & data); +typedef void (*DishwasherModeAttributeListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); typedef void (*AirQualityGeneratedCommandListListAttributeCallback)( void * context, const chip::app::DataModel::DecodableList & data); diff --git a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp index 237ebacd4ac70c..4fe9a9ebc89a9e 100644 --- a/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp +++ b/src/controller/java/zap-generated/CHIPClustersWrite-JNI.cpp @@ -2342,12 +2342,12 @@ JNI_METHOD(void, ModeSelectCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, LaundryWasherModeSelectCluster, writeStartUpModeAttribute) +JNI_METHOD(void, LaundryWasherModeCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::LaundryWasherModeSelect::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::LaundryWasherMode::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2376,8 +2376,8 @@ JNI_METHOD(void, LaundryWasherModeSelectCluster, writeStartUpModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - LaundryWasherModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + LaundryWasherModeCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2402,12 +2402,12 @@ JNI_METHOD(void, LaundryWasherModeSelectCluster, writeStartUpModeAttribute) onFailure.release(); } -JNI_METHOD(void, LaundryWasherModeSelectCluster, writeOnModeAttribute) +JNI_METHOD(void, LaundryWasherModeCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::LaundryWasherModeSelect::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::LaundryWasherMode::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2436,8 +2436,8 @@ JNI_METHOD(void, LaundryWasherModeSelectCluster, writeOnModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - LaundryWasherModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + LaundryWasherModeCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2462,12 +2462,12 @@ JNI_METHOD(void, LaundryWasherModeSelectCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, writeStartUpModeAttribute) +JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2497,8 +2497,8 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, w env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); CHIP_ERROR err = CHIP_NO_ERROR; - RefrigeratorAndTemperatureControlledCabinetModeSelectCluster * cppCluster = - reinterpret_cast(clusterPtr); + RefrigeratorAndTemperatureControlledCabinetModeCluster * 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, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, w onFailure.release(); } -JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, writeOnModeAttribute) +JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2558,8 +2558,8 @@ JNI_METHOD(void, RefrigeratorAndTemperatureControlledCabinetModeSelectCluster, w env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); CHIP_ERROR err = CHIP_NO_ERROR; - RefrigeratorAndTemperatureControlledCabinetModeSelectCluster * cppCluster = - reinterpret_cast(clusterPtr); + RefrigeratorAndTemperatureControlledCabinetModeCluster * 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, WasherControlsCluster, writeNumberOfRinsesAttribute) onFailure.release(); } -JNI_METHOD(void, RvcRunModeSelectCluster, writeStartUpModeAttribute) +JNI_METHOD(void, RvcRunModeCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcRunModeSelect::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcRunMode::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2738,8 +2738,8 @@ JNI_METHOD(void, RvcRunModeSelectCluster, writeStartUpModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcRunModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcRunModeCluster * 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, RvcRunModeSelectCluster, writeStartUpModeAttribute) onFailure.release(); } -JNI_METHOD(void, RvcRunModeSelectCluster, writeOnModeAttribute) +JNI_METHOD(void, RvcRunModeCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcRunModeSelect::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcRunMode::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2798,8 +2798,8 @@ JNI_METHOD(void, RvcRunModeSelectCluster, writeOnModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcRunModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcRunModeCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2824,12 +2824,12 @@ JNI_METHOD(void, RvcRunModeSelectCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, RvcCleanModeSelectCluster, writeStartUpModeAttribute) +JNI_METHOD(void, RvcCleanModeCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcCleanModeSelect::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcCleanMode::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2858,8 +2858,8 @@ JNI_METHOD(void, RvcCleanModeSelectCluster, writeStartUpModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcCleanModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcCleanModeCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2884,12 +2884,12 @@ JNI_METHOD(void, RvcCleanModeSelectCluster, writeStartUpModeAttribute) onFailure.release(); } -JNI_METHOD(void, RvcCleanModeSelectCluster, writeOnModeAttribute) +JNI_METHOD(void, RvcCleanModeCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::RvcCleanModeSelect::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::RvcCleanMode::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2918,8 +2918,8 @@ JNI_METHOD(void, RvcCleanModeSelectCluster, writeOnModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - RvcCleanModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + RvcCleanModeCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -2944,12 +2944,12 @@ JNI_METHOD(void, RvcCleanModeSelectCluster, writeOnModeAttribute) onFailure.release(); } -JNI_METHOD(void, DishwasherModeSelectCluster, writeStartUpModeAttribute) +JNI_METHOD(void, DishwasherModeCluster, writeStartUpModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::DishwasherModeSelect::Attributes::StartUpMode::TypeInfo; + using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::StartUpMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -2978,8 +2978,8 @@ JNI_METHOD(void, DishwasherModeSelectCluster, writeStartUpModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - DishwasherModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + DishwasherModeCluster * cppCluster = reinterpret_cast(clusterPtr); VerifyOrReturn(cppCluster != nullptr, chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Could not get native cluster", CHIP_ERROR_INCORRECT_STATE)); @@ -3004,12 +3004,12 @@ JNI_METHOD(void, DishwasherModeSelectCluster, writeStartUpModeAttribute) onFailure.release(); } -JNI_METHOD(void, DishwasherModeSelectCluster, writeOnModeAttribute) +JNI_METHOD(void, DishwasherModeCluster, writeOnModeAttribute) (JNIEnv * env, jobject self, jlong clusterPtr, jobject callback, jobject value, jobject timedWriteTimeoutMs) { chip::DeviceLayer::StackLock lock; ListFreer listFreer; - using TypeInfo = chip::app::Clusters::DishwasherModeSelect::Attributes::OnMode::TypeInfo; + using TypeInfo = chip::app::Clusters::DishwasherMode::Attributes::OnMode::TypeInfo; TypeInfo::Type cppValue; std::vector> cleanupByteArrays; @@ -3038,8 +3038,8 @@ JNI_METHOD(void, DishwasherModeSelectCluster, writeOnModeAttribute) chip::AndroidClusterExceptions::GetInstance().ReturnIllegalStateException( env, callback, "Error creating native failure callback", CHIP_ERROR_NO_MEMORY)); - CHIP_ERROR err = CHIP_NO_ERROR; - DishwasherModeSelectCluster * cppCluster = reinterpret_cast(clusterPtr); + CHIP_ERROR err = CHIP_NO_ERROR; + DishwasherModeCluster * 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 9bea5c009ec831..ea8d604224fa77 100644 --- a/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp @@ -2425,8 +2425,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::LaundryWasherModeSelect::Id: { - using namespace app::Clusters::LaundryWasherModeSelect; + case app::Clusters::LaundryWasherMode::Id: { + using namespace app::Clusters::LaundryWasherMode; switch (aPath.mEventId) { default: @@ -2435,8 +2435,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { - using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; + case app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: { + using namespace app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode; switch (aPath.mEventId) { default: @@ -2455,8 +2455,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::RvcRunModeSelect::Id: { - using namespace app::Clusters::RvcRunModeSelect; + case app::Clusters::RvcRunMode::Id: { + using namespace app::Clusters::RvcRunMode; switch (aPath.mEventId) { default: @@ -2465,8 +2465,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::RvcCleanModeSelect::Id: { - using namespace app::Clusters::RvcCleanModeSelect; + case app::Clusters::RvcCleanMode::Id: { + using namespace app::Clusters::RvcCleanMode; switch (aPath.mEventId) { default: @@ -2547,8 +2547,8 @@ jobject DecodeEventValue(const app::ConcreteEventPath & aPath, TLV::TLVReader & } break; } - case app::Clusters::DishwasherModeSelect::Id: { - using namespace app::Clusters::DishwasherModeSelect; + case app::Clusters::DishwasherMode::Id: { + using namespace app::Clusters::DishwasherMode; switch (aPath.mEventId) { default: diff --git a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp index be227349fbb7a8..0abae72ad343c9 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.cpp @@ -2811,82 +2811,9 @@ void CHIPIcdManagementClusterRegisterClientResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, ICDCounter); } -CHIPModeSelectClusterChangeToModeResponseCallback::CHIPModeSelectClusterChangeToModeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, this) -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPModeSelectClusterChangeToModeResponseCallback::~CHIPModeSelectClusterChangeToModeResponseCallback() -{ - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -}; - -void CHIPModeSelectClusterChangeToModeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::ModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - jmethodID javaMethod; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - - std::unique_ptr - cppCallback(reinterpret_cast(context), - chip::Platform::Delete); - VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); - - javaCallbackRef = cppCallback->javaCallbackRef; - // Java callback is allowed to be null, exit early if this is the case. - VerifyOrReturn(javaCallbackRef != nullptr); - - err = JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;Ljava/util/Optional;)V", - &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error invoking Java callback: %s", ErrorStr(err))); - - jobject Status; - std::string StatusClassName = "java/lang/Integer"; - std::string StatusCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(StatusClassName.c_str(), StatusCtorSignature.c_str(), - dataResponse.status, Status); - jobject StatusText; - if (!dataResponse.statusText.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, StatusText); - } - else - { - jobject StatusTextInsideOptional; - LogErrorOnFailure( - chip::JniReferences::GetInstance().CharToStringUTF(dataResponse.statusText.Value(), StatusTextInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(StatusTextInsideOptional, StatusText); - } - - env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); -} -CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback( +CHIPLaundryWasherModeClusterChangeToModeResponseCallback::CHIPLaundryWasherModeClusterChangeToModeResponseCallback( jobject javaCallback) : - Callback::Callback(CallbackFn, this) + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -2902,7 +2829,7 @@ CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::CHIPLaundryWashe } } -CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::~CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback() +CHIPLaundryWasherModeClusterChangeToModeResponseCallback::~CHIPLaundryWasherModeClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -2913,9 +2840,8 @@ CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::~CHIPLaundryWash env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::CallbackFn( - void * context, - const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) +void CHIPLaundryWasherModeClusterChangeToModeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -2925,10 +2851,10 @@ void CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::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; @@ -2959,10 +2885,9 @@ void CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(jobject javaCallback) : - Callback::Callback(CallbackFn, - this) +CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -2978,8 +2903,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResp } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -2990,10 +2915,10 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResp env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback::CallbackFn( void * context, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse:: - DecodableType & dataResponse) + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType & + dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3003,12 +2928,11 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToMod VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Error invoking Java callback: no JNIEnv")); - std::unique_ptr + std::unique_ptr cppCallback( - reinterpret_cast( - context), - chip::Platform::Delete); + reinterpret_cast(context), + chip::Platform::Delete); VerifyOrReturn(cppCallback != nullptr, ChipLogError(Zcl, "Error invoking Java callback: failed to cast native callback")); javaCallbackRef = cppCallback->javaCallbackRef; @@ -3039,9 +2963,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToMod env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::CHIPRvcRunModeSelectClusterChangeToModeResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPRvcRunModeClusterChangeToModeResponseCallback::CHIPRvcRunModeClusterChangeToModeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3057,7 +2980,7 @@ CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::CHIPRvcRunModeSelectClu } } -CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::~CHIPRvcRunModeSelectClusterChangeToModeResponseCallback() +CHIPRvcRunModeClusterChangeToModeResponseCallback::~CHIPRvcRunModeClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3068,8 +2991,8 @@ CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::~CHIPRvcRunModeSelectCl env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) +void CHIPRvcRunModeClusterChangeToModeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3079,10 +3002,10 @@ void CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::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; @@ -3113,9 +3036,8 @@ void CHIPRvcRunModeSelectClusterChangeToModeResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPRvcCleanModeClusterChangeToModeResponseCallback::CHIPRvcCleanModeClusterChangeToModeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3131,7 +3053,7 @@ CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::CHIPRvcCleanModeSelec } } -CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::~CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback() +CHIPRvcCleanModeClusterChangeToModeResponseCallback::~CHIPRvcCleanModeClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3142,8 +3064,8 @@ CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::~CHIPRvcCleanModeSele env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) +void CHIPRvcCleanModeClusterChangeToModeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3153,10 +3075,10 @@ void CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::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; @@ -3187,9 +3109,8 @@ void CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, Status, StatusText); } -CHIPDishwasherModeSelectClusterChangeToModeResponseCallback::CHIPDishwasherModeSelectClusterChangeToModeResponseCallback( - jobject javaCallback) : - Callback::Callback(CallbackFn, this) +CHIPDishwasherModeClusterChangeToModeResponseCallback::CHIPDishwasherModeClusterChangeToModeResponseCallback(jobject javaCallback) : + Callback::Callback(CallbackFn, this) { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3205,7 +3126,7 @@ CHIPDishwasherModeSelectClusterChangeToModeResponseCallback::CHIPDishwasherModeS } } -CHIPDishwasherModeSelectClusterChangeToModeResponseCallback::~CHIPDishwasherModeSelectClusterChangeToModeResponseCallback() +CHIPDishwasherModeClusterChangeToModeResponseCallback::~CHIPDishwasherModeClusterChangeToModeResponseCallback() { JNIEnv * env = JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -3216,8 +3137,8 @@ CHIPDishwasherModeSelectClusterChangeToModeResponseCallback::~CHIPDishwasherMode env->DeleteGlobalRef(javaCallbackRef); }; -void CHIPDishwasherModeSelectClusterChangeToModeResponseCallback::CallbackFn( - void * context, const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType & dataResponse) +void CHIPDishwasherModeClusterChangeToModeResponseCallback::CallbackFn( + void * context, const chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType & dataResponse) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -3227,10 +3148,10 @@ void CHIPDishwasherModeSelectClusterChangeToModeResponseCallback::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 7e2685520d3a3c..2f93fd858fbec2 100644 --- a/src/controller/java/zap-generated/CHIPInvokeCallbacks.h +++ b/src/controller/java/zap-generated/CHIPInvokeCallbacks.h @@ -464,93 +464,78 @@ class CHIPIcdManagementClusterRegisterClientResponseCallback jobject javaCallbackRef; }; -class CHIPModeSelectClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPLaundryWasherModeClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPLaundryWasherModeClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPModeSelectClusterChangeToModeResponseCallback(); + ~CHIPLaundryWasherModeClusterChangeToModeResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::ModeSelect::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPLaundryWasherModeSelectClusterChangeToModeResponseCallback(); + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(); - static void - CallbackFn(void * context, - const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType & data); - -private: - jobject javaCallbackRef; -}; - -class CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback - : public Callback::Callback -{ -public: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); - - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(); - - static void CallbackFn(void * context, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands:: - ChangeToModeResponse::DecodableType & data); + static void CallbackFn( + void * context, + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType & + data); private: jobject javaCallbackRef; }; -class CHIPRvcRunModeSelectClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPRvcRunModeClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPRvcRunModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPRvcRunModeClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPRvcRunModeSelectClusterChangeToModeResponseCallback(); + ~CHIPRvcRunModeClusterChangeToModeResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPRvcCleanModeClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPRvcCleanModeClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPRvcCleanModeSelectClusterChangeToModeResponseCallback(); + ~CHIPRvcCleanModeClusterChangeToModeResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType & data); private: jobject javaCallbackRef; }; -class CHIPDishwasherModeSelectClusterChangeToModeResponseCallback - : public Callback::Callback +class CHIPDishwasherModeClusterChangeToModeResponseCallback + : public Callback::Callback { public: - CHIPDishwasherModeSelectClusterChangeToModeResponseCallback(jobject javaCallback); + CHIPDishwasherModeClusterChangeToModeResponseCallback(jobject javaCallback); - ~CHIPDishwasherModeSelectClusterChangeToModeResponseCallback(); + ~CHIPDishwasherModeClusterChangeToModeResponseCallback(); static void CallbackFn(void * context, - const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType & data); + const chip::app::Clusters::DishwasherMode::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 2c063769741b15..215fd94d28c22f 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -19764,66 +19764,45 @@ void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn( std::string newElement_0_modeCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_0_modeClassName.c_str(), newElement_0_modeCtorSignature.c_str(), entry_0.mode, newElement_0_mode); - jobject newElement_0_modeTags; - chip::JniReferences::GetInstance().CreateArrayList(newElement_0_modeTags); + jobject newElement_0_semanticTags; + chip::JniReferences::GetInstance().CreateArrayList(newElement_0_semanticTags); - auto iter_newElement_0_modeTags_2 = entry_0.modeTags.begin(); - while (iter_newElement_0_modeTags_2.Next()) + auto iter_newElement_0_semanticTags_2 = entry_0.semanticTags.begin(); + while (iter_newElement_0_semanticTags_2.Next()) { - auto & entry_2 = iter_newElement_0_modeTags_2.GetValue(); + auto & entry_2 = iter_newElement_0_semanticTags_2.GetValue(); jobject newElement_2; jobject newElement_2_mfgCode; - if (!entry_2.mfgCode.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_mfgCode); - } - else - { - jobject newElement_2_mfgCodeInsideOptional; - std::string newElement_2_mfgCodeInsideOptionalClassName = "java/lang/Integer"; - std::string newElement_2_mfgCodeInsideOptionalCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject( - newElement_2_mfgCodeInsideOptionalClassName.c_str(), newElement_2_mfgCodeInsideOptionalCtorSignature.c_str(), - static_cast(entry_2.mfgCode.Value()), newElement_2_mfgCodeInsideOptional); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_mfgCodeInsideOptional, newElement_2_mfgCode); - } + std::string newElement_2_mfgCodeClassName = "java/lang/Integer"; + std::string newElement_2_mfgCodeCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject( + newElement_2_mfgCodeClassName.c_str(), newElement_2_mfgCodeCtorSignature.c_str(), + static_cast(entry_2.mfgCode), newElement_2_mfgCode); jobject newElement_2_value; std::string newElement_2_valueClassName = "java/lang/Integer"; std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } - jclass modeTagStructStructClass_3; + jclass semanticTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$ModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$ModeSelectClusterSemanticTagStruct", semanticTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$ModeSelectClusterSemanticTagStruct"); return; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); - if (modeTagStructStructCtor_3 == 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$ModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$ModeSelectClusterSemanticTagStruct constructor"); return; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); - chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); + newElement_2 = env->NewObject(semanticTagStructStructClass_3, semanticTagStructStructCtor_3, newElement_2_mfgCode, + newElement_2_value); + chip::JniReferences::GetInstance().AddToList(newElement_0_semanticTags, newElement_2); } jclass modeOptionStructStructClass_1; @@ -19843,7 +19822,7 @@ void CHIPModeSelectSupportedModesAttributeCallback::CallbackFn( } newElement_0 = env->NewObject(modeOptionStructStructClass_1, modeOptionStructStructCtor_1, newElement_0_label, - newElement_0_mode, newElement_0_modeTags); + newElement_0_mode, newElement_0_semanticTags); chip::JniReferences::GetInstance().AddToList(arrayListObj, newElement_0); } @@ -20259,9 +20238,9 @@ void CHIPModeSelectAttributeListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::CHIPLaundryWasherModeSelectSupportedModesAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPLaundryWasherModeSupportedModesAttributeCallback::CHIPLaundryWasherModeSupportedModesAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20278,7 +20257,7 @@ CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::CHIPLaundryWasherMod } } -CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::~CHIPLaundryWasherModeSelectSupportedModesAttributeCallback() +CHIPLaundryWasherModeSupportedModesAttributeCallback::~CHIPLaundryWasherModeSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20289,10 +20268,10 @@ CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::~CHIPLaundryWasherMo env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::CallbackFn( +void CHIPLaundryWasherModeSupportedModesAttributeCallback::CallbackFn( void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::LaundryWasherModeSelect::Structs::ModeOptionStruct::DecodableType> & list) + const chip::app::DataModel::DecodableList & + list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -20301,8 +20280,8 @@ void CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::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; @@ -20356,53 +20335,41 @@ void CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::CallbackFn( std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$LaundryWasherModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeTagStruct"); return; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeTagStruct constructor"); return; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2 = + env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$LaundryWasherModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$LaundryWasherModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$LaundryWasherModeClusterModeOptionStruct"); 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$LaundryWasherModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$LaundryWasherModeClusterModeOptionStruct constructor"); return; } @@ -20415,9 +20382,9 @@ void CHIPLaundryWasherModeSelectSupportedModesAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::CHIPLaundryWasherModeSelectStartUpModeAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPLaundryWasherModeStartUpModeAttributeCallback::CHIPLaundryWasherModeStartUpModeAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20434,7 +20401,7 @@ CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::CHIPLaundryWasherModeSe } } -CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::~CHIPLaundryWasherModeSelectStartUpModeAttributeCallback() +CHIPLaundryWasherModeStartUpModeAttributeCallback::~CHIPLaundryWasherModeStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20445,8 +20412,8 @@ CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::~CHIPLaundryWasherModeS env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPLaundryWasherModeStartUpModeAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -20454,8 +20421,8 @@ void CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::CallbackFn(void * 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; @@ -20482,10 +20449,8 @@ void CHIPLaundryWasherModeSelectStartUpModeAttributeCallback::CallbackFn(void * env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPLaundryWasherModeSelectOnModeAttributeCallback::CHIPLaundryWasherModeSelectOnModeAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPLaundryWasherModeOnModeAttributeCallback::CHIPLaundryWasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20501,7 +20466,7 @@ CHIPLaundryWasherModeSelectOnModeAttributeCallback::CHIPLaundryWasherModeSelectO } } -CHIPLaundryWasherModeSelectOnModeAttributeCallback::~CHIPLaundryWasherModeSelectOnModeAttributeCallback() +CHIPLaundryWasherModeOnModeAttributeCallback::~CHIPLaundryWasherModeOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20512,8 +20477,7 @@ CHIPLaundryWasherModeSelectOnModeAttributeCallback::~CHIPLaundryWasherModeSelect env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectOnModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPLaundryWasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -20521,8 +20485,8 @@ void CHIPLaundryWasherModeSelectOnModeAttributeCallback::CallbackFn(void * conte 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; @@ -20549,9 +20513,9 @@ void CHIPLaundryWasherModeSelectOnModeAttributeCallback::CallbackFn(void * conte env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback::CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback( +CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CHIPLaundryWasherModeGeneratedCommandListAttributeCallback( jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20568,8 +20532,7 @@ CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback::CHIPLaundryWas } } -CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback:: - ~CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback() +CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::~CHIPLaundryWasherModeGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20580,7 +20543,7 @@ CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback:: env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPLaundryWasherModeGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -20590,8 +20553,8 @@ void CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback::CallbackF 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; @@ -20621,9 +20584,9 @@ void CHIPLaundryWasherModeSelectGeneratedCommandListAttributeCallback::CallbackF env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback( +CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CHIPLaundryWasherModeAcceptedCommandListAttributeCallback( jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20640,7 +20603,7 @@ CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::CHIPLaundryWash } } -CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::~CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback() +CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::~CHIPLaundryWasherModeAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20651,7 +20614,7 @@ CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::~CHIPLaundryWas env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPLaundryWasherModeAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -20661,8 +20624,8 @@ void CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::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; @@ -20692,9 +20655,9 @@ void CHIPLaundryWasherModeSelectAcceptedCommandListAttributeCallback::CallbackFn env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPLaundryWasherModeSelectEventListAttributeCallback::CHIPLaundryWasherModeSelectEventListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPLaundryWasherModeEventListAttributeCallback::CHIPLaundryWasherModeEventListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20711,7 +20674,7 @@ CHIPLaundryWasherModeSelectEventListAttributeCallback::CHIPLaundryWasherModeSele } } -CHIPLaundryWasherModeSelectEventListAttributeCallback::~CHIPLaundryWasherModeSelectEventListAttributeCallback() +CHIPLaundryWasherModeEventListAttributeCallback::~CHIPLaundryWasherModeEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20722,8 +20685,8 @@ CHIPLaundryWasherModeSelectEventListAttributeCallback::~CHIPLaundryWasherModeSel env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectEventListAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::DecodableList & list) +void CHIPLaundryWasherModeEventListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -20732,8 +20695,8 @@ void CHIPLaundryWasherModeSelectEventListAttributeCallback::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; @@ -20763,9 +20726,9 @@ void CHIPLaundryWasherModeSelectEventListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPLaundryWasherModeSelectAttributeListAttributeCallback::CHIPLaundryWasherModeSelectAttributeListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPLaundryWasherModeAttributeListAttributeCallback::CHIPLaundryWasherModeAttributeListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -20782,7 +20745,7 @@ CHIPLaundryWasherModeSelectAttributeListAttributeCallback::CHIPLaundryWasherMode } } -CHIPLaundryWasherModeSelectAttributeListAttributeCallback::~CHIPLaundryWasherModeSelectAttributeListAttributeCallback() +CHIPLaundryWasherModeAttributeListAttributeCallback::~CHIPLaundryWasherModeAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20793,7 +20756,7 @@ CHIPLaundryWasherModeSelectAttributeListAttributeCallback::~CHIPLaundryWasherMod env->DeleteGlobalRef(javaCallbackRef); } -void CHIPLaundryWasherModeSelectAttributeListAttributeCallback::CallbackFn( +void CHIPLaundryWasherModeAttributeListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -20803,8 +20766,8 @@ void CHIPLaundryWasherModeSelectAttributeListAttributeCallback::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; @@ -20834,9 +20797,9 @@ void CHIPLaundryWasherModeSelectAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( +CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( CallbackFn, this), keepAlive(keepAlive) { @@ -20854,8 +20817,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttribute } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -20866,11 +20829,10 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttribute env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeSupportedModesAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> & - list) + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -20879,11 +20841,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttr 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; @@ -20937,63 +20897,49 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttr std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct", + env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { ChipLogError( - Zcl, - "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct"); + Zcl, "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct"); return; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, - "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct " - "constructor"); + ChipLogError( + Zcl, + "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct constructor"); return; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2 = + env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct", + env, "chip/devicecontroller/ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError( - Zcl, - "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, + "Could not find class ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct"); 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$RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct " - "constructor"); + ChipLogError( + Zcl, + "Could not find ChipStructs$RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct constructor"); return; } @@ -21006,10 +20952,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectSupportedModesAttr env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( - CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, + this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21026,8 +20972,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCal } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21038,7 +20984,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCal env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeStartUpModeAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; @@ -21047,10 +20993,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttribu 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; @@ -21077,10 +21022,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectStartUpModeAttribu env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( - CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, + this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21097,8 +21042,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21109,7 +21054,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeOnModeAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; @@ -21118,8 +21063,8 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCal jobject javaCallbackRef; VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr - cppCallback(reinterpret_cast(context), + 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. @@ -21147,12 +21092,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectOnModeAttributeCal env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback< - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterGeneratedCommandListAttributeCallbackType>(CallbackFn, - this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21169,8 +21112,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAtt } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21181,7 +21124,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAtt env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21191,11 +21134,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandLi VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - 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. @@ -21226,11 +21168,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectGeneratedCommandLi env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback< - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAcceptedCommandListAttributeCallbackType>(CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( + CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21247,8 +21188,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttr } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21259,7 +21200,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttr env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21269,11 +21210,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandLis VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - 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. @@ -21304,10 +21244,10 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAcceptedCommandLis env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( - CallbackFn, this), +CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, + this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -21324,8 +21264,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallb } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21336,7 +21276,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallb env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeEventListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21346,10 +21286,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttribute 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; @@ -21379,9 +21318,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectEventListAttribute env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback:: - CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback( +CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback:: + CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback( CallbackFn, this), keepAlive(keepAlive) { @@ -21399,8 +21338,8 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeC } } -CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback:: - ~CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback() +CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback:: + ~CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21411,7 +21350,7 @@ CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeC env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttributeCallback::CallbackFn( +void CHIPRefrigeratorAndTemperatureControlledCabinetModeAttributeListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -21421,11 +21360,9 @@ void CHIPRefrigeratorAndTemperatureControlledCabinetModeSelectAttributeListAttri 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; @@ -21937,10 +21874,8 @@ void CHIPWasherControlsAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunModeSelectSupportedModesAttributeCallback::CHIPRvcRunModeSelectSupportedModesAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPRvcRunModeSupportedModesAttributeCallback::CHIPRvcRunModeSupportedModesAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21956,7 +21891,7 @@ CHIPRvcRunModeSelectSupportedModesAttributeCallback::CHIPRvcRunModeSelectSupport } } -CHIPRvcRunModeSelectSupportedModesAttributeCallback::~CHIPRvcRunModeSelectSupportedModesAttributeCallback() +CHIPRvcRunModeSupportedModesAttributeCallback::~CHIPRvcRunModeSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -21967,10 +21902,9 @@ CHIPRvcRunModeSelectSupportedModesAttributeCallback::~CHIPRvcRunModeSelectSuppor env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectSupportedModesAttributeCallback::CallbackFn( +void CHIPRvcRunModeSupportedModesAttributeCallback::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; @@ -21979,8 +21913,8 @@ void CHIPRvcRunModeSelectSupportedModesAttributeCallback::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; @@ -22034,53 +21968,41 @@ void CHIPRvcRunModeSelectSupportedModesAttributeCallback::CallbackFn( std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeTagStruct"); return; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeTagStruct constructor"); return; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2 = + env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcRunModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcRunModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcRunModeClusterModeOptionStruct"); 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$RvcRunModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcRunModeClusterModeOptionStruct constructor"); return; } @@ -22093,10 +22015,8 @@ void CHIPRvcRunModeSelectSupportedModesAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunModeSelectStartUpModeAttributeCallback::CHIPRvcRunModeSelectStartUpModeAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPRvcRunModeStartUpModeAttributeCallback::CHIPRvcRunModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22112,7 +22032,7 @@ CHIPRvcRunModeSelectStartUpModeAttributeCallback::CHIPRvcRunModeSelectStartUpMod } } -CHIPRvcRunModeSelectStartUpModeAttributeCallback::~CHIPRvcRunModeSelectStartUpModeAttributeCallback() +CHIPRvcRunModeStartUpModeAttributeCallback::~CHIPRvcRunModeStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22123,8 +22043,7 @@ CHIPRvcRunModeSelectStartUpModeAttributeCallback::~CHIPRvcRunModeSelectStartUpMo env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPRvcRunModeStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22132,8 +22051,8 @@ void CHIPRvcRunModeSelectStartUpModeAttributeCallback::CallbackFn(void * context 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; @@ -22160,8 +22079,8 @@ void CHIPRvcRunModeSelectStartUpModeAttributeCallback::CallbackFn(void * context env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcRunModeSelectOnModeAttributeCallback::CHIPRvcRunModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcRunModeOnModeAttributeCallback::CHIPRvcRunModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22177,7 +22096,7 @@ CHIPRvcRunModeSelectOnModeAttributeCallback::CHIPRvcRunModeSelectOnModeAttribute } } -CHIPRvcRunModeSelectOnModeAttributeCallback::~CHIPRvcRunModeSelectOnModeAttributeCallback() +CHIPRvcRunModeOnModeAttributeCallback::~CHIPRvcRunModeOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22188,7 +22107,7 @@ CHIPRvcRunModeSelectOnModeAttributeCallback::~CHIPRvcRunModeSelectOnModeAttribut env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) +void CHIPRvcRunModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22196,8 +22115,8 @@ void CHIPRvcRunModeSelectOnModeAttributeCallback::CallbackFn(void * context, con 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; @@ -22224,9 +22143,9 @@ void CHIPRvcRunModeSelectOnModeAttributeCallback::CallbackFn(void * context, con env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcRunModeGeneratedCommandListAttributeCallback::CHIPRvcRunModeGeneratedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22243,7 +22162,7 @@ CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::CHIPRvcRunModeSelectG } } -CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::~CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback() +CHIPRvcRunModeGeneratedCommandListAttributeCallback::~CHIPRvcRunModeGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22254,7 +22173,7 @@ CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::~CHIPRvcRunModeSelect env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPRvcRunModeGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -22264,8 +22183,8 @@ void CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::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; @@ -22295,9 +22214,9 @@ void CHIPRvcRunModeSelectGeneratedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcRunModeAcceptedCommandListAttributeCallback::CHIPRvcRunModeAcceptedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22314,7 +22233,7 @@ CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::CHIPRvcRunModeSelectAc } } -CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::~CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback() +CHIPRvcRunModeAcceptedCommandListAttributeCallback::~CHIPRvcRunModeAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22325,7 +22244,7 @@ CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::~CHIPRvcRunModeSelectA env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPRvcRunModeAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -22335,8 +22254,8 @@ void CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::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; @@ -22366,10 +22285,8 @@ void CHIPRvcRunModeSelectAcceptedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunModeSelectEventListAttributeCallback::CHIPRvcRunModeSelectEventListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPRvcRunModeEventListAttributeCallback::CHIPRvcRunModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22385,7 +22302,7 @@ CHIPRvcRunModeSelectEventListAttributeCallback::CHIPRvcRunModeSelectEventListAtt } } -CHIPRvcRunModeSelectEventListAttributeCallback::~CHIPRvcRunModeSelectEventListAttributeCallback() +CHIPRvcRunModeEventListAttributeCallback::~CHIPRvcRunModeEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22396,8 +22313,8 @@ CHIPRvcRunModeSelectEventListAttributeCallback::~CHIPRvcRunModeSelectEventListAt env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectEventListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcRunModeEventListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22406,8 +22323,8 @@ void CHIPRvcRunModeSelectEventListAttributeCallback::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; @@ -22437,10 +22354,8 @@ void CHIPRvcRunModeSelectEventListAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcRunModeSelectAttributeListAttributeCallback::CHIPRvcRunModeSelectAttributeListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPRvcRunModeAttributeListAttributeCallback::CHIPRvcRunModeAttributeListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22456,7 +22371,7 @@ CHIPRvcRunModeSelectAttributeListAttributeCallback::CHIPRvcRunModeSelectAttribut } } -CHIPRvcRunModeSelectAttributeListAttributeCallback::~CHIPRvcRunModeSelectAttributeListAttributeCallback() +CHIPRvcRunModeAttributeListAttributeCallback::~CHIPRvcRunModeAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22467,8 +22382,8 @@ CHIPRvcRunModeSelectAttributeListAttributeCallback::~CHIPRvcRunModeSelectAttribu env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcRunModeSelectAttributeListAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::DecodableList & list) +void CHIPRvcRunModeAttributeListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22477,8 +22392,8 @@ void CHIPRvcRunModeSelectAttributeListAttributeCallback::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; @@ -22508,9 +22423,9 @@ void CHIPRvcRunModeSelectAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CHIPRvcCleanModeSelectSupportedModesAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcCleanModeSupportedModesAttributeCallback::CHIPRvcCleanModeSupportedModesAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22527,7 +22442,7 @@ CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CHIPRvcCleanModeSelectSup } } -CHIPRvcCleanModeSelectSupportedModesAttributeCallback::~CHIPRvcCleanModeSelectSupportedModesAttributeCallback() +CHIPRvcCleanModeSupportedModesAttributeCallback::~CHIPRvcCleanModeSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22538,10 +22453,9 @@ CHIPRvcCleanModeSelectSupportedModesAttributeCallback::~CHIPRvcCleanModeSelectSu env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CallbackFn( +void CHIPRvcCleanModeSupportedModesAttributeCallback::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; @@ -22550,8 +22464,8 @@ void CHIPRvcCleanModeSelectSupportedModesAttributeCallback::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; @@ -22605,53 +22519,41 @@ void CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CallbackFn( std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeTagStruct"); return; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeTagStruct constructor"); return; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2 = + env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$RvcCleanModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$RvcCleanModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$RvcCleanModeClusterModeOptionStruct"); 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$RvcCleanModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$RvcCleanModeClusterModeOptionStruct constructor"); return; } @@ -22664,10 +22566,8 @@ void CHIPRvcCleanModeSelectSupportedModesAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CHIPRvcCleanModeSelectStartUpModeAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPRvcCleanModeStartUpModeAttributeCallback::CHIPRvcCleanModeStartUpModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22683,7 +22583,7 @@ CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CHIPRvcCleanModeSelectStartU } } -CHIPRvcCleanModeSelectStartUpModeAttributeCallback::~CHIPRvcCleanModeSelectStartUpModeAttributeCallback() +CHIPRvcCleanModeStartUpModeAttributeCallback::~CHIPRvcCleanModeStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22694,8 +22594,7 @@ CHIPRvcCleanModeSelectStartUpModeAttributeCallback::~CHIPRvcCleanModeSelectStart env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPRvcCleanModeStartUpModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22703,8 +22602,8 @@ void CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CallbackFn(void * conte 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; @@ -22731,8 +22630,8 @@ void CHIPRvcCleanModeSelectStartUpModeAttributeCallback::CallbackFn(void * conte env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcCleanModeSelectOnModeAttributeCallback::CHIPRvcCleanModeSelectOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +CHIPRvcCleanModeOnModeAttributeCallback::CHIPRvcCleanModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22748,7 +22647,7 @@ CHIPRvcCleanModeSelectOnModeAttributeCallback::CHIPRvcCleanModeSelectOnModeAttri } } -CHIPRvcCleanModeSelectOnModeAttributeCallback::~CHIPRvcCleanModeSelectOnModeAttributeCallback() +CHIPRvcCleanModeOnModeAttributeCallback::~CHIPRvcCleanModeOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22759,8 +22658,7 @@ CHIPRvcCleanModeSelectOnModeAttributeCallback::~CHIPRvcCleanModeSelectOnModeAttr env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectOnModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPRvcCleanModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22768,8 +22666,8 @@ void CHIPRvcCleanModeSelectOnModeAttributeCallback::CallbackFn(void * context, 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; @@ -22796,9 +22694,9 @@ void CHIPRvcCleanModeSelectOnModeAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CHIPRvcCleanModeGeneratedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22815,7 +22713,7 @@ CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::CHIPRvcCleanModeSel } } -CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback() +CHIPRvcCleanModeGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22826,7 +22724,7 @@ CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::~CHIPRvcCleanModeSe env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPRvcCleanModeGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -22836,8 +22734,8 @@ void CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::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; @@ -22867,9 +22765,9 @@ void CHIPRvcCleanModeSelectGeneratedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CHIPRvcCleanModeAcceptedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -22886,7 +22784,7 @@ CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::CHIPRvcCleanModeSele } } -CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback() +CHIPRvcCleanModeAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22897,7 +22795,7 @@ CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::~CHIPRvcCleanModeSel env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPRvcCleanModeAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -22907,8 +22805,8 @@ void CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::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; @@ -22938,10 +22836,8 @@ void CHIPRvcCleanModeSelectAcceptedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanModeSelectEventListAttributeCallback::CHIPRvcCleanModeSelectEventListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPRvcCleanModeEventListAttributeCallback::CHIPRvcCleanModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22957,7 +22853,7 @@ CHIPRvcCleanModeSelectEventListAttributeCallback::CHIPRvcCleanModeSelectEventLis } } -CHIPRvcCleanModeSelectEventListAttributeCallback::~CHIPRvcCleanModeSelectEventListAttributeCallback() +CHIPRvcCleanModeEventListAttributeCallback::~CHIPRvcCleanModeEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -22968,8 +22864,8 @@ CHIPRvcCleanModeSelectEventListAttributeCallback::~CHIPRvcCleanModeSelectEventLi env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectEventListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPRvcCleanModeEventListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -22978,8 +22874,8 @@ void CHIPRvcCleanModeSelectEventListAttributeCallback::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; @@ -23009,9 +22905,9 @@ void CHIPRvcCleanModeSelectEventListAttributeCallback::CallbackFn(void * context env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPRvcCleanModeSelectAttributeListAttributeCallback::CHIPRvcCleanModeSelectAttributeListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPRvcCleanModeAttributeListAttributeCallback::CHIPRvcCleanModeAttributeListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -23028,7 +22924,7 @@ CHIPRvcCleanModeSelectAttributeListAttributeCallback::CHIPRvcCleanModeSelectAttr } } -CHIPRvcCleanModeSelectAttributeListAttributeCallback::~CHIPRvcCleanModeSelectAttributeListAttributeCallback() +CHIPRvcCleanModeAttributeListAttributeCallback::~CHIPRvcCleanModeAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -23039,8 +22935,8 @@ CHIPRvcCleanModeSelectAttributeListAttributeCallback::~CHIPRvcCleanModeSelectAtt env->DeleteGlobalRef(javaCallbackRef); } -void CHIPRvcCleanModeSelectAttributeListAttributeCallback::CallbackFn( - void * context, const chip::app::DataModel::DecodableList & list) +void CHIPRvcCleanModeAttributeListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -23049,8 +22945,8 @@ void CHIPRvcCleanModeSelectAttributeListAttributeCallback::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; @@ -23717,9 +23613,9 @@ void CHIPRefrigeratorAlarmAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPDishwasherModeSelectSupportedModesAttributeCallback::CHIPDishwasherModeSelectSupportedModesAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPDishwasherModeSupportedModesAttributeCallback::CHIPDishwasherModeSupportedModesAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -23736,7 +23632,7 @@ CHIPDishwasherModeSelectSupportedModesAttributeCallback::CHIPDishwasherModeSelec } } -CHIPDishwasherModeSelectSupportedModesAttributeCallback::~CHIPDishwasherModeSelectSupportedModesAttributeCallback() +CHIPDishwasherModeSupportedModesAttributeCallback::~CHIPDishwasherModeSupportedModesAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -23747,10 +23643,9 @@ CHIPDishwasherModeSelectSupportedModesAttributeCallback::~CHIPDishwasherModeSele env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectSupportedModesAttributeCallback::CallbackFn( +void CHIPDishwasherModeSupportedModesAttributeCallback::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; @@ -23759,8 +23654,8 @@ void CHIPDishwasherModeSelectSupportedModesAttributeCallback::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; @@ -23814,53 +23709,41 @@ void CHIPDishwasherModeSelectSupportedModesAttributeCallback::CallbackFn( std::string newElement_2_valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject( newElement_2_valueClassName.c_str(), newElement_2_valueCtorSignature.c_str(), entry_2.value, newElement_2_value); - jobject newElement_2_tagName; - if (!entry_2.tagName.HasValue()) - { - chip::JniReferences::GetInstance().CreateOptional(nullptr, newElement_2_tagName); - } - else - { - jobject newElement_2_tagNameInsideOptional; - LogErrorOnFailure(chip::JniReferences::GetInstance().CharToStringUTF(entry_2.tagName.Value(), - newElement_2_tagNameInsideOptional)); - chip::JniReferences::GetInstance().CreateOptional(newElement_2_tagNameInsideOptional, newElement_2_tagName); - } jclass modeTagStructStructClass_3; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DishwasherModeSelectClusterModeTagStruct", modeTagStructStructClass_3); + env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeTagStruct", modeTagStructStructClass_3); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeSelectClusterModeTagStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeTagStruct"); return; } - jmethodID modeTagStructStructCtor_3 = env->GetMethodID( - modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;Ljava/util/Optional;)V"); + jmethodID modeTagStructStructCtor_3 = + env->GetMethodID(modeTagStructStructClass_3, "", "(Ljava/util/Optional;Ljava/lang/Integer;)V"); if (modeTagStructStructCtor_3 == nullptr) { - ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeSelectClusterModeTagStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeTagStruct constructor"); return; } - newElement_2 = env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, - newElement_2_value, newElement_2_tagName); + newElement_2 = + env->NewObject(modeTagStructStructClass_3, modeTagStructStructCtor_3, newElement_2_mfgCode, newElement_2_value); chip::JniReferences::GetInstance().AddToList(newElement_0_modeTags, newElement_2); } jclass modeOptionStructStructClass_1; err = chip::JniReferences::GetInstance().GetClassRef( - env, "chip/devicecontroller/ChipStructs$DishwasherModeSelectClusterModeOptionStruct", modeOptionStructStructClass_1); + env, "chip/devicecontroller/ChipStructs$DishwasherModeClusterModeOptionStruct", modeOptionStructStructClass_1); if (err != CHIP_NO_ERROR) { - ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeSelectClusterModeOptionStruct"); + ChipLogError(Zcl, "Could not find class ChipStructs$DishwasherModeClusterModeOptionStruct"); 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$DishwasherModeSelectClusterModeOptionStruct constructor"); + ChipLogError(Zcl, "Could not find ChipStructs$DishwasherModeClusterModeOptionStruct constructor"); return; } @@ -23873,9 +23756,9 @@ void CHIPDishwasherModeSelectSupportedModesAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPDishwasherModeSelectStartUpModeAttributeCallback::CHIPDishwasherModeSelectStartUpModeAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPDishwasherModeStartUpModeAttributeCallback::CHIPDishwasherModeStartUpModeAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -23892,7 +23775,7 @@ CHIPDishwasherModeSelectStartUpModeAttributeCallback::CHIPDishwasherModeSelectSt } } -CHIPDishwasherModeSelectStartUpModeAttributeCallback::~CHIPDishwasherModeSelectStartUpModeAttributeCallback() +CHIPDishwasherModeStartUpModeAttributeCallback::~CHIPDishwasherModeStartUpModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -23903,8 +23786,8 @@ CHIPDishwasherModeSelectStartUpModeAttributeCallback::~CHIPDishwasherModeSelectS env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectStartUpModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPDishwasherModeStartUpModeAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -23912,8 +23795,8 @@ void CHIPDishwasherModeSelectStartUpModeAttributeCallback::CallbackFn(void * con 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; @@ -23940,10 +23823,8 @@ void CHIPDishwasherModeSelectStartUpModeAttributeCallback::CallbackFn(void * con env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPDishwasherModeSelectOnModeAttributeCallback::CHIPDishwasherModeSelectOnModeAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPDishwasherModeOnModeAttributeCallback::CHIPDishwasherModeOnModeAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -23959,7 +23840,7 @@ CHIPDishwasherModeSelectOnModeAttributeCallback::CHIPDishwasherModeSelectOnModeA } } -CHIPDishwasherModeSelectOnModeAttributeCallback::~CHIPDishwasherModeSelectOnModeAttributeCallback() +CHIPDishwasherModeOnModeAttributeCallback::~CHIPDishwasherModeOnModeAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -23970,8 +23851,7 @@ CHIPDishwasherModeSelectOnModeAttributeCallback::~CHIPDishwasherModeSelectOnMode env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectOnModeAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::Nullable & value) +void CHIPDishwasherModeOnModeAttributeCallback::CallbackFn(void * context, const chip::app::DataModel::Nullable & value) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -23979,8 +23859,8 @@ void CHIPDishwasherModeSelectOnModeAttributeCallback::CallbackFn(void * context, 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; @@ -24007,9 +23887,9 @@ void CHIPDishwasherModeSelectOnModeAttributeCallback::CallbackFn(void * context, env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); } -CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback( +CHIPDishwasherModeGeneratedCommandListAttributeCallback::CHIPDishwasherModeGeneratedCommandListAttributeCallback( jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -24026,7 +23906,7 @@ CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::CHIPDishwasherMod } } -CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::~CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback() +CHIPDishwasherModeGeneratedCommandListAttributeCallback::~CHIPDishwasherModeGeneratedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -24037,7 +23917,7 @@ CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::~CHIPDishwasherMo env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::CallbackFn( +void CHIPDishwasherModeGeneratedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -24047,8 +23927,8 @@ void CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::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; @@ -24078,9 +23958,9 @@ void CHIPDishwasherModeSelectGeneratedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPDishwasherModeAcceptedCommandListAttributeCallback::CHIPDishwasherModeAcceptedCommandListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -24097,7 +23977,7 @@ CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::CHIPDishwasherMode } } -CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::~CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback() +CHIPDishwasherModeAcceptedCommandListAttributeCallback::~CHIPDishwasherModeAcceptedCommandListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -24108,7 +23988,7 @@ CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::~CHIPDishwasherMod env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::CallbackFn( +void CHIPDishwasherModeAcceptedCommandListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -24118,8 +23998,8 @@ void CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::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; @@ -24149,10 +24029,8 @@ void CHIPDishwasherModeSelectAcceptedCommandListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPDishwasherModeSelectEventListAttributeCallback::CHIPDishwasherModeSelectEventListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) +CHIPDishwasherModeEventListAttributeCallback::CHIPDishwasherModeEventListAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -24168,7 +24046,7 @@ CHIPDishwasherModeSelectEventListAttributeCallback::CHIPDishwasherModeSelectEven } } -CHIPDishwasherModeSelectEventListAttributeCallback::~CHIPDishwasherModeSelectEventListAttributeCallback() +CHIPDishwasherModeEventListAttributeCallback::~CHIPDishwasherModeEventListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -24179,8 +24057,8 @@ CHIPDishwasherModeSelectEventListAttributeCallback::~CHIPDishwasherModeSelectEve env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectEventListAttributeCallback::CallbackFn(void * context, - const chip::app::DataModel::DecodableList & list) +void CHIPDishwasherModeEventListAttributeCallback::CallbackFn(void * context, + const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; CHIP_ERROR err = CHIP_NO_ERROR; @@ -24189,8 +24067,8 @@ void CHIPDishwasherModeSelectEventListAttributeCallback::CallbackFn(void * conte 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; @@ -24220,9 +24098,9 @@ void CHIPDishwasherModeSelectEventListAttributeCallback::CallbackFn(void * conte env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPDishwasherModeSelectAttributeListAttributeCallback::CHIPDishwasherModeSelectAttributeListAttributeCallback(jobject javaCallback, - bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), +CHIPDishwasherModeAttributeListAttributeCallback::CHIPDishwasherModeAttributeListAttributeCallback(jobject javaCallback, + bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); @@ -24239,7 +24117,7 @@ CHIPDishwasherModeSelectAttributeListAttributeCallback::CHIPDishwasherModeSelect } } -CHIPDishwasherModeSelectAttributeListAttributeCallback::~CHIPDishwasherModeSelectAttributeListAttributeCallback() +CHIPDishwasherModeAttributeListAttributeCallback::~CHIPDishwasherModeAttributeListAttributeCallback() { JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); if (env == nullptr) @@ -24250,7 +24128,7 @@ CHIPDishwasherModeSelectAttributeListAttributeCallback::~CHIPDishwasherModeSelec env->DeleteGlobalRef(javaCallbackRef); } -void CHIPDishwasherModeSelectAttributeListAttributeCallback::CallbackFn( +void CHIPDishwasherModeAttributeListAttributeCallback::CallbackFn( void * context, const chip::app::DataModel::DecodableList & list) { chip::DeviceLayer::StackUnlock unlock; @@ -24260,8 +24138,8 @@ void CHIPDishwasherModeSelectAttributeListAttributeCallback::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; diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 0dcded17ad2c69..23ca8d6a4308bf 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -13420,29 +13420,9 @@ public void changeToMode(DefaultClusterCallback callback , int timedInvokeTimeoutMs) { changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, null); - } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode - , int timedInvokeTimeoutMs) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); - } private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback , Integer newMode , @Nullable Integer timedInvokeTimeoutMs); - private native void changeToModeWithStatus(long chipClusterPtr, ChangeToModeResponseCallback Callback - , Integer newMode - , @Nullable Integer timedInvokeTimeoutMs); - public interface ChangeToModeResponseCallback { - void onSuccess(Integer status, Optional statusText); - - void onError(Exception error); - } - public interface StandardNamespaceAttributeCallback { void onSuccess(@Nullable Integer value); @@ -13732,41 +13712,27 @@ private native void subscribeClusterRevisionAttribute(long chipClusterPtr, , int minInterval, int maxInterval); } - public static class LaundryWasherModeSelectCluster extends BaseChipCluster { + public static class LaundryWasherModeCluster extends BaseChipCluster { public static final long CLUSTER_ID = 81L; - public LaundryWasherModeSelectCluster(long devicePtr, int endpointId) { + public LaundryWasherModeCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode) { changeToMode(chipClusterPtr, callback, newMode, null); } - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode , int timedInvokeTimeoutMs) { changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, null); - } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode - , int timedInvokeTimeoutMs) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); - } - private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback - , Integer newMode - , @Nullable Integer timedInvokeTimeoutMs); - private native void changeToModeWithStatus(long chipClusterPtr, ChangeToModeResponseCallback Callback + private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback , Integer newMode , @Nullable Integer timedInvokeTimeoutMs); public interface ChangeToModeResponseCallback { @@ -13777,7 +13743,7 @@ public interface ChangeToModeResponseCallback { public interface SupportedModesAttributeCallback { - void onSuccess( List valueList); + void onSuccess( List valueList); void onError(Exception ex); default void onSubscriptionEstablished(long subscriptionId) {} } @@ -13812,18 +13778,6 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished(long subscriptionId) {} } - public void readDescriptionAttribute( - CharStringAttributeCallback callback - ) { - readDescriptionAttribute(chipClusterPtr, callback); - } - public void subscribeDescriptionAttribute( - CharStringAttributeCallback callback -, - int minInterval, int maxInterval) { - subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - public void readSupportedModesAttribute( SupportedModesAttributeCallback callback ) { @@ -13958,13 +13912,6 @@ public void subscribeClusterRevisionAttribute( subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - private native void readDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback - ); - private native void subscribeDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback -, int minInterval, int maxInterval); - private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback ); @@ -14040,41 +13987,27 @@ private native void subscribeClusterRevisionAttribute(long chipClusterPtr, , int minInterval, int maxInterval); } - public static class RefrigeratorAndTemperatureControlledCabinetModeSelectCluster extends BaseChipCluster { + public static class RefrigeratorAndTemperatureControlledCabinetModeCluster extends BaseChipCluster { public static final long CLUSTER_ID = 82L; - public RefrigeratorAndTemperatureControlledCabinetModeSelectCluster(long devicePtr, int endpointId) { + public RefrigeratorAndTemperatureControlledCabinetModeCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode) { changeToMode(chipClusterPtr, callback, newMode, null); } - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode , int timedInvokeTimeoutMs) { changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, null); - } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode - , int timedInvokeTimeoutMs) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); - } - private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback - , Integer newMode - , @Nullable Integer timedInvokeTimeoutMs); - private native void changeToModeWithStatus(long chipClusterPtr, ChangeToModeResponseCallback Callback + private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback , Integer newMode , @Nullable Integer timedInvokeTimeoutMs); public interface ChangeToModeResponseCallback { @@ -14085,7 +14018,7 @@ public interface ChangeToModeResponseCallback { public interface SupportedModesAttributeCallback { - void onSuccess( List valueList); + void onSuccess( List valueList); void onError(Exception ex); default void onSubscriptionEstablished(long subscriptionId) {} } @@ -14120,18 +14053,6 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished(long subscriptionId) {} } - public void readDescriptionAttribute( - CharStringAttributeCallback callback - ) { - readDescriptionAttribute(chipClusterPtr, callback); - } - public void subscribeDescriptionAttribute( - CharStringAttributeCallback callback -, - int minInterval, int maxInterval) { - subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - public void readSupportedModesAttribute( SupportedModesAttributeCallback callback ) { @@ -14266,13 +14187,6 @@ public void subscribeClusterRevisionAttribute( subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - private native void readDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback - ); - private native void subscribeDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback -, int minInterval, int maxInterval); - private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback ); @@ -14603,41 +14517,27 @@ private native void subscribeClusterRevisionAttribute(long chipClusterPtr, , int minInterval, int maxInterval); } - public static class RvcRunModeSelectCluster extends BaseChipCluster { + public static class RvcRunModeCluster extends BaseChipCluster { public static final long CLUSTER_ID = 84L; - public RvcRunModeSelectCluster(long devicePtr, int endpointId) { + public RvcRunModeCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode) { changeToMode(chipClusterPtr, callback, newMode, null); } - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode , int timedInvokeTimeoutMs) { changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, null); - } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode - , int timedInvokeTimeoutMs) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); - } - private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback - , Integer newMode - , @Nullable Integer timedInvokeTimeoutMs); - private native void changeToModeWithStatus(long chipClusterPtr, ChangeToModeResponseCallback Callback + private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback , Integer newMode , @Nullable Integer timedInvokeTimeoutMs); public interface ChangeToModeResponseCallback { @@ -14648,7 +14548,7 @@ public interface ChangeToModeResponseCallback { public interface SupportedModesAttributeCallback { - void onSuccess( List valueList); + void onSuccess( List valueList); void onError(Exception ex); default void onSubscriptionEstablished(long subscriptionId) {} } @@ -14683,18 +14583,6 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished(long subscriptionId) {} } - public void readDescriptionAttribute( - CharStringAttributeCallback callback - ) { - readDescriptionAttribute(chipClusterPtr, callback); - } - public void subscribeDescriptionAttribute( - CharStringAttributeCallback callback -, - int minInterval, int maxInterval) { - subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - public void readSupportedModesAttribute( SupportedModesAttributeCallback callback ) { @@ -14829,13 +14717,6 @@ public void subscribeClusterRevisionAttribute( subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - private native void readDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback - ); - private native void subscribeDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback -, int minInterval, int maxInterval); - private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback ); @@ -14911,41 +14792,27 @@ private native void subscribeClusterRevisionAttribute(long chipClusterPtr, , int minInterval, int maxInterval); } - public static class RvcCleanModeSelectCluster extends BaseChipCluster { + public static class RvcCleanModeCluster extends BaseChipCluster { public static final long CLUSTER_ID = 85L; - public RvcCleanModeSelectCluster(long devicePtr, int endpointId) { + public RvcCleanModeCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode) { changeToMode(chipClusterPtr, callback, newMode, null); } - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode , int timedInvokeTimeoutMs) { changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, null); - } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode - , int timedInvokeTimeoutMs) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); - } - private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback - , Integer newMode - , @Nullable Integer timedInvokeTimeoutMs); - private native void changeToModeWithStatus(long chipClusterPtr, ChangeToModeResponseCallback Callback + private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback , Integer newMode , @Nullable Integer timedInvokeTimeoutMs); public interface ChangeToModeResponseCallback { @@ -14956,7 +14823,7 @@ public interface ChangeToModeResponseCallback { public interface SupportedModesAttributeCallback { - void onSuccess( List valueList); + void onSuccess( List valueList); void onError(Exception ex); default void onSubscriptionEstablished(long subscriptionId) {} } @@ -14991,18 +14858,6 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished(long subscriptionId) {} } - public void readDescriptionAttribute( - CharStringAttributeCallback callback - ) { - readDescriptionAttribute(chipClusterPtr, callback); - } - public void subscribeDescriptionAttribute( - CharStringAttributeCallback callback -, - int minInterval, int maxInterval) { - subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - public void readSupportedModesAttribute( SupportedModesAttributeCallback callback ) { @@ -15137,13 +14992,6 @@ public void subscribeClusterRevisionAttribute( subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - private native void readDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback - ); - private native void subscribeDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback -, int minInterval, int maxInterval); - private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback ); @@ -15668,41 +15516,27 @@ private native void subscribeClusterRevisionAttribute(long chipClusterPtr, , int minInterval, int maxInterval); } - public static class DishwasherModeSelectCluster extends BaseChipCluster { + public static class DishwasherModeCluster extends BaseChipCluster { public static final long CLUSTER_ID = 89L; - public DishwasherModeSelectCluster(long devicePtr, int endpointId) { + public DishwasherModeCluster(long devicePtr, int endpointId) { super(devicePtr, endpointId); } @Override public native long initWithDevice(long devicePtr, int endpointId); - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode) { changeToMode(chipClusterPtr, callback, newMode, null); } - public void changeToMode(DefaultClusterCallback callback + public void changeToMode(ChangeToModeResponseCallback callback , Integer newMode , int timedInvokeTimeoutMs) { changeToMode(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, null); - } - - public void changeToModeWithStatus(ChangeToModeResponseCallback callback - , Integer newMode - , int timedInvokeTimeoutMs) { - changeToModeWithStatus(chipClusterPtr, callback, newMode, timedInvokeTimeoutMs); - } - private native void changeToMode(long chipClusterPtr, DefaultClusterCallback Callback - , Integer newMode - , @Nullable Integer timedInvokeTimeoutMs); - private native void changeToModeWithStatus(long chipClusterPtr, ChangeToModeResponseCallback Callback + private native void changeToMode(long chipClusterPtr, ChangeToModeResponseCallback Callback , Integer newMode , @Nullable Integer timedInvokeTimeoutMs); public interface ChangeToModeResponseCallback { @@ -15713,7 +15547,7 @@ public interface ChangeToModeResponseCallback { public interface SupportedModesAttributeCallback { - void onSuccess( List valueList); + void onSuccess( List valueList); void onError(Exception ex); default void onSubscriptionEstablished(long subscriptionId) {} } @@ -15748,18 +15582,6 @@ public interface AttributeListAttributeCallback { default void onSubscriptionEstablished(long subscriptionId) {} } - public void readDescriptionAttribute( - CharStringAttributeCallback callback - ) { - readDescriptionAttribute(chipClusterPtr, callback); - } - public void subscribeDescriptionAttribute( - CharStringAttributeCallback callback -, - int minInterval, int maxInterval) { - subscribeDescriptionAttribute(chipClusterPtr, callback, minInterval, maxInterval); - } - public void readSupportedModesAttribute( SupportedModesAttributeCallback callback ) { @@ -15894,13 +15716,6 @@ public void subscribeClusterRevisionAttribute( subscribeClusterRevisionAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - private native void readDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback - ); - private native void subscribeDescriptionAttribute(long chipClusterPtr, - CharStringAttributeCallback callback -, int minInterval, int maxInterval); - private native void readSupportedModesAttribute(long chipClusterPtr, SupportedModesAttributeCallback callback ); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java index c00922da385d68..77bdd9bce58781 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipIdLookup.java @@ -151,19 +151,19 @@ public static String clusterIdToName(long clusterId) { return "ModeSelect"; } if (clusterId == 81L) { - return "LaundryWasherModeSelect"; + return "LaundryWasherMode"; } if (clusterId == 82L) { - return "RefrigeratorAndTemperatureControlledCabinetModeSelect"; + return "RefrigeratorAndTemperatureControlledCabinetMode"; } if (clusterId == 83L) { return "WasherControls"; } if (clusterId == 84L) { - return "RvcRunModeSelect"; + return "RvcRunMode"; } if (clusterId == 85L) { - return "RvcCleanModeSelect"; + return "RvcCleanMode"; } if (clusterId == 86L) { return "TemperatureControl"; @@ -172,7 +172,7 @@ public static String clusterIdToName(long clusterId) { return "RefrigeratorAlarm"; } if (clusterId == 89L) { - return "DishwasherModeSelect"; + return "DishwasherMode"; } if (clusterId == 91L) { return "AirQuality"; @@ -2176,18 +2176,15 @@ public static String attributeIdToName(long clusterId, long attributeId) { } if (clusterId == 81L) { if (attributeId == 0L) { - return "Description"; - } - if (attributeId == 2L) { return "SupportedModes"; } - if (attributeId == 3L) { + if (attributeId == 1L) { return "CurrentMode"; } - if (attributeId == 4L) { + if (attributeId == 2L) { return "StartUpMode"; } - if (attributeId == 5L) { + if (attributeId == 3L) { return "OnMode"; } if (attributeId == 65528L) { @@ -2212,18 +2209,15 @@ public static String attributeIdToName(long clusterId, long attributeId) { } if (clusterId == 82L) { if (attributeId == 0L) { - return "Description"; - } - if (attributeId == 2L) { return "SupportedModes"; } - if (attributeId == 3L) { + if (attributeId == 1L) { return "CurrentMode"; } - if (attributeId == 4L) { + if (attributeId == 2L) { return "StartUpMode"; } - if (attributeId == 5L) { + if (attributeId == 3L) { return "OnMode"; } if (attributeId == 65528L) { @@ -2281,18 +2275,15 @@ public static String attributeIdToName(long clusterId, long attributeId) { } if (clusterId == 84L) { if (attributeId == 0L) { - return "Description"; - } - if (attributeId == 2L) { return "SupportedModes"; } - if (attributeId == 3L) { + if (attributeId == 1L) { return "CurrentMode"; } - if (attributeId == 4L) { + if (attributeId == 2L) { return "StartUpMode"; } - if (attributeId == 5L) { + if (attributeId == 3L) { return "OnMode"; } if (attributeId == 65528L) { @@ -2317,18 +2308,15 @@ public static String attributeIdToName(long clusterId, long attributeId) { } if (clusterId == 85L) { if (attributeId == 0L) { - return "Description"; - } - if (attributeId == 2L) { return "SupportedModes"; } - if (attributeId == 3L) { + if (attributeId == 1L) { return "CurrentMode"; } - if (attributeId == 4L) { + if (attributeId == 2L) { return "StartUpMode"; } - if (attributeId == 5L) { + if (attributeId == 3L) { return "OnMode"; } if (attributeId == 65528L) { @@ -2419,18 +2407,15 @@ public static String attributeIdToName(long clusterId, long attributeId) { } if (clusterId == 89L) { if (attributeId == 0L) { - return "Description"; - } - if (attributeId == 2L) { return "SupportedModes"; } - if (attributeId == 3L) { + if (attributeId == 1L) { return "CurrentMode"; } - if (attributeId == 4L) { + if (attributeId == 2L) { return "StartUpMode"; } - if (attributeId == 5L) { + if (attributeId == 3L) { return "OnMode"; } if (attributeId == 65528L) { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java index c6a21a366ae154..b024e13325d2b8 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipStructs.java @@ -1542,34 +1542,28 @@ public String toString() { } } -public static class ModeSelectClusterModeTagStruct { -public Optional mfgCode; +public static class ModeSelectClusterSemanticTagStruct { +public Integer mfgCode; public Integer value; -public Optional tagName; - public ModeSelectClusterModeTagStruct( - Optional mfgCode + public ModeSelectClusterSemanticTagStruct( + Integer mfgCode , Integer value - , Optional tagName ) { this.mfgCode = mfgCode; this.value = value; - this.tagName = tagName; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("ModeSelectClusterModeTagStruct {\n"); + output.append("ModeSelectClusterSemanticTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); output.append("\tvalue: "); output.append(value); output.append("\n"); - output.append("\ttagName: "); - output.append(tagName); - output.append("\n"); output.append("}\n"); return output.toString(); } @@ -1578,16 +1572,16 @@ public String toString() { public static class ModeSelectClusterModeOptionStruct { public String label; public Integer mode; -public ArrayList modeTags; +public ArrayList semanticTags; public ModeSelectClusterModeOptionStruct( String label , Integer mode - , ArrayList modeTags + , ArrayList semanticTags ) { this.label = label; this.mode = mode; - this.modeTags = modeTags; + this.semanticTags = semanticTags; } @Override @@ -1600,56 +1594,50 @@ public String toString() { output.append("\tmode: "); output.append(mode); output.append("\n"); - output.append("\tmodeTags: "); - output.append(modeTags); + output.append("\tsemanticTags: "); + output.append(semanticTags); output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class LaundryWasherModeSelectClusterModeTagStruct { +public static class LaundryWasherModeClusterModeTagStruct { public Optional mfgCode; public Integer value; -public Optional tagName; - public LaundryWasherModeSelectClusterModeTagStruct( + public LaundryWasherModeClusterModeTagStruct( Optional mfgCode , Integer value - , Optional tagName ) { this.mfgCode = mfgCode; this.value = value; - this.tagName = tagName; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("LaundryWasherModeSelectClusterModeTagStruct {\n"); + output.append("LaundryWasherModeClusterModeTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); output.append("\tvalue: "); output.append(value); output.append("\n"); - output.append("\ttagName: "); - output.append(tagName); - output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class LaundryWasherModeSelectClusterModeOptionStruct { +public static class LaundryWasherModeClusterModeOptionStruct { public String label; public Integer mode; -public ArrayList modeTags; +public ArrayList modeTags; - public LaundryWasherModeSelectClusterModeOptionStruct( + public LaundryWasherModeClusterModeOptionStruct( String label , Integer mode - , ArrayList modeTags + , ArrayList modeTags ) { this.label = label; this.mode = mode; @@ -1659,7 +1647,7 @@ public LaundryWasherModeSelectClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("LaundryWasherModeSelectClusterModeOptionStruct {\n"); + output.append("LaundryWasherModeClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); @@ -1674,48 +1662,42 @@ public String toString() { } } -public static class RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct { +public static class RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct { public Optional mfgCode; public Integer value; -public Optional tagName; - public RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct( + public RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct( Optional mfgCode , Integer value - , Optional tagName ) { this.mfgCode = mfgCode; this.value = value; - this.tagName = tagName; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeTagStruct {\n"); + output.append("RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); output.append("\tvalue: "); output.append(value); output.append("\n"); - output.append("\ttagName: "); - output.append(tagName); - output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct { +public static class RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct { public String label; public Integer mode; -public ArrayList modeTags; +public ArrayList modeTags; - public RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct( + public RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct( String label , Integer mode - , ArrayList modeTags + , ArrayList modeTags ) { this.label = label; this.mode = mode; @@ -1725,7 +1707,7 @@ public RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStr @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RefrigeratorAndTemperatureControlledCabinetModeSelectClusterModeOptionStruct {\n"); + output.append("RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); @@ -1740,48 +1722,42 @@ public String toString() { } } -public static class RvcRunModeSelectClusterModeTagStruct { +public static class RvcRunModeClusterModeTagStruct { public Optional mfgCode; public Integer value; -public Optional tagName; - public RvcRunModeSelectClusterModeTagStruct( + public RvcRunModeClusterModeTagStruct( Optional mfgCode , Integer value - , Optional tagName ) { this.mfgCode = mfgCode; this.value = value; - this.tagName = tagName; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcRunModeSelectClusterModeTagStruct {\n"); + output.append("RvcRunModeClusterModeTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); output.append("\tvalue: "); output.append(value); output.append("\n"); - output.append("\ttagName: "); - output.append(tagName); - output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class RvcRunModeSelectClusterModeOptionStruct { +public static class RvcRunModeClusterModeOptionStruct { public String label; public Integer mode; -public ArrayList modeTags; +public ArrayList modeTags; - public RvcRunModeSelectClusterModeOptionStruct( + public RvcRunModeClusterModeOptionStruct( String label , Integer mode - , ArrayList modeTags + , ArrayList modeTags ) { this.label = label; this.mode = mode; @@ -1791,7 +1767,7 @@ public RvcRunModeSelectClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcRunModeSelectClusterModeOptionStruct {\n"); + output.append("RvcRunModeClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); @@ -1806,48 +1782,42 @@ public String toString() { } } -public static class RvcCleanModeSelectClusterModeTagStruct { +public static class RvcCleanModeClusterModeTagStruct { public Optional mfgCode; public Integer value; -public Optional tagName; - public RvcCleanModeSelectClusterModeTagStruct( + public RvcCleanModeClusterModeTagStruct( Optional mfgCode , Integer value - , Optional tagName ) { this.mfgCode = mfgCode; this.value = value; - this.tagName = tagName; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcCleanModeSelectClusterModeTagStruct {\n"); + output.append("RvcCleanModeClusterModeTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); output.append("\tvalue: "); output.append(value); output.append("\n"); - output.append("\ttagName: "); - output.append(tagName); - output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class RvcCleanModeSelectClusterModeOptionStruct { +public static class RvcCleanModeClusterModeOptionStruct { public String label; public Integer mode; -public ArrayList modeTags; +public ArrayList modeTags; - public RvcCleanModeSelectClusterModeOptionStruct( + public RvcCleanModeClusterModeOptionStruct( String label , Integer mode - , ArrayList modeTags + , ArrayList modeTags ) { this.label = label; this.mode = mode; @@ -1857,7 +1827,7 @@ public RvcCleanModeSelectClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("RvcCleanModeSelectClusterModeOptionStruct {\n"); + output.append("RvcCleanModeClusterModeOptionStruct {\n"); output.append("\tlabel: "); output.append(label); output.append("\n"); @@ -1872,48 +1842,42 @@ public String toString() { } } -public static class DishwasherModeSelectClusterModeTagStruct { +public static class DishwasherModeClusterModeTagStruct { public Optional mfgCode; public Integer value; -public Optional tagName; - public DishwasherModeSelectClusterModeTagStruct( + public DishwasherModeClusterModeTagStruct( Optional mfgCode , Integer value - , Optional tagName ) { this.mfgCode = mfgCode; this.value = value; - this.tagName = tagName; } @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("DishwasherModeSelectClusterModeTagStruct {\n"); + output.append("DishwasherModeClusterModeTagStruct {\n"); output.append("\tmfgCode: "); output.append(mfgCode); output.append("\n"); output.append("\tvalue: "); output.append(value); output.append("\n"); - output.append("\ttagName: "); - output.append(tagName); - output.append("\n"); output.append("}\n"); return output.toString(); } } -public static class DishwasherModeSelectClusterModeOptionStruct { +public static class DishwasherModeClusterModeOptionStruct { public String label; public Integer mode; -public ArrayList modeTags; +public ArrayList modeTags; - public DishwasherModeSelectClusterModeOptionStruct( + public DishwasherModeClusterModeOptionStruct( String label , Integer mode - , ArrayList modeTags + , ArrayList modeTags ) { this.label = label; this.mode = mode; @@ -1923,7 +1887,7 @@ public DishwasherModeSelectClusterModeOptionStruct( @Override public String toString() { StringBuilder output = new StringBuilder(); - output.append("DishwasherModeSelectClusterModeOptionStruct {\n"); + output.append("DishwasherModeClusterModeOptionStruct {\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 906e035ca7cdb4..3db9f1bd3dba72 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterInfoMapping.java @@ -5757,29 +5757,6 @@ public void onError(Exception ex) { } } - public static class DelegatedModeSelectClusterChangeToModeResponseCallback implements ChipClusters.ModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { - private ClusterCommandCallback callback; - @Override - public void setCallbackDelegate(ClusterCommandCallback callback) { - this.callback = callback; - } - - @Override - public void onSuccess(Integer Status, Optional StatusText) { - Map responseValues = new LinkedHashMap<>(); - CommandResponseInfo StatusResponseValue = new CommandResponseInfo("Status", "Integer"); - responseValues.put(StatusResponseValue, Status); - CommandResponseInfo StatusTextResponseValue = new CommandResponseInfo("StatusText", "Optional"); - responseValues.put(StatusTextResponseValue, StatusText); - callback.onSuccess(responseValues); - } - - @Override - public void onError(Exception error) { - callback.onFailure(error); - } - } - public static class DelegatedModeSelectClusterStandardNamespaceAttributeCallback implements ChipClusters.ModeSelectCluster.StandardNamespaceAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override @@ -5933,7 +5910,7 @@ public void onError(Exception ex) { } } - public static class DelegatedLaundryWasherModeSelectClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterChangeToModeResponseCallback implements ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -5956,7 +5933,7 @@ public void onError(Exception error) { } } - public static class DelegatedLaundryWasherModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterSupportedModesAttributeCallback implements ChipClusters.LaundryWasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -5964,9 +5941,9 @@ 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"); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -5975,7 +5952,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedLaundryWasherModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterStartUpModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -5994,7 +5971,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedLaundryWasherModeSelectClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterOnModeAttributeCallback implements ChipClusters.LaundryWasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6013,7 +5990,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedLaundryWasherModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6032,7 +6009,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedLaundryWasherModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6051,7 +6028,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedLaundryWasherModeSelectClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterEventListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6070,7 +6047,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedLaundryWasherModeSelectClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedLaundryWasherModeClusterAttributeListAttributeCallback implements ChipClusters.LaundryWasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6090,7 +6067,7 @@ public void onError(Exception ex) { } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6113,7 +6090,7 @@ public void onError(Exception error) { } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterSupportedModesAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6121,9 +6098,9 @@ 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"); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -6132,7 +6109,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterStartUpModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6151,7 +6128,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterOnModeAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.OnModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6170,7 +6147,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6189,7 +6166,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6208,7 +6185,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterEventListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.EventListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6227,7 +6204,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterAttributeListAttributeCallback implements ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6381,7 +6358,7 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcRunModeSelectClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterChangeToModeResponseCallback implements ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6404,7 +6381,7 @@ public void onError(Exception error) { } } - public static class DelegatedRvcRunModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcRunModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6412,9 +6389,9 @@ 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"); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -6423,7 +6400,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcRunModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterStartUpModeAttributeCallback implements ChipClusters.RvcRunModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6442,7 +6419,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcRunModeSelectClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterOnModeAttributeCallback implements ChipClusters.RvcRunModeCluster.OnModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6461,7 +6438,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcRunModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6480,7 +6457,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcRunModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcRunModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6499,7 +6476,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcRunModeSelectClusterEventListAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterEventListAttributeCallback implements ChipClusters.RvcRunModeCluster.EventListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6518,7 +6495,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcRunModeSelectClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcRunModeClusterAttributeListAttributeCallback implements ChipClusters.RvcRunModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6538,7 +6515,7 @@ public void onError(Exception ex) { } } - public static class DelegatedRvcCleanModeSelectClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterChangeToModeResponseCallback implements ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6561,7 +6538,7 @@ public void onError(Exception error) { } } - public static class DelegatedRvcCleanModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterSupportedModesAttributeCallback implements ChipClusters.RvcCleanModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6569,9 +6546,9 @@ 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"); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -6580,7 +6557,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcCleanModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterStartUpModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6599,7 +6576,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcCleanModeSelectClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterOnModeAttributeCallback implements ChipClusters.RvcCleanModeCluster.OnModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6618,7 +6595,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcCleanModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6637,7 +6614,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcCleanModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6656,7 +6633,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcCleanModeSelectClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterEventListAttributeCallback implements ChipClusters.RvcCleanModeCluster.EventListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6675,7 +6652,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedRvcCleanModeSelectClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedRvcCleanModeClusterAttributeListAttributeCallback implements ChipClusters.RvcCleanModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6868,7 +6845,7 @@ public void onError(Exception ex) { } } - public static class DelegatedDishwasherModeSelectClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeSelectCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterChangeToModeResponseCallback implements ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6891,7 +6868,7 @@ public void onError(Exception error) { } } - public static class DelegatedDishwasherModeSelectClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterSupportedModesAttributeCallback implements ChipClusters.DishwasherModeCluster.SupportedModesAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6899,9 +6876,9 @@ 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"); + CommandResponseInfo commandResponseInfo = new CommandResponseInfo("valueList", "List"); responseValues.put(commandResponseInfo, valueList); callback.onSuccess(responseValues); } @@ -6910,7 +6887,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedDishwasherModeSelectClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterStartUpModeAttributeCallback implements ChipClusters.DishwasherModeCluster.StartUpModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6929,7 +6906,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedDishwasherModeSelectClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.OnModeAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterOnModeAttributeCallback implements ChipClusters.DishwasherModeCluster.OnModeAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6948,7 +6925,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedDishwasherModeSelectClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterGeneratedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.GeneratedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6967,7 +6944,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedDishwasherModeSelectClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterAcceptedCommandListAttributeCallback implements ChipClusters.DishwasherModeCluster.AcceptedCommandListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -6986,7 +6963,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedDishwasherModeSelectClusterEventListAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.EventListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterEventListAttributeCallback implements ChipClusters.DishwasherModeCluster.EventListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -7005,7 +6982,7 @@ public void onError(Exception ex) { callback.onFailure(ex); } } - public static class DelegatedDishwasherModeSelectClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeSelectCluster.AttributeListAttributeCallback, DelegatedClusterCallback { + public static class DelegatedDishwasherModeClusterAttributeListAttributeCallback implements ChipClusters.DishwasherModeCluster.AttributeListAttributeCallback, DelegatedClusterCallback { private ClusterCommandCallback callback; @Override public void setCallbackDelegate(ClusterCommandCallback callback) { @@ -19993,30 +19970,30 @@ public Map initializeClusterMap() { ClusterInfo modeSelectClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.ModeSelectCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("modeSelect", modeSelectClusterInfo); - ClusterInfo laundryWasherModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.LaundryWasherModeSelectCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("laundryWasherModeSelect", laundryWasherModeSelectClusterInfo); - ClusterInfo refrigeratorAndTemperatureControlledCabinetModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("refrigeratorAndTemperatureControlledCabinetModeSelect", refrigeratorAndTemperatureControlledCabinetModeSelectClusterInfo); + ClusterInfo laundryWasherModeClusterInfo = new ClusterInfo( + (ptr, endpointId) -> new ChipClusters.LaundryWasherModeCluster(ptr, endpointId), new HashMap<>()); + clusterMap.put("laundryWasherMode", laundryWasherModeClusterInfo); + ClusterInfo refrigeratorAndTemperatureControlledCabinetModeClusterInfo = new ClusterInfo( + (ptr, endpointId) -> new ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster(ptr, endpointId), new HashMap<>()); + clusterMap.put("refrigeratorAndTemperatureControlledCabinetMode", refrigeratorAndTemperatureControlledCabinetModeClusterInfo); ClusterInfo washerControlsClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.WasherControlsCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("washerControls", washerControlsClusterInfo); - ClusterInfo rvcRunModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.RvcRunModeSelectCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("rvcRunModeSelect", rvcRunModeSelectClusterInfo); - ClusterInfo rvcCleanModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.RvcCleanModeSelectCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("rvcCleanModeSelect", rvcCleanModeSelectClusterInfo); + ClusterInfo rvcRunModeClusterInfo = new ClusterInfo( + (ptr, endpointId) -> new ChipClusters.RvcRunModeCluster(ptr, endpointId), new HashMap<>()); + clusterMap.put("rvcRunMode", rvcRunModeClusterInfo); + ClusterInfo rvcCleanModeClusterInfo = new ClusterInfo( + (ptr, endpointId) -> new ChipClusters.RvcCleanModeCluster(ptr, endpointId), new HashMap<>()); + clusterMap.put("rvcCleanMode", rvcCleanModeClusterInfo); ClusterInfo temperatureControlClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.TemperatureControlCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("temperatureControl", temperatureControlClusterInfo); ClusterInfo refrigeratorAlarmClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.RefrigeratorAlarmCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("refrigeratorAlarm", refrigeratorAlarmClusterInfo); - ClusterInfo dishwasherModeSelectClusterInfo = new ClusterInfo( - (ptr, endpointId) -> new ChipClusters.DishwasherModeSelectCluster(ptr, endpointId), new HashMap<>()); - clusterMap.put("dishwasherModeSelect", dishwasherModeSelectClusterInfo); + ClusterInfo dishwasherModeClusterInfo = new ClusterInfo( + (ptr, endpointId) -> new ChipClusters.DishwasherModeCluster(ptr, endpointId), new HashMap<>()); + clusterMap.put("dishwasherMode", dishwasherModeClusterInfo); ClusterInfo airQualityClusterInfo = new ClusterInfo( (ptr, endpointId) -> new ChipClusters.AirQualityCluster(ptr, endpointId), new HashMap<>()); clusterMap.put("airQuality", airQualityClusterInfo); @@ -20309,14 +20286,14 @@ public void combineCommand(Map destination, Map> getCommandMap() { modeSelectchangeToModeCommandParams ); modeSelectClusterInteractionInfoMap.put("changeToMode", modeSelectchangeToModeInteractionInfo); - Map modeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo modeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - modeSelectchangeToModeWithStatusCommandParams.put("newMode",modeSelectchangeToModeWithStatusnewModeCommandParameterInfo); - - InteractionInfo modeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.ModeSelectCluster) cluster) - .changeToModeWithStatus((ChipClusters.ModeSelectCluster.ChangeToModeResponseCallback) callback - , (Integer) - commandArguments.get("newMode") - - ); - }, - () -> new DelegatedModeSelectClusterChangeToModeResponseCallback(), - modeSelectchangeToModeWithStatusCommandParams - ); - modeSelectClusterInteractionInfoMap.put("changeToModeWithStatus", modeSelectchangeToModeWithStatusInteractionInfo); commandMap.put("modeSelect", modeSelectClusterInteractionInfoMap); - Map laundryWasherModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); - Map laundryWasherModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo laundryWasherModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - laundryWasherModeSelectchangeToModeCommandParams.put("newMode",laundryWasherModeSelectchangeToModenewModeCommandParameterInfo); + Map laundryWasherModeClusterInteractionInfoMap = new LinkedHashMap<>(); + Map laundryWasherModechangeToModeCommandParams = new LinkedHashMap(); + CommandParameterInfo laundryWasherModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); + laundryWasherModechangeToModeCommandParams.put("newMode",laundryWasherModechangeToModenewModeCommandParameterInfo); - InteractionInfo laundryWasherModeSelectchangeToModeInteractionInfo = new InteractionInfo( + InteractionInfo laundryWasherModechangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster) - .changeToMode((DefaultClusterCallback) callback + ((ChipClusters.LaundryWasherModeCluster) cluster) + .changeToMode((ChipClusters.LaundryWasherModeCluster.ChangeToModeResponseCallback) callback , (Integer) commandArguments.get("newMode") ); }, - () -> new DelegatedDefaultClusterCallback(), - laundryWasherModeSelectchangeToModeCommandParams + () -> new DelegatedLaundryWasherModeClusterChangeToModeResponseCallback(), + laundryWasherModechangeToModeCommandParams ); - laundryWasherModeSelectClusterInteractionInfoMap.put("changeToMode", laundryWasherModeSelectchangeToModeInteractionInfo); - Map laundryWasherModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo laundryWasherModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - laundryWasherModeSelectchangeToModeWithStatusCommandParams.put("newMode",laundryWasherModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); + laundryWasherModeClusterInteractionInfoMap.put("changeToMode", laundryWasherModechangeToModeInteractionInfo); + commandMap.put("laundryWasherMode", laundryWasherModeClusterInteractionInfoMap); + Map refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap = new LinkedHashMap<>(); + Map refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams = new LinkedHashMap(); + CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); + refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams.put("newMode",refrigeratorAndTemperatureControlledCabinetModechangeToModenewModeCommandParameterInfo); - InteractionInfo laundryWasherModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( + InteractionInfo refrigeratorAndTemperatureControlledCabinetModechangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.LaundryWasherModeSelectCluster) cluster) - .changeToModeWithStatus((ChipClusters.LaundryWasherModeSelectCluster.ChangeToModeResponseCallback) callback + ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster) cluster) + .changeToMode((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeCluster.ChangeToModeResponseCallback) callback , (Integer) commandArguments.get("newMode") ); }, - () -> new DelegatedLaundryWasherModeSelectClusterChangeToModeResponseCallback(), - laundryWasherModeSelectchangeToModeWithStatusCommandParams + () -> new DelegatedRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeResponseCallback(), + refrigeratorAndTemperatureControlledCabinetModechangeToModeCommandParams ); - laundryWasherModeSelectClusterInteractionInfoMap.put("changeToModeWithStatus", laundryWasherModeSelectchangeToModeWithStatusInteractionInfo); - commandMap.put("laundryWasherModeSelect", laundryWasherModeSelectClusterInteractionInfoMap); - Map refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); - Map refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeCommandParams.put("newMode",refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModenewModeCommandParameterInfo); - - 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 refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusCommandParams.put("newMode",refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); - - InteractionInfo refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster) cluster) - .changeToModeWithStatus((ChipClusters.RefrigeratorAndTemperatureControlledCabinetModeSelectCluster.ChangeToModeResponseCallback) callback - , (Integer) - commandArguments.get("newMode") - - ); - }, - () -> new DelegatedRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeResponseCallback(), - refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusCommandParams - ); - refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap.put("changeToModeWithStatus", refrigeratorAndTemperatureControlledCabinetModeSelectchangeToModeWithStatusInteractionInfo); - commandMap.put("refrigeratorAndTemperatureControlledCabinetModeSelect", refrigeratorAndTemperatureControlledCabinetModeSelectClusterInteractionInfoMap); + refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap.put("changeToMode", refrigeratorAndTemperatureControlledCabinetModechangeToModeInteractionInfo); + commandMap.put("refrigeratorAndTemperatureControlledCabinetMode", refrigeratorAndTemperatureControlledCabinetModeClusterInteractionInfoMap); Map washerControlsClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("washerControls", washerControlsClusterInteractionInfoMap); - Map rvcRunModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); - Map rvcRunModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcRunModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcRunModeSelectchangeToModeCommandParams.put("newMode",rvcRunModeSelectchangeToModenewModeCommandParameterInfo); - - InteractionInfo rvcRunModeSelectchangeToModeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster) - .changeToMode((DefaultClusterCallback) callback - , (Integer) - commandArguments.get("newMode") - - ); - }, - () -> new DelegatedDefaultClusterCallback(), - rvcRunModeSelectchangeToModeCommandParams - ); - rvcRunModeSelectClusterInteractionInfoMap.put("changeToMode", rvcRunModeSelectchangeToModeInteractionInfo); - Map rvcRunModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcRunModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcRunModeSelectchangeToModeWithStatusCommandParams.put("newMode",rvcRunModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); + Map rvcRunModeClusterInteractionInfoMap = new LinkedHashMap<>(); + Map rvcRunModechangeToModeCommandParams = new LinkedHashMap(); + CommandParameterInfo rvcRunModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); + rvcRunModechangeToModeCommandParams.put("newMode",rvcRunModechangeToModenewModeCommandParameterInfo); - InteractionInfo rvcRunModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( + InteractionInfo rvcRunModechangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcRunModeSelectCluster) cluster) - .changeToModeWithStatus((ChipClusters.RvcRunModeSelectCluster.ChangeToModeResponseCallback) callback + ((ChipClusters.RvcRunModeCluster) cluster) + .changeToMode((ChipClusters.RvcRunModeCluster.ChangeToModeResponseCallback) callback , (Integer) commandArguments.get("newMode") ); }, - () -> new DelegatedRvcRunModeSelectClusterChangeToModeResponseCallback(), - rvcRunModeSelectchangeToModeWithStatusCommandParams + () -> new DelegatedRvcRunModeClusterChangeToModeResponseCallback(), + rvcRunModechangeToModeCommandParams ); - rvcRunModeSelectClusterInteractionInfoMap.put("changeToModeWithStatus", rvcRunModeSelectchangeToModeWithStatusInteractionInfo); - commandMap.put("rvcRunModeSelect", rvcRunModeSelectClusterInteractionInfoMap); - Map rvcCleanModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); - Map rvcCleanModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcCleanModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcCleanModeSelectchangeToModeCommandParams.put("newMode",rvcCleanModeSelectchangeToModenewModeCommandParameterInfo); + rvcRunModeClusterInteractionInfoMap.put("changeToMode", rvcRunModechangeToModeInteractionInfo); + commandMap.put("rvcRunMode", rvcRunModeClusterInteractionInfoMap); + Map rvcCleanModeClusterInteractionInfoMap = new LinkedHashMap<>(); + Map rvcCleanModechangeToModeCommandParams = new LinkedHashMap(); + CommandParameterInfo rvcCleanModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); + rvcCleanModechangeToModeCommandParams.put("newMode",rvcCleanModechangeToModenewModeCommandParameterInfo); - InteractionInfo rvcCleanModeSelectchangeToModeInteractionInfo = new InteractionInfo( + InteractionInfo rvcCleanModechangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster) - .changeToMode((DefaultClusterCallback) callback - , (Integer) - commandArguments.get("newMode") - - ); - }, - () -> new DelegatedDefaultClusterCallback(), - rvcCleanModeSelectchangeToModeCommandParams - ); - rvcCleanModeSelectClusterInteractionInfoMap.put("changeToMode", rvcCleanModeSelectchangeToModeInteractionInfo); - Map rvcCleanModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo rvcCleanModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - rvcCleanModeSelectchangeToModeWithStatusCommandParams.put("newMode",rvcCleanModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); - - InteractionInfo rvcCleanModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.RvcCleanModeSelectCluster) cluster) - .changeToModeWithStatus((ChipClusters.RvcCleanModeSelectCluster.ChangeToModeResponseCallback) callback + ((ChipClusters.RvcCleanModeCluster) cluster) + .changeToMode((ChipClusters.RvcCleanModeCluster.ChangeToModeResponseCallback) callback , (Integer) commandArguments.get("newMode") ); }, - () -> new DelegatedRvcCleanModeSelectClusterChangeToModeResponseCallback(), - rvcCleanModeSelectchangeToModeWithStatusCommandParams + () -> new DelegatedRvcCleanModeClusterChangeToModeResponseCallback(), + rvcCleanModechangeToModeCommandParams ); - rvcCleanModeSelectClusterInteractionInfoMap.put("changeToModeWithStatus", rvcCleanModeSelectchangeToModeWithStatusInteractionInfo); - commandMap.put("rvcCleanModeSelect", rvcCleanModeSelectClusterInteractionInfoMap); + rvcCleanModeClusterInteractionInfoMap.put("changeToMode", rvcCleanModechangeToModeInteractionInfo); + commandMap.put("rvcCleanMode", rvcCleanModeClusterInteractionInfoMap); Map temperatureControlClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("temperatureControl", temperatureControlClusterInteractionInfoMap); Map refrigeratorAlarmClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("refrigeratorAlarm", refrigeratorAlarmClusterInteractionInfoMap); - Map dishwasherModeSelectClusterInteractionInfoMap = new LinkedHashMap<>(); - Map dishwasherModeSelectchangeToModeCommandParams = new LinkedHashMap(); - CommandParameterInfo dishwasherModeSelectchangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - dishwasherModeSelectchangeToModeCommandParams.put("newMode",dishwasherModeSelectchangeToModenewModeCommandParameterInfo); - - InteractionInfo dishwasherModeSelectchangeToModeInteractionInfo = new InteractionInfo( - (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster) - .changeToMode((DefaultClusterCallback) callback - , (Integer) - commandArguments.get("newMode") - - ); - }, - () -> new DelegatedDefaultClusterCallback(), - dishwasherModeSelectchangeToModeCommandParams - ); - dishwasherModeSelectClusterInteractionInfoMap.put("changeToMode", dishwasherModeSelectchangeToModeInteractionInfo); - Map dishwasherModeSelectchangeToModeWithStatusCommandParams = new LinkedHashMap(); - CommandParameterInfo dishwasherModeSelectchangeToModeWithStatusnewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); - dishwasherModeSelectchangeToModeWithStatusCommandParams.put("newMode",dishwasherModeSelectchangeToModeWithStatusnewModeCommandParameterInfo); + Map dishwasherModeClusterInteractionInfoMap = new LinkedHashMap<>(); + Map dishwasherModechangeToModeCommandParams = new LinkedHashMap(); + CommandParameterInfo dishwasherModechangeToModenewModeCommandParameterInfo = new CommandParameterInfo("newMode", Integer.class, Integer.class); + dishwasherModechangeToModeCommandParams.put("newMode",dishwasherModechangeToModenewModeCommandParameterInfo); - InteractionInfo dishwasherModeSelectchangeToModeWithStatusInteractionInfo = new InteractionInfo( + InteractionInfo dishwasherModechangeToModeInteractionInfo = new InteractionInfo( (cluster, callback, commandArguments) -> { - ((ChipClusters.DishwasherModeSelectCluster) cluster) - .changeToModeWithStatus((ChipClusters.DishwasherModeSelectCluster.ChangeToModeResponseCallback) callback + ((ChipClusters.DishwasherModeCluster) cluster) + .changeToMode((ChipClusters.DishwasherModeCluster.ChangeToModeResponseCallback) callback , (Integer) commandArguments.get("newMode") ); }, - () -> new DelegatedDishwasherModeSelectClusterChangeToModeResponseCallback(), - dishwasherModeSelectchangeToModeWithStatusCommandParams + () -> new DelegatedDishwasherModeClusterChangeToModeResponseCallback(), + dishwasherModechangeToModeCommandParams ); - dishwasherModeSelectClusterInteractionInfoMap.put("changeToModeWithStatus", dishwasherModeSelectchangeToModeWithStatusInteractionInfo); - commandMap.put("dishwasherModeSelect", dishwasherModeSelectClusterInteractionInfoMap); + dishwasherModeClusterInteractionInfoMap.put("changeToMode", dishwasherModechangeToModeInteractionInfo); + commandMap.put("dishwasherMode", dishwasherModeClusterInteractionInfoMap); Map airQualityClusterInteractionInfoMap = new LinkedHashMap<>(); commandMap.put("airQuality", airQualityClusterInteractionInfoMap); Map smokeCoAlarmClusterInteractionInfoMap = new LinkedHashMap<>(); diff --git a/src/controller/python/chip/clusters/CHIPClusters.py b/src/controller/python/chip/clusters/CHIPClusters.py index 5bc1773b7ce3ce..ebcb10cbbb1287 100644 --- a/src/controller/python/chip/clusters/CHIPClusters.py +++ b/src/controller/python/chip/clusters/CHIPClusters.py @@ -4279,13 +4279,6 @@ class ChipClusters: "newMode": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeToModeWithStatus", - "args": { - "newMode": "int", - }, - }, }, "attributes": { 0x00000000: { @@ -4364,8 +4357,8 @@ class ChipClusters: }, }, } - _LAUNDRY_WASHER_MODE_SELECT_CLUSTER_INFO = { - "clusterName": "LaundryWasherModeSelect", + _LAUNDRY_WASHER_MODE_CLUSTER_INFO = { + "clusterName": "LaundryWasherMode", "clusterId": 0x00000051, "commands": { 0x00000000: { @@ -4375,43 +4368,30 @@ class ChipClusters: "newMode": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeToModeWithStatus", - "args": { - "newMode": "int", - }, - }, }, "attributes": { 0x00000000: { - "attributeName": "Description", - "attributeId": 0x00000000, - "type": "str", - "reportable": True, - }, - 0x00000002: { "attributeName": "SupportedModes", - "attributeId": 0x00000002, + "attributeId": 0x00000000, "type": "", "reportable": True, }, - 0x00000003: { + 0x00000001: { "attributeName": "CurrentMode", - "attributeId": 0x00000003, + "attributeId": 0x00000001, "type": "int", "reportable": True, }, - 0x00000004: { + 0x00000002: { "attributeName": "StartUpMode", - "attributeId": 0x00000004, + "attributeId": 0x00000002, "type": "int", "reportable": True, "writable": True, }, - 0x00000005: { + 0x00000003: { "attributeName": "OnMode", - "attributeId": 0x00000005, + "attributeId": 0x00000003, "type": "int", "reportable": True, "writable": True, @@ -4454,8 +4434,8 @@ class ChipClusters: }, }, } - _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_INFO = { - "clusterName": "RefrigeratorAndTemperatureControlledCabinetModeSelect", + _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO = { + "clusterName": "RefrigeratorAndTemperatureControlledCabinetMode", "clusterId": 0x00000052, "commands": { 0x00000000: { @@ -4465,43 +4445,30 @@ class ChipClusters: "newMode": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeToModeWithStatus", - "args": { - "newMode": "int", - }, - }, }, "attributes": { 0x00000000: { - "attributeName": "Description", - "attributeId": 0x00000000, - "type": "str", - "reportable": True, - }, - 0x00000002: { "attributeName": "SupportedModes", - "attributeId": 0x00000002, + "attributeId": 0x00000000, "type": "", "reportable": True, }, - 0x00000003: { + 0x00000001: { "attributeName": "CurrentMode", - "attributeId": 0x00000003, + "attributeId": 0x00000001, "type": "int", "reportable": True, }, - 0x00000004: { + 0x00000002: { "attributeName": "StartUpMode", - "attributeId": 0x00000004, + "attributeId": 0x00000002, "type": "int", "reportable": True, "writable": True, }, - 0x00000005: { + 0x00000003: { "attributeName": "OnMode", - "attributeId": 0x00000005, + "attributeId": 0x00000003, "type": "int", "reportable": True, "writable": True, @@ -4614,8 +4581,8 @@ class ChipClusters: }, }, } - _RVC_RUN_MODE_SELECT_CLUSTER_INFO = { - "clusterName": "RvcRunModeSelect", + _RVC_RUN_MODE_CLUSTER_INFO = { + "clusterName": "RvcRunMode", "clusterId": 0x00000054, "commands": { 0x00000000: { @@ -4625,43 +4592,30 @@ class ChipClusters: "newMode": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeToModeWithStatus", - "args": { - "newMode": "int", - }, - }, }, "attributes": { 0x00000000: { - "attributeName": "Description", - "attributeId": 0x00000000, - "type": "str", - "reportable": True, - }, - 0x00000002: { "attributeName": "SupportedModes", - "attributeId": 0x00000002, + "attributeId": 0x00000000, "type": "", "reportable": True, }, - 0x00000003: { + 0x00000001: { "attributeName": "CurrentMode", - "attributeId": 0x00000003, + "attributeId": 0x00000001, "type": "int", "reportable": True, }, - 0x00000004: { + 0x00000002: { "attributeName": "StartUpMode", - "attributeId": 0x00000004, + "attributeId": 0x00000002, "type": "int", "reportable": True, "writable": True, }, - 0x00000005: { + 0x00000003: { "attributeName": "OnMode", - "attributeId": 0x00000005, + "attributeId": 0x00000003, "type": "int", "reportable": True, "writable": True, @@ -4704,8 +4658,8 @@ class ChipClusters: }, }, } - _RVC_CLEAN_MODE_SELECT_CLUSTER_INFO = { - "clusterName": "RvcCleanModeSelect", + _RVC_CLEAN_MODE_CLUSTER_INFO = { + "clusterName": "RvcCleanMode", "clusterId": 0x00000055, "commands": { 0x00000000: { @@ -4715,43 +4669,30 @@ class ChipClusters: "newMode": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeToModeWithStatus", - "args": { - "newMode": "int", - }, - }, }, "attributes": { 0x00000000: { - "attributeName": "Description", - "attributeId": 0x00000000, - "type": "str", - "reportable": True, - }, - 0x00000002: { "attributeName": "SupportedModes", - "attributeId": 0x00000002, + "attributeId": 0x00000000, "type": "", "reportable": True, }, - 0x00000003: { + 0x00000001: { "attributeName": "CurrentMode", - "attributeId": 0x00000003, + "attributeId": 0x00000001, "type": "int", "reportable": True, }, - 0x00000004: { + 0x00000002: { "attributeName": "StartUpMode", - "attributeId": 0x00000004, + "attributeId": 0x00000002, "type": "int", "reportable": True, "writable": True, }, - 0x00000005: { + 0x00000003: { "attributeName": "OnMode", - "attributeId": 0x00000005, + "attributeId": 0x00000003, "type": "int", "reportable": True, "writable": True, @@ -4938,8 +4879,8 @@ class ChipClusters: }, }, } - _DISHWASHER_MODE_SELECT_CLUSTER_INFO = { - "clusterName": "DishwasherModeSelect", + _DISHWASHER_MODE_CLUSTER_INFO = { + "clusterName": "DishwasherMode", "clusterId": 0x00000059, "commands": { 0x00000000: { @@ -4949,43 +4890,30 @@ class ChipClusters: "newMode": "int", }, }, - 0x00000001: { - "commandId": 0x00000001, - "commandName": "ChangeToModeWithStatus", - "args": { - "newMode": "int", - }, - }, }, "attributes": { 0x00000000: { - "attributeName": "Description", - "attributeId": 0x00000000, - "type": "str", - "reportable": True, - }, - 0x00000002: { "attributeName": "SupportedModes", - "attributeId": 0x00000002, + "attributeId": 0x00000000, "type": "", "reportable": True, }, - 0x00000003: { + 0x00000001: { "attributeName": "CurrentMode", - "attributeId": 0x00000003, + "attributeId": 0x00000001, "type": "int", "reportable": True, }, - 0x00000004: { + 0x00000002: { "attributeName": "StartUpMode", - "attributeId": 0x00000004, + "attributeId": 0x00000002, "type": "int", "reportable": True, "writable": True, }, - 0x00000005: { + 0x00000003: { "attributeName": "OnMode", - "attributeId": 0x00000005, + "attributeId": 0x00000003, "type": "int", "reportable": True, "writable": True, @@ -15684,14 +15612,14 @@ class ChipClusters: 0x00000045: _BOOLEAN_STATE_CLUSTER_INFO, 0x00000046: _ICD_MANAGEMENT_CLUSTER_INFO, 0x00000050: _MODE_SELECT_CLUSTER_INFO, - 0x00000051: _LAUNDRY_WASHER_MODE_SELECT_CLUSTER_INFO, - 0x00000052: _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_INFO, + 0x00000051: _LAUNDRY_WASHER_MODE_CLUSTER_INFO, + 0x00000052: _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO, 0x00000053: _WASHER_CONTROLS_CLUSTER_INFO, - 0x00000054: _RVC_RUN_MODE_SELECT_CLUSTER_INFO, - 0x00000055: _RVC_CLEAN_MODE_SELECT_CLUSTER_INFO, + 0x00000054: _RVC_RUN_MODE_CLUSTER_INFO, + 0x00000055: _RVC_CLEAN_MODE_CLUSTER_INFO, 0x00000056: _TEMPERATURE_CONTROL_CLUSTER_INFO, 0x00000057: _REFRIGERATOR_ALARM_CLUSTER_INFO, - 0x00000059: _DISHWASHER_MODE_SELECT_CLUSTER_INFO, + 0x00000059: _DISHWASHER_MODE_CLUSTER_INFO, 0x0000005B: _AIR_QUALITY_CLUSTER_INFO, 0x0000005C: _SMOKE_CO_ALARM_CLUSTER_INFO, 0x00000060: _OPERATIONAL_STATE_CLUSTER_INFO, @@ -15819,14 +15747,14 @@ class ChipClusters: "BooleanState": _BOOLEAN_STATE_CLUSTER_INFO, "IcdManagement": _ICD_MANAGEMENT_CLUSTER_INFO, "ModeSelect": _MODE_SELECT_CLUSTER_INFO, - "LaundryWasherModeSelect": _LAUNDRY_WASHER_MODE_SELECT_CLUSTER_INFO, - "RefrigeratorAndTemperatureControlledCabinetModeSelect": _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER_INFO, + "LaundryWasherMode": _LAUNDRY_WASHER_MODE_CLUSTER_INFO, + "RefrigeratorAndTemperatureControlledCabinetMode": _REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_INFO, "WasherControls": _WASHER_CONTROLS_CLUSTER_INFO, - "RvcRunModeSelect": _RVC_RUN_MODE_SELECT_CLUSTER_INFO, - "RvcCleanModeSelect": _RVC_CLEAN_MODE_SELECT_CLUSTER_INFO, + "RvcRunMode": _RVC_RUN_MODE_CLUSTER_INFO, + "RvcCleanMode": _RVC_CLEAN_MODE_CLUSTER_INFO, "TemperatureControl": _TEMPERATURE_CONTROL_CLUSTER_INFO, "RefrigeratorAlarm": _REFRIGERATOR_ALARM_CLUSTER_INFO, - "DishwasherModeSelect": _DISHWASHER_MODE_SELECT_CLUSTER_INFO, + "DishwasherMode": _DISHWASHER_MODE_CLUSTER_INFO, "AirQuality": _AIR_QUALITY_CLUSTER_INFO, "SmokeCoAlarm": _SMOKE_CO_ALARM_CLUSTER_INFO, "OperationalState": _OPERATIONAL_STATE_CLUSTER_INFO, diff --git a/src/controller/python/chip/clusters/Objects.py b/src/controller/python/chip/clusters/Objects.py index d80b6b3b254ce5..da33a4a753e694 100644 --- a/src/controller/python/chip/clusters/Objects.py +++ b/src/controller/python/chip/clusters/Objects.py @@ -14869,7 +14869,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="standardNamespace", Tag=0x00000001, Type=typing.Union[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]), @@ -14883,7 +14883,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ]) description: 'str' = None - standardNamespace: 'typing.Union[None, Nullable, uint]' = None + standardNamespace: 'typing.Union[Nullable, uint]' = None supportedModes: 'typing.List[ModeSelect.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None @@ -14895,54 +14895,23 @@ def descriptor(cls) -> ClusterObjectDescriptor: featureMap: 'uint' = None clusterRevision: 'uint' = None - class Enums: - class ModeTag(MatterIntEnum): - kAuto = 0x00 - kQuick = 0x01 - kQuiet = 0x02 - kLowNoise = 0x03 - kLowEnergy = 0x04 - kVacation = 0x05 - kMin = 0x06 - kMax = 0x07 - kNight = 0x08 - kDay = 0x09 - # All received enum values that are not listed above will be mapped - # to kUnknownEnumValue. This is a helper enum value that should only - # be used by code to process how it handles receiving and unknown - # enum value. This specific should never be transmitted. - kUnknownEnumValue = 10, - - class StatusCode(MatterIntEnum): - kSuccess = 0x00 - kUnsupportedMode = 0x01 - kGenericFailure = 0x02 - # All received enum values that are not listed above will be mapped - # to kUnknownEnumValue. This is a helper enum value that should only - # be used by code to process how it handles receiving and unknown - # enum value. This specific should never be transmitted. - kUnknownEnumValue = 3, - class Bitmaps: class Feature(IntFlag): kOnOff = 0x1 - kExtendedStatus = 0x2 class Structs: @dataclass - class ModeTagStruct(ClusterObject): + class SemanticTagStruct(ClusterObject): @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]), + ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=uint), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="tagName", Tag=2, Type=typing.Optional[str]), ]) - mfgCode: 'typing.Optional[uint]' = None + mfgCode: 'uint' = 0 value: 'uint' = 0 - tagName: 'typing.Optional[str]' = None @dataclass class ModeOptionStruct(ClusterObject): @@ -14952,12 +14921,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[ModeSelect.Structs.ModeTagStruct]), + ClusterObjectFieldDescriptor(Label="semanticTags", Tag=2, Type=typing.List[ModeSelect.Structs.SemanticTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - modeTags: 'typing.List[ModeSelect.Structs.ModeTagStruct]' = field(default_factory=lambda: []) + semanticTags: 'typing.List[ModeSelect.Structs.SemanticTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -14976,40 +14945,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: newMode: 'uint' = 0 - @dataclass - class ChangeToModeWithStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0050 - command_id: typing.ClassVar[int] = 0x00000001 - is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = 'ChangeToModeResponse' - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint), - ]) - - newMode: 'uint' = 0 - - @dataclass - class ChangeToModeResponse(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0050 - command_id: typing.ClassVar[int] = 0x00000002 - is_client: typing.ClassVar[bool] = False - response_type: typing.ClassVar[str] = None - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="status", Tag=0, Type=uint), - ClusterObjectFieldDescriptor(Label="statusText", Tag=1, Type=typing.Optional[str]), - ]) - - status: 'uint' = 0 - statusText: 'typing.Optional[str]' = None - class Attributes: @dataclass class Description(ClusterAttributeDescriptor): @@ -15039,9 +14974,9 @@ def attribute_id(cls) -> int: @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.Union[None, Nullable, uint]) + return ClusterObjectFieldDescriptor(Type=typing.Union[Nullable, uint]) - value: 'typing.Union[None, Nullable, uint]' = None + value: 'typing.Union[Nullable, uint]' = NullValue @dataclass class SupportedModes(ClusterAttributeDescriptor): @@ -15205,18 +15140,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class LaundryWasherModeSelect(Cluster): +class LaundryWasherMode(Cluster): id: typing.ClassVar[int] = 0x0051 @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[LaundryWasherModeSelect.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]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -15225,8 +15159,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - description: 'str' = None - supportedModes: 'typing.List[LaundryWasherModeSelect.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -15252,7 +15185,6 @@ class ModeTag(MatterIntEnum): class Bitmaps: class Feature(IntFlag): kOnOff = 0x1 - kExtendedStatus = 0x2 class Structs: @dataclass @@ -15263,12 +15195,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="tagName", Tag=2, Type=typing.Optional[str]), ]) mfgCode: 'typing.Optional[uint]' = None value: 'uint' = 0 - tagName: 'typing.Optional[str]' = None @dataclass class ModeOptionStruct(ClusterObject): @@ -15278,12 +15208,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[LaundryWasherModeSelect.Structs.ModeTagStruct]), + ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[LaundryWasherMode.Structs.ModeTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - modeTags: 'typing.List[LaundryWasherModeSelect.Structs.ModeTagStruct]' = field(default_factory=lambda: []) + modeTags: 'typing.List[LaundryWasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -15291,22 +15221,6 @@ class ChangeToMode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0051 command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = None - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint), - ]) - - newMode: 'uint' = 0 - - @dataclass - class ChangeToModeWithStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0051 - command_id: typing.ClassVar[int] = 0x00000001 - is_client: typing.ClassVar[bool] = True response_type: typing.ClassVar[str] = 'ChangeToModeResponse' @ChipUtility.classproperty @@ -15321,7 +15235,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class ChangeToModeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0051 - command_id: typing.ClassVar[int] = 0x00000002 + command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = False response_type: typing.ClassVar[str] = None @@ -15337,22 +15251,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: statusText: 'typing.Optional[str]' = None class Attributes: - @dataclass - class Description(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0051 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=str) - - value: 'str' = "" - @dataclass class SupportedModes(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -15361,13 +15259,13 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000002 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[LaundryWasherModeSelect.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[LaundryWasherMode.Structs.ModeOptionStruct]) - value: 'typing.List[LaundryWasherModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[LaundryWasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -15377,7 +15275,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000003 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -15393,7 +15291,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000004 + return 0x00000002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -15409,7 +15307,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000005 + return 0x00000003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -15515,18 +15413,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class RefrigeratorAndTemperatureControlledCabinetModeSelect(Cluster): +class RefrigeratorAndTemperatureControlledCabinetMode(Cluster): id: typing.ClassVar[int] = 0x0052 @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - 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]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -15535,8 +15432,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - description: 'str' = None - supportedModes: 'typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -15560,7 +15456,6 @@ class ModeTag(MatterIntEnum): class Bitmaps: class Feature(IntFlag): kOnOff = 0x1 - kExtendedStatus = 0x2 class Structs: @dataclass @@ -15571,12 +15466,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="tagName", Tag=2, Type=typing.Optional[str]), ]) mfgCode: 'typing.Optional[uint]' = None value: 'uint' = 0 - tagName: 'typing.Optional[str]' = None @dataclass class ModeOptionStruct(ClusterObject): @@ -15586,12 +15479,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeTagStruct]), + ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - modeTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeTagStruct]' = field(default_factory=lambda: []) + modeTags: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -15599,22 +15492,6 @@ class ChangeToMode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0052 command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = None - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint), - ]) - - newMode: 'uint' = 0 - - @dataclass - class ChangeToModeWithStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0052 - command_id: typing.ClassVar[int] = 0x00000001 - is_client: typing.ClassVar[bool] = True response_type: typing.ClassVar[str] = 'ChangeToModeResponse' @ChipUtility.classproperty @@ -15629,7 +15506,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class ChangeToModeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0052 - command_id: typing.ClassVar[int] = 0x00000002 + command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = False response_type: typing.ClassVar[str] = None @@ -15645,22 +15522,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: statusText: 'typing.Optional[str]' = None class Attributes: - @dataclass - class Description(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0052 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=str) - - value: 'str' = "" - @dataclass class SupportedModes(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -15669,13 +15530,13 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000002 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]) - value: 'typing.List[RefrigeratorAndTemperatureControlledCabinetModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[RefrigeratorAndTemperatureControlledCabinetMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -15685,7 +15546,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000003 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -15701,7 +15562,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000004 + return 0x00000002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -15717,7 +15578,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000005 + return 0x00000003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -16021,18 +15882,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class RvcRunModeSelect(Cluster): +class RvcRunMode(Cluster): id: typing.ClassVar[int] = 0x0054 @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - 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]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcRunMode.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -16041,8 +15901,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - description: 'str' = None - supportedModes: 'typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -16081,7 +15940,6 @@ class StatusCode(MatterIntEnum): class Bitmaps: class Feature(IntFlag): kOnOff = 0x1 - kExtendedStatus = 0x2 class Structs: @dataclass @@ -16092,12 +15950,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="tagName", Tag=2, Type=typing.Optional[str]), ]) mfgCode: 'typing.Optional[uint]' = None value: 'uint' = 0 - tagName: 'typing.Optional[str]' = None @dataclass class ModeOptionStruct(ClusterObject): @@ -16107,12 +15963,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcRunModeSelect.Structs.ModeTagStruct]), + ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcRunMode.Structs.ModeTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - modeTags: 'typing.List[RvcRunModeSelect.Structs.ModeTagStruct]' = field(default_factory=lambda: []) + modeTags: 'typing.List[RvcRunMode.Structs.ModeTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -16120,22 +15976,6 @@ class ChangeToMode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0054 command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = None - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint), - ]) - - newMode: 'uint' = 0 - - @dataclass - class ChangeToModeWithStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0054 - command_id: typing.ClassVar[int] = 0x00000001 - is_client: typing.ClassVar[bool] = True response_type: typing.ClassVar[str] = 'ChangeToModeResponse' @ChipUtility.classproperty @@ -16150,7 +15990,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class ChangeToModeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0054 - command_id: typing.ClassVar[int] = 0x00000002 + command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = False response_type: typing.ClassVar[str] = None @@ -16166,22 +16006,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: statusText: 'typing.Optional[str]' = None class Attributes: - @dataclass - class Description(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0054 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=str) - - value: 'str' = "" - @dataclass class SupportedModes(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -16190,13 +16014,13 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000002 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[RvcRunMode.Structs.ModeOptionStruct]) - value: 'typing.List[RvcRunModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[RvcRunMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -16206,7 +16030,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000003 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -16222,7 +16046,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000004 + return 0x00000002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -16238,7 +16062,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000005 + return 0x00000003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -16344,18 +16168,17 @@ def attribute_type(cls) -> ClusterObjectFieldDescriptor: @dataclass -class RvcCleanModeSelect(Cluster): +class RvcCleanMode(Cluster): id: typing.ClassVar[int] = 0x0055 @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - 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]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[RvcCleanMode.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -16364,8 +16187,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - description: 'str' = None - supportedModes: 'typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -16398,7 +16220,6 @@ class StatusCode(MatterIntEnum): class Bitmaps: class Feature(IntFlag): kOnOff = 0x1 - kExtendedStatus = 0x2 class Structs: @dataclass @@ -16409,12 +16230,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="tagName", Tag=2, Type=typing.Optional[str]), ]) mfgCode: 'typing.Optional[uint]' = None value: 'uint' = 0 - tagName: 'typing.Optional[str]' = None @dataclass class ModeOptionStruct(ClusterObject): @@ -16424,12 +16243,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcCleanModeSelect.Structs.ModeTagStruct]), + ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[RvcCleanMode.Structs.ModeTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - modeTags: 'typing.List[RvcCleanModeSelect.Structs.ModeTagStruct]' = field(default_factory=lambda: []) + modeTags: 'typing.List[RvcCleanMode.Structs.ModeTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -16437,22 +16256,6 @@ class ChangeToMode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0055 command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = None - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint), - ]) - - newMode: 'uint' = 0 - - @dataclass - class ChangeToModeWithStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0055 - command_id: typing.ClassVar[int] = 0x00000001 - is_client: typing.ClassVar[bool] = True response_type: typing.ClassVar[str] = 'ChangeToModeResponse' @ChipUtility.classproperty @@ -16467,7 +16270,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class ChangeToModeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0055 - command_id: typing.ClassVar[int] = 0x00000002 + command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = False response_type: typing.ClassVar[str] = None @@ -16483,22 +16286,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: statusText: 'typing.Optional[str]' = None class Attributes: - @dataclass - class Description(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0055 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=str) - - value: 'str' = "" - @dataclass class SupportedModes(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -16507,13 +16294,13 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000002 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[RvcCleanMode.Structs.ModeOptionStruct]) - value: 'typing.List[RvcCleanModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[RvcCleanMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -16523,7 +16310,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000003 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -16539,7 +16326,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000004 + return 0x00000002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -16555,7 +16342,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000005 + return 0x00000003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -17102,18 +16889,17 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass -class DishwasherModeSelect(Cluster): +class DishwasherMode(Cluster): id: typing.ClassVar[int] = 0x0059 @ChipUtility.classproperty def descriptor(cls) -> ClusterObjectDescriptor: return ClusterObjectDescriptor( Fields=[ - ClusterObjectFieldDescriptor(Label="description", Tag=0x00000000, Type=str), - ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000002, Type=typing.List[DishwasherModeSelect.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]), + ClusterObjectFieldDescriptor(Label="supportedModes", Tag=0x00000000, Type=typing.List[DishwasherMode.Structs.ModeOptionStruct]), + ClusterObjectFieldDescriptor(Label="currentMode", Tag=0x00000001, Type=uint), + ClusterObjectFieldDescriptor(Label="startUpMode", Tag=0x00000002, Type=typing.Union[None, Nullable, uint]), + ClusterObjectFieldDescriptor(Label="onMode", Tag=0x00000003, Type=typing.Union[None, Nullable, uint]), ClusterObjectFieldDescriptor(Label="generatedCommandList", Tag=0x0000FFF8, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="acceptedCommandList", Tag=0x0000FFF9, Type=typing.List[uint]), ClusterObjectFieldDescriptor(Label="eventList", Tag=0x0000FFFA, Type=typing.List[uint]), @@ -17122,8 +16908,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: ClusterObjectFieldDescriptor(Label="clusterRevision", Tag=0x0000FFFD, Type=uint), ]) - description: 'str' = None - supportedModes: 'typing.List[DishwasherModeSelect.Structs.ModeOptionStruct]' = None + supportedModes: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = None currentMode: 'uint' = None startUpMode: 'typing.Union[None, Nullable, uint]' = None onMode: 'typing.Union[None, Nullable, uint]' = None @@ -17148,7 +16933,6 @@ class ModeTag(MatterIntEnum): class Bitmaps: class Feature(IntFlag): kOnOff = 0x1 - kExtendedStatus = 0x2 class Structs: @dataclass @@ -17159,12 +16943,10 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="mfgCode", Tag=0, Type=typing.Optional[uint]), ClusterObjectFieldDescriptor(Label="value", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="tagName", Tag=2, Type=typing.Optional[str]), ]) mfgCode: 'typing.Optional[uint]' = None value: 'uint' = 0 - tagName: 'typing.Optional[str]' = None @dataclass class ModeOptionStruct(ClusterObject): @@ -17174,12 +16956,12 @@ def descriptor(cls) -> ClusterObjectDescriptor: Fields=[ ClusterObjectFieldDescriptor(Label="label", Tag=0, Type=str), ClusterObjectFieldDescriptor(Label="mode", Tag=1, Type=uint), - ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[DishwasherModeSelect.Structs.ModeTagStruct]), + ClusterObjectFieldDescriptor(Label="modeTags", Tag=2, Type=typing.List[DishwasherMode.Structs.ModeTagStruct]), ]) label: 'str' = "" mode: 'uint' = 0 - modeTags: 'typing.List[DishwasherModeSelect.Structs.ModeTagStruct]' = field(default_factory=lambda: []) + modeTags: 'typing.List[DishwasherMode.Structs.ModeTagStruct]' = field(default_factory=lambda: []) class Commands: @dataclass @@ -17187,22 +16969,6 @@ class ChangeToMode(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0059 command_id: typing.ClassVar[int] = 0x00000000 is_client: typing.ClassVar[bool] = True - response_type: typing.ClassVar[str] = None - - @ChipUtility.classproperty - def descriptor(cls) -> ClusterObjectDescriptor: - return ClusterObjectDescriptor( - Fields=[ - ClusterObjectFieldDescriptor(Label="newMode", Tag=0, Type=uint), - ]) - - newMode: 'uint' = 0 - - @dataclass - class ChangeToModeWithStatus(ClusterCommand): - cluster_id: typing.ClassVar[int] = 0x0059 - command_id: typing.ClassVar[int] = 0x00000001 - is_client: typing.ClassVar[bool] = True response_type: typing.ClassVar[str] = 'ChangeToModeResponse' @ChipUtility.classproperty @@ -17217,7 +16983,7 @@ def descriptor(cls) -> ClusterObjectDescriptor: @dataclass class ChangeToModeResponse(ClusterCommand): cluster_id: typing.ClassVar[int] = 0x0059 - command_id: typing.ClassVar[int] = 0x00000002 + command_id: typing.ClassVar[int] = 0x00000001 is_client: typing.ClassVar[bool] = False response_type: typing.ClassVar[str] = None @@ -17233,22 +16999,6 @@ def descriptor(cls) -> ClusterObjectDescriptor: statusText: 'typing.Optional[str]' = None class Attributes: - @dataclass - class Description(ClusterAttributeDescriptor): - @ChipUtility.classproperty - def cluster_id(cls) -> int: - return 0x0059 - - @ChipUtility.classproperty - def attribute_id(cls) -> int: - return 0x00000000 - - @ChipUtility.classproperty - def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=str) - - value: 'str' = "" - @dataclass class SupportedModes(ClusterAttributeDescriptor): @ChipUtility.classproperty @@ -17257,13 +17007,13 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000002 + return 0x00000000 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: - return ClusterObjectFieldDescriptor(Type=typing.List[DishwasherModeSelect.Structs.ModeOptionStruct]) + return ClusterObjectFieldDescriptor(Type=typing.List[DishwasherMode.Structs.ModeOptionStruct]) - value: 'typing.List[DishwasherModeSelect.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) + value: 'typing.List[DishwasherMode.Structs.ModeOptionStruct]' = field(default_factory=lambda: []) @dataclass class CurrentMode(ClusterAttributeDescriptor): @@ -17273,7 +17023,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000003 + return 0x00000001 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -17289,7 +17039,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000004 + return 0x00000002 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: @@ -17305,7 +17055,7 @@ def cluster_id(cls) -> int: @ChipUtility.classproperty def attribute_id(cls) -> int: - return 0x00000005 + return 0x00000003 @ChipUtility.classproperty def attribute_type(cls) -> ClusterObjectFieldDescriptor: diff --git a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h index 001c7058cdb34c..727fa01e64720d 100644 --- a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h +++ b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.h @@ -35,9 +35,4 @@ NS_ASSUME_NONNULL_BEGIN @end -API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) -MTR_NEWLY_DEPRECATED("Please use MTRModeSelectClusterModeTagStruct") -@interface MTRModeSelectClusterSemanticTagStruct : MTRModeSelectClusterModeTagStruct -@end - NS_ASSUME_NONNULL_END diff --git a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.mm b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.mm index 77949e0c765759..d74b24b8194939 100644 --- a/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.mm +++ b/src/darwin/Framework/CHIP/MTRBackwardsCompatShims.mm @@ -22,6 +22,3 @@ * This file defines implementations of manual backwards-compat shims of various sorts to handle * API changes that happened. */ - -@implementation MTRModeSelectClusterSemanticTagStruct -@end diff --git a/src/darwin/Framework/CHIP/templates/availability.yaml b/src/darwin/Framework/CHIP/templates/availability.yaml index 331b3c09ebcd15..6a797e9185dddf 100644 --- a/src/darwin/Framework/CHIP/templates/availability.yaml +++ b/src/darwin/Framework/CHIP/templates/availability.yaml @@ -5316,6 +5316,8 @@ - ThreadMetricsStruct GeneralDiagnostics: - NetworkInterface + ModeSelect: + - SemanticTagStruct OperationalCredentials: - FabricDescriptorStruct DoorLock: @@ -5432,6 +5434,10 @@ - iPv4Addresses - iPv6Addresses - type + ModeSelect: + SemanticTagStruct: + - mfgCode + - value OperationalCredentials: FabricDescriptorStruct: - rootPublicKey @@ -6528,6 +6534,8 @@ ThreadMetricsStruct: ThreadMetrics GeneralDiagnostics: NetworkInterface: NetworkInterfaceType + ModeSelect: + SemanticTagStruct: SemanticTag OperationalCredentials: FabricDescriptorStruct: FabricDescriptor DoorLock: @@ -7515,8 +7523,6 @@ - ProductAppearanceStruct BridgedDeviceBasicInformation: - ProductAppearanceStruct - ModeSelect: - - ModeTagStruct NetworkCommissioning: - WiFiInterfaceScanResultStruct - ThreadInterfaceScanResultStruct @@ -7541,12 +7547,6 @@ ProductAppearanceStruct: - finish - primaryColor - ModeSelect: - ModeTagStruct: - - mfgCode - - value - ModeOptionStruct: - - modeTags NetworkCommissioning: WiFiInterfaceScanResultStruct: - security @@ -8278,10 +8278,6 @@ ThreadNetworkDiagnostics: - NeighborTable - RouteTable - struct fields: - ModeSelect: - ModeOptionStruct: - - semanticTags bitmaps: Groups: - GroupClusterFeature @@ -8307,8 +8303,6 @@ structs: AccessControl: AccessControlTargetStruct: Target - ModeSelect: - ModeTagStruct: SemanticTag NetworkCommissioning: WiFiInterfaceScanResultStruct: WiFiInterfaceScanResult ThreadInterfaceScanResultStruct: ThreadInterfaceScanResult @@ -8316,10 +8310,6 @@ ThreadNetworkDiagnostics: NeighborTableStruct: NeighborTable RouteTableStruct: RouteTable - struct fields: - ModeSelect: - ModeOptionStruct: - modeTags: semanticTags enum values: TimeSynchronization: TimeSourceEnum: @@ -8394,30 +8384,12 @@ - TonerCartridgeMonitoring # Not ready to be public API yet. - ICDManagement - - LaundryWasherModeSelect - - RefrigeratorAndTemperatureControlledCabinetModeSelect - - RVCRunModeSelect - - RVCCleanModeSelect - - DishwasherModeSelect + - LaundryWasherMode + - RefrigeratorAndTemperatureControlledCabinetMode + - RVCRunMode + - RVCCleanMode + - DishwasherMode - WasherControls - commands: - ModeSelect: - # Still very in-flux. - - ChangeToModeWithStatus - - ChangeToModeResponse - struct fields: - ModeSelect: - ModeTagStruct: - - tagName - enums: - ModeSelect: - # Still very in-flux. - - ModeTag - - StatusCode - bitmap values: - ModeSelect: - Feature: - - ExtendedStatus # Once we actually unmark TimeSynchronization as provisional, all these bits should go away too, and we should instead # mark things as introduced/deprecated as needed. The "ids" entries should go away, in particular. ids: diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index e1d8de2a3f7709..fe3c110ea46a02 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -9048,16 +9048,12 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster( newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode]; { // Scope for our temporary variables auto * array_2 = [NSMutableArray new]; - auto iter_2 = entry_0.modeTags.begin(); + auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRModeSelectClusterModeTagStruct * newElement_2; - newElement_2 = [MTRModeSelectClusterModeTagStruct new]; - if (entry_2.mfgCode.HasValue()) { - newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())]; - } else { - newElement_2.mfgCode = nil; - } + MTRModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRModeSelectClusterSemanticTagStruct 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]; } @@ -9066,7 +9062,7 @@ static id _Nullable DecodeAttributeValueForModeSelectCluster( *aError = err; return nil; } - newElement_0.modeTags = array_2; + newElement_0.semanticTags = array_2; } [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h index 07d2e4bf1242bc..6e21a62b8e0a73 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h @@ -7722,11 +7722,8 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) /** * Command ChangeToMode * - * If the NewMode field doesn't match the Mode field in an entry of the SupportedModes list the server SHALL respond with an - INVALID_COMMAND status response. If the NewMode field matches the Mode field in an entry of the SupportedModes list but the device - is unable to transition as requested, the server SHALL respond with a FAILURE status response. If the NewMode field matches the - 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. + * On receipt of this command, if the NewMode field matches the Mode field in an entry of the SupportedModes list, the server SHALL + * set the CurrentMode attribute to the NewMode value, otherwise, the server SHALL respond with an INVALID_COMMAND status response. */ - (void)changeToModeWithParams:(MTRModeSelectClusterChangeToModeParams *)params completion:(MTRStatusCompletion)completion API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm index 11ef9066138495..6314800b01a871 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRCallbackBridge.mm @@ -8010,16 +8010,12 @@ newElement_0.mode = [NSNumber numberWithUnsignedChar:entry_0.mode]; { // Scope for our temporary variables auto * array_2 = [NSMutableArray new]; - auto iter_2 = entry_0.modeTags.begin(); + auto iter_2 = entry_0.semanticTags.begin(); while (iter_2.Next()) { auto & entry_2 = iter_2.GetValue(); - MTRModeSelectClusterModeTagStruct * newElement_2; - newElement_2 = [MTRModeSelectClusterModeTagStruct new]; - if (entry_2.mfgCode.HasValue()) { - newElement_2.mfgCode = [NSNumber numberWithUnsignedShort:chip::to_underlying(entry_2.mfgCode.Value())]; - } else { - newElement_2.mfgCode = nil; - } + MTRModeSelectClusterSemanticTagStruct * newElement_2; + newElement_2 = [MTRModeSelectClusterSemanticTagStruct 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]; } @@ -8028,7 +8024,7 @@ OnFailureFn(context, err); return; } - newElement_0.modeTags = array_2; + newElement_0.semanticTags = array_2; } [array_0 addObject:newElement_0]; } diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h index e870b156e5c1a9..63264e74bdead1 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h @@ -687,23 +687,21 @@ API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @property (nonatomic, copy) NSNumber * _Nonnull stateValue API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end -MTR_NEWLY_AVAILABLE -@interface MTRModeSelectClusterModeTagStruct : NSObject -@property (nonatomic, copy) NSNumber * _Nullable mfgCode MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSNumber * _Nonnull value MTR_NEWLY_AVAILABLE; +API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)) +@interface MTRModeSelectClusterSemanticTagStruct : NSObject +@property (nonatomic, copy) NSNumber * _Nonnull mfgCode API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); +@property (nonatomic, copy) NSNumber * _Nonnull value API_AVAILABLE(ios(16.4), macos(13.3), watchos(9.4), tvos(16.4)); @end MTR_DEPRECATED( - "Please use MTRModeSelectClusterModeTagStruct", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) -@interface MTRModeSelectClusterSemanticTag : MTRModeSelectClusterModeTagStruct + "Please use MTRModeSelectClusterSemanticTagStruct", ios(16.1, 16.4), macos(13.0, 13.3), watchos(9.1, 9.4), tvos(16.1, 16.4)) +@interface MTRModeSelectClusterSemanticTag : MTRModeSelectClusterSemanticTagStruct @end API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) @interface MTRModeSelectClusterModeOptionStruct : NSObject @property (nonatomic, copy) NSString * _Nonnull label API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @property (nonatomic, copy) NSNumber * _Nonnull mode API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); -@property (nonatomic, copy) NSArray * _Nonnull modeTags MTR_NEWLY_AVAILABLE; -@property (nonatomic, copy) NSArray * _Nonnull semanticTags API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)) - MTR_NEWLY_DEPRECATED("Please use modeTags"); +@property (nonatomic, copy) NSArray * _Nonnull semanticTags API_AVAILABLE(ios(16.1), macos(13.0), watchos(9.1), tvos(16.1)); @end MTR_NEWLY_AVAILABLE diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm index 39b94703e32f23..17046b2bc00ffb 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm @@ -2618,12 +2618,12 @@ - (NSString *)description @end -@implementation MTRModeSelectClusterModeTagStruct +@implementation MTRModeSelectClusterSemanticTagStruct - (instancetype)init { if (self = [super init]) { - _mfgCode = nil; + _mfgCode = @(0); _value = @(0); } @@ -2632,7 +2632,7 @@ - (instancetype)init - (id)copyWithZone:(NSZone * _Nullable)zone { - auto other = [[MTRModeSelectClusterModeTagStruct alloc] init]; + auto other = [[MTRModeSelectClusterSemanticTagStruct alloc] init]; other.mfgCode = self.mfgCode; other.value = self.value; @@ -2649,7 +2649,7 @@ - (NSString *)description @end -@implementation MTRModeSelectClusterSemanticTag : MTRModeSelectClusterModeTagStruct +@implementation MTRModeSelectClusterSemanticTag : MTRModeSelectClusterSemanticTagStruct @end @implementation MTRModeSelectClusterModeOptionStruct @@ -2661,7 +2661,7 @@ - (instancetype)init _mode = @(0); - _modeTags = [NSArray array]; + _semanticTags = [NSArray array]; } return self; } @@ -2672,28 +2672,18 @@ - (id)copyWithZone:(NSZone * _Nullable)zone other.label = self.label; other.mode = self.mode; - other.modeTags = self.modeTags; + other.semanticTags = self.semanticTags; return other; } - (NSString *)description { - NSString * descriptionString = [NSString - stringWithFormat:@"<%@: label:%@; mode:%@; modeTags:%@; >", NSStringFromClass([self class]), _label, _mode, _modeTags]; + NSString * descriptionString = [NSString stringWithFormat:@"<%@: label:%@; mode:%@; semanticTags:%@; >", + NSStringFromClass([self class]), _label, _mode, _semanticTags]; return descriptionString; } -- (void)setSemanticTags:(NSArray * _Nonnull)semanticTags -{ - self.modeTags = semanticTags; -} - -- (NSArray * _Nonnull)semanticTags -{ - return self.modeTags; -} - @end @implementation MTRRefrigeratorAlarmClusterNotifyEvent diff --git a/src/platform/ESP32/ESP32Config.h b/src/platform/ESP32/ESP32Config.h index fbcef1126be177..e07d98eba27594 100644 --- a/src/platform/ESP32/ESP32Config.h +++ b/src/platform/ESP32/ESP32Config.h @@ -198,17 +198,17 @@ class ESP32Config::KeyAllocator VerifyOrReturnError(key, CHIP_ERROR_INVALID_ARGUMENT); return snprintf(key, size, "sm-mode/%x/%x", endpoint, index) > 0 ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL; } - static CHIP_ERROR ModeTagsCount(char * key, size_t size, uint16_t endpoint, uint16_t index) + static CHIP_ERROR SemanticTagsCount(char * key, size_t size, uint16_t endpoint, uint16_t index) { VerifyOrReturnError(key, CHIP_ERROR_INVALID_ARGUMENT); return snprintf(key, size, "sm-st-sz/%x/%x", endpoint, index) > 0 ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL; } - static CHIP_ERROR ModeTagValue(char * key, size_t size, uint16_t endpoint, uint16_t index, uint16_t ind) + static CHIP_ERROR SemanticTagValue(char * key, size_t size, uint16_t endpoint, uint16_t index, uint16_t ind) { VerifyOrReturnError(key, CHIP_ERROR_INVALID_ARGUMENT); return snprintf(key, size, "st-v/%x/%x/%x", endpoint, index, ind) > 0 ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL; } - static CHIP_ERROR ModeTagMfgCode(char * key, size_t size, uint16_t endpoint, uint16_t index, uint16_t ind) + static CHIP_ERROR SemanticTagMfgCode(char * key, size_t size, uint16_t endpoint, uint16_t index, uint16_t ind) { VerifyOrReturnError(key, CHIP_ERROR_INVALID_ARGUMENT); return snprintf(key, size, "st-mfg/%x/%x/%x", endpoint, index, ind) > 0 ? CHIP_NO_ERROR : CHIP_ERROR_INTERNAL; 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 247201f74622f6..ef50827f38f950 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 @@ -7234,40 +7234,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { namespace Attributes { -namespace Description { - -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) -{ - uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherModeSelect::Id, Id, zclString, sizeof(zclString)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - size_t length = emberAfStringLength(zclString); - if (length == NumericAttributeTraits::kNullValue) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - - VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); - memcpy(value.data(), &zclString[1], 64); - value.reduce_size(length); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) -{ - static_assert(64 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); - VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); - uint8_t zclString[64 + 1]; - auto length = static_cast(value.size()); - Encoding::Put8(zclString, length); - memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); -} - -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -7275,7 +7244,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::LaundryWasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7294,7 +7263,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::LaundryWasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentMode @@ -7306,7 +7275,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::LaundryWasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7328,7 +7297,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::LaundryWasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -7337,7 +7306,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -7359,7 +7328,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::LaundryWasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7381,7 +7350,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::LaundryWasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -7390,7 +7359,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -7412,7 +7381,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::LaundryWasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7431,7 +7400,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::LaundryWasherModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -7443,7 +7412,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::LaundryWasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7462,59 +7431,26 @@ 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::LaundryWasherModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::LaundryWasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace LaundryWasherModeSelect +} // namespace LaundryWasherMode -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +namespace RefrigeratorAndTemperatureControlledCabinetMode { namespace Attributes { -namespace Description { - -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) -{ - uint8_t zclString[64 + 1]; - 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) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - - VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); - memcpy(value.data(), &zclString[1], 64); - value.reduce_size(length); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) -{ - static_assert(64 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); - VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); - uint8_t zclString[64 + 1]; - auto length = static_cast(value.size()); - Encoding::Put8(zclString, length); - memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, zclString, - ZCL_CHAR_STRING_ATTRIBUTE_TYPE); -} - -} // namespace Description - namespace CurrentMode { 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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, - readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7533,7 +7469,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7545,9 +7481,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, - readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7569,7 +7505,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7579,7 +7515,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7601,9 +7537,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, - readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -7625,7 +7561,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7635,7 +7571,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } @@ -7657,9 +7593,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, - readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7678,7 +7614,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } @@ -7690,9 +7626,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, - readable, sizeof(temp)); + uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); + EmberAfStatus status = + emberAfReadAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7711,14 +7647,14 @@ 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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id, Id, writable, + return emberAfWriteAttribute(endpoint, Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { namespace Attributes { @@ -7925,40 +7861,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { namespace Attributes { -namespace Description { - -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) -{ - uint8_t zclString[64 + 1]; - 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) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - - VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); - memcpy(value.data(), &zclString[1], 64); - value.reduce_size(length); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) -{ - static_assert(64 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); - VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); - uint8_t zclString[64 + 1]; - auto length = static_cast(value.size()); - Encoding::Put8(zclString, length); - memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); -} - -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -7966,7 +7871,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::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -7985,7 +7890,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::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentMode @@ -7997,7 +7902,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::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8019,7 +7924,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::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8028,7 +7933,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8050,7 +7955,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::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8072,7 +7977,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::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8081,7 +7986,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcRunModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8103,7 +8008,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::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8122,7 +8027,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::RvcRunModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -8134,7 +8039,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::RvcRunModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcRunMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8153,48 +8058,17 @@ 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::RvcRunModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcRunMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcRunModeSelect +} // namespace RvcRunMode -namespace RvcCleanModeSelect { +namespace RvcCleanMode { namespace Attributes { -namespace Description { - -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) -{ - uint8_t zclString[64 + 1]; - 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) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - - VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); - memcpy(value.data(), &zclString[1], 64); - value.reduce_size(length); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) -{ - static_assert(64 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); - VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); - uint8_t zclString[64 + 1]; - auto length = static_cast(value.size()); - Encoding::Put8(zclString, length); - memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); -} - -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -8202,7 +8076,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::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8221,7 +8095,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::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentMode @@ -8233,7 +8107,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::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8255,7 +8129,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::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8264,7 +8138,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8286,7 +8160,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::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8308,7 +8182,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::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8317,7 +8191,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::RvcCleanModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8339,7 +8213,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::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8358,7 +8232,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::RvcCleanModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -8370,7 +8244,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::RvcCleanModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8389,13 +8263,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::RvcCleanModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::RvcCleanMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { namespace Attributes { @@ -8750,40 +8624,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) } // namespace Attributes } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { namespace Attributes { -namespace Description { - -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value) -{ - uint8_t zclString[64 + 1]; - EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherModeSelect::Id, Id, zclString, sizeof(zclString)); - VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); - size_t length = emberAfStringLength(zclString); - if (length == NumericAttributeTraits::kNullValue) - { - return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; - } - - VerifyOrReturnError(value.size() == 64, EMBER_ZCL_STATUS_INVALID_DATA_TYPE); - memcpy(value.data(), &zclString[1], 64); - value.reduce_size(length); - return status; -} -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) -{ - static_assert(64 < NumericAttributeTraits::kNullValue, "value.size() might be too big"); - VerifyOrReturnError(value.size() <= 64, EMBER_ZCL_STATUS_CONSTRAINT_ERROR); - uint8_t zclString[64 + 1]; - auto length = static_cast(value.size()); - Encoding::Put8(zclString, length); - memcpy(&zclString[1], value.data(), value.size()); - return emberAfWriteAttribute(endpoint, Clusters::DishwasherModeSelect::Id, Id, zclString, ZCL_CHAR_STRING_ATTRIBUTE_TYPE); -} - -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) @@ -8791,7 +8634,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::DishwasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8810,7 +8653,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::DishwasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentMode @@ -8822,7 +8665,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::DishwasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8844,7 +8687,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::DishwasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8853,7 +8696,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::DishwasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8875,7 +8718,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::DishwasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (Traits::IsNullValue(temp)) { @@ -8897,7 +8740,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::DishwasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus SetNull(chip::EndpointId endpoint) @@ -8906,7 +8749,7 @@ EmberAfStatus SetNull(chip::EndpointId endpoint) Traits::StorageType value; Traits::SetNull(value); uint8_t * writable = Traits::ToAttributeStoreRepresentation(value); - return emberAfWriteAttribute(endpoint, Clusters::DishwasherModeSelect::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullable & value) @@ -8928,7 +8771,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::DishwasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8947,7 +8790,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::DishwasherModeSelect::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_BITMAP32_ATTRIBUTE_TYPE); } } // namespace FeatureMap @@ -8959,7 +8802,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::DishwasherModeSelect::Id, Id, readable, sizeof(temp)); + EmberAfStatus status = emberAfReadAttribute(endpoint, Clusters::DishwasherMode::Id, Id, readable, sizeof(temp)); VerifyOrReturnError(EMBER_ZCL_STATUS_SUCCESS == status, status); if (!Traits::CanRepresentValue(/* isNullable = */ false, temp)) { @@ -8978,13 +8821,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::DishwasherModeSelect::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteAttribute(endpoint, Clusters::DishwasherMode::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); } } // namespace ClusterRevision } // namespace Attributes -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { 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 07ea56af7ea851..dd71aa3fea6314 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 @@ -1382,14 +1382,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { namespace Attributes { -namespace Description { -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1420,16 +1415,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace LaundryWasherModeSelect +} // namespace LaundryWasherMode -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +namespace RefrigeratorAndTemperatureControlledCabinetMode { namespace Attributes { -namespace Description { -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1460,7 +1450,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { namespace Attributes { @@ -1497,14 +1487,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { namespace Attributes { -namespace Description { -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1535,16 +1520,11 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcRunModeSelect +} // namespace RvcRunMode -namespace RvcCleanModeSelect { +namespace RvcCleanMode { namespace Attributes { -namespace Description { -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1575,7 +1555,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { namespace Attributes { @@ -1644,14 +1624,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace Attributes } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { namespace Attributes { -namespace Description { -EmberAfStatus Get(chip::EndpointId endpoint, chip::MutableCharSpan value); // char_string -EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); -} // namespace Description - namespace CurrentMode { EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); @@ -1682,7 +1657,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); } // namespace ClusterRevision } // namespace Attributes -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { 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 634371b70db90f..8a1dc67b15eeef 100644 --- a/zzz_generated/app-common/app-common/zap-generated/callback.h +++ b/zzz_generated/app-common/app-common/zap-generated/callback.h @@ -369,21 +369,21 @@ void emberAfIcdManagementClusterInitCallback(chip::EndpointId endpoint); */ void emberAfModeSelectClusterInitCallback(chip::EndpointId endpoint); -/** @brief Laundry Washer Mode Select Cluster Init +/** @brief Laundry Washer Mode Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfLaundryWasherModeSelectClusterInitCallback(chip::EndpointId endpoint); +void emberAfLaundryWasherModeClusterInitCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Init +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterInitCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterInitCallback(chip::EndpointId endpoint); /** @brief Washer Controls Cluster Init * @@ -393,21 +393,21 @@ void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterInitCall */ void emberAfWasherControlsClusterInitCallback(chip::EndpointId endpoint); -/** @brief RVC Run Mode Select Cluster Init +/** @brief RVC Run Mode Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcRunModeSelectClusterInitCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeClusterInitCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Mode Select Cluster Init +/** @brief RVC Clean Mode Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcCleanModeSelectClusterInitCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeClusterInitCallback(chip::EndpointId endpoint); /** @brief Temperature Control Cluster Init * @@ -425,13 +425,13 @@ void emberAfTemperatureControlClusterInitCallback(chip::EndpointId endpoint); */ void emberAfRefrigeratorAlarmClusterInitCallback(chip::EndpointId endpoint); -/** @brief Dishwasher Mode Select Cluster Init +/** @brief Dishwasher Mode Cluster Init * * Cluster Init * * @param endpoint Endpoint that is being initialized */ -void emberAfDishwasherModeSelectClusterInitCallback(chip::EndpointId endpoint); +void emberAfDishwasherModeClusterInitCallback(chip::EndpointId endpoint); /** @brief Air Quality Cluster Init * @@ -4329,42 +4329,42 @@ void emberAfModeSelectClusterServerTickCallback(chip::EndpointId endpoint); void emberAfModeSelectClusterClientTickCallback(chip::EndpointId endpoint); // -// Laundry Washer Mode Select Cluster +// Laundry Washer Mode Cluster // -/** @brief Laundry Washer Mode Select Cluster Server Init +/** @brief Laundry Washer Mode Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfLaundryWasherModeSelectClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfLaundryWasherModeClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Laundry Washer Mode Select Cluster Server Shutdown +/** @brief Laundry Washer Mode Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterLaundryWasherModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterLaundryWasherModeClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief Laundry Washer Mode Select Cluster Client Init +/** @brief Laundry Washer Mode Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfLaundryWasherModeSelectClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfLaundryWasherModeClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Laundry Washer Mode Select Cluster Server Attribute Changed +/** @brief Laundry Washer Mode Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterLaundryWasherModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterLaundryWasherModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Laundry Washer Mode Select Cluster Server Pre Attribute Changed +/** @brief Laundry Washer Mode Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4373,10 +4373,11 @@ void MatterLaundryWasherModeSelectClusterServerAttributeChangedCallback(const ch * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterLaundryWasherModeSelectClusterServerPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status +MatterLaundryWasherModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Laundry Washer Mode Select Cluster Client Pre Attribute Changed +/** @brief Laundry Washer Mode Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4385,63 +4386,64 @@ chip::Protocols::InteractionModel::Status MatterLaundryWasherModeSelectClusterSe * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterLaundryWasherModeSelectClusterClientPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status +MatterLaundryWasherModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Laundry Washer Mode Select Cluster Server Tick +/** @brief Laundry Washer Mode Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfLaundryWasherModeSelectClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfLaundryWasherModeClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief Laundry Washer Mode Select Cluster Client Tick +/** @brief Laundry Washer Mode Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfLaundryWasherModeSelectClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfLaundryWasherModeClusterClientTickCallback(chip::EndpointId endpoint); // -// Refrigerator And Temperature Controlled Cabinet Mode Select Cluster +// Refrigerator And Temperature Controlled Cabinet Mode Cluster // -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Init +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Shutdown +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Client Init +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Attribute Changed +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerAttributeChangedCallback( +void MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Pre Attribute Changed +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4451,10 +4453,10 @@ void MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerAtt * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerPreAttributeChangedCallback( +MatterRefrigeratorAndTemperatureControlledCabinetModeClusterServerPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Client Pre Attribute Changed +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4464,24 +4466,24 @@ MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerPreAttri * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterRefrigeratorAndTemperatureControlledCabinetModeSelectClusterClientPreAttributeChangedCallback( +MatterRefrigeratorAndTemperatureControlledCabinetModeClusterClientPreAttributeChangedCallback( const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Server Tick +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster Client Tick +/** @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterClientTickCallback(chip::EndpointId endpoint); // // Washer Controls Cluster @@ -4562,42 +4564,42 @@ void emberAfWasherControlsClusterServerTickCallback(chip::EndpointId endpoint); void emberAfWasherControlsClusterClientTickCallback(chip::EndpointId endpoint); // -// RVC Run Mode Select Cluster +// RVC Run Mode Cluster // -/** @brief RVC Run Mode Select Cluster Server Init +/** @brief RVC Run Mode Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcRunModeSelectClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief RVC Run Mode Select Cluster Server Shutdown +/** @brief RVC Run Mode Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterRvcRunModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterRvcRunModeClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief RVC Run Mode Select Cluster Client Init +/** @brief RVC Run Mode Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcRunModeSelectClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief RVC Run Mode Select Cluster Server Attribute Changed +/** @brief RVC Run Mode Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterRvcRunModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterRvcRunModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief RVC Run Mode Select Cluster Server Pre Attribute Changed +/** @brief RVC Run Mode Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4607,10 +4609,10 @@ void MatterRvcRunModeSelectClusterServerAttributeChangedCallback(const chip::app * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterRvcRunModeSelectClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +MatterRvcRunModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Run Mode Select Cluster Client Pre Attribute Changed +/** @brief RVC Run Mode Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4620,62 +4622,62 @@ MatterRvcRunModeSelectClusterServerPreAttributeChangedCallback(const chip::app:: * @param value Attribute value */ chip::Protocols::InteractionModel::Status -MatterRvcRunModeSelectClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, - EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +MatterRvcRunModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Run Mode Select Cluster Server Tick +/** @brief RVC Run Mode Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcRunModeSelectClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief RVC Run Mode Select Cluster Client Tick +/** @brief RVC Run Mode Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcRunModeSelectClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfRvcRunModeClusterClientTickCallback(chip::EndpointId endpoint); // -// RVC Clean Mode Select Cluster +// RVC Clean Mode Cluster // -/** @brief RVC Clean Mode Select Cluster Server Init +/** @brief RVC Clean Mode Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcCleanModeSelectClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Mode Select Cluster Server Shutdown +/** @brief RVC Clean Mode Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterRvcCleanModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterRvcCleanModeClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Mode Select Cluster Client Init +/** @brief RVC Clean Mode Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfRvcCleanModeSelectClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Mode Select Cluster Server Attribute Changed +/** @brief RVC Clean Mode Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterRvcCleanModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterRvcCleanModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief RVC Clean Mode Select Cluster Server Pre Attribute Changed +/** @brief RVC Clean Mode Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4684,10 +4686,11 @@ void MatterRvcCleanModeSelectClusterServerAttributeChangedCallback(const chip::a * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterRvcCleanModeSelectClusterServerPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status +MatterRvcCleanModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Clean Mode Select Cluster Client Pre Attribute Changed +/** @brief RVC Clean Mode Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4696,24 +4699,25 @@ chip::Protocols::InteractionModel::Status MatterRvcCleanModeSelectClusterServerP * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterRvcCleanModeSelectClusterClientPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status +MatterRvcCleanModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief RVC Clean Mode Select Cluster Server Tick +/** @brief RVC Clean Mode Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcCleanModeSelectClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief RVC Clean Mode Select Cluster Client Tick +/** @brief RVC Clean Mode Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfRvcCleanModeSelectClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfRvcCleanModeClusterClientTickCallback(chip::EndpointId endpoint); // // Temperature Control Cluster @@ -4870,42 +4874,42 @@ void emberAfRefrigeratorAlarmClusterServerTickCallback(chip::EndpointId endpoint void emberAfRefrigeratorAlarmClusterClientTickCallback(chip::EndpointId endpoint); // -// Dishwasher Mode Select Cluster +// Dishwasher Mode Cluster // -/** @brief Dishwasher Mode Select Cluster Server Init +/** @brief Dishwasher Mode Cluster Server Init * * Server Init * * @param endpoint Endpoint that is being initialized */ -void emberAfDishwasherModeSelectClusterServerInitCallback(chip::EndpointId endpoint); +void emberAfDishwasherModeClusterServerInitCallback(chip::EndpointId endpoint); -/** @brief Dishwasher Mode Select Cluster Server Shutdown +/** @brief Dishwasher Mode Cluster Server Shutdown * * Server Shutdown * * @param endpoint Endpoint that is being shutdown */ -void MatterDishwasherModeSelectClusterServerShutdownCallback(chip::EndpointId endpoint); +void MatterDishwasherModeClusterServerShutdownCallback(chip::EndpointId endpoint); -/** @brief Dishwasher Mode Select Cluster Client Init +/** @brief Dishwasher Mode Cluster Client Init * * Client Init * * @param endpoint Endpoint that is being initialized */ -void emberAfDishwasherModeSelectClusterClientInitCallback(chip::EndpointId endpoint); +void emberAfDishwasherModeClusterClientInitCallback(chip::EndpointId endpoint); -/** @brief Dishwasher Mode Select Cluster Server Attribute Changed +/** @brief Dishwasher Mode Cluster Server Attribute Changed * * Server Attribute Changed * * @param attributePath Concrete attribute path that changed */ -void MatterDishwasherModeSelectClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); +void MatterDishwasherModeClusterServerAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath); -/** @brief Dishwasher Mode Select Cluster Server Pre Attribute Changed +/** @brief Dishwasher Mode Cluster Server Pre Attribute Changed * * Server Pre Attribute Changed * @@ -4914,10 +4918,11 @@ void MatterDishwasherModeSelectClusterServerAttributeChangedCallback(const chip: * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterDishwasherModeSelectClusterServerPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status +MatterDishwasherModeClusterServerPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Dishwasher Mode Select Cluster Client Pre Attribute Changed +/** @brief Dishwasher Mode Cluster Client Pre Attribute Changed * * Client Pre Attribute Changed * @@ -4926,24 +4931,25 @@ chip::Protocols::InteractionModel::Status MatterDishwasherModeSelectClusterServe * @param size Attribute size * @param value Attribute value */ -chip::Protocols::InteractionModel::Status MatterDishwasherModeSelectClusterClientPreAttributeChangedCallback( - const chip::app::ConcreteAttributePath & attributePath, EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); +chip::Protocols::InteractionModel::Status +MatterDishwasherModeClusterClientPreAttributeChangedCallback(const chip::app::ConcreteAttributePath & attributePath, + EmberAfAttributeType attributeType, uint16_t size, uint8_t * value); -/** @brief Dishwasher Mode Select Cluster Server Tick +/** @brief Dishwasher Mode Cluster Server Tick * * Server Tick * * @param endpoint Endpoint that is being served */ -void emberAfDishwasherModeSelectClusterServerTickCallback(chip::EndpointId endpoint); +void emberAfDishwasherModeClusterServerTickCallback(chip::EndpointId endpoint); -/** @brief Dishwasher Mode Select Cluster Client Tick +/** @brief Dishwasher Mode Cluster Client Tick * * Client Tick * * @param endpoint Endpoint that is being served */ -void emberAfDishwasherModeSelectClusterClientTickCallback(chip::EndpointId endpoint); +void emberAfDishwasherModeClusterClientTickCallback(chip::EndpointId endpoint); // // Air Quality Cluster @@ -11711,61 +11717,30 @@ bool emberAfModeSelectClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::ModeSelect::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief Mode Select Cluster ChangeToModeWithStatus Command callback (from client) - */ -bool emberAfModeSelectClusterChangeToModeWithStatusCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::ModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); -/** - * @brief Laundry Washer Mode Select Cluster ChangeToMode Command callback (from client) + * @brief Laundry Washer Mode Cluster ChangeToMode Command callback (from client) */ -bool emberAfLaundryWasherModeSelectClusterChangeToModeCallback( +bool emberAfLaundryWasherModeClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToMode::DecodableType & commandData); + const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief Laundry Washer Mode Select Cluster ChangeToModeWithStatus Command callback (from client) + * @brief Refrigerator And Temperature Controlled Cabinet Mode Cluster ChangeToMode Command callback (from client) */ -bool emberAfLaundryWasherModeSelectClusterChangeToModeWithStatusCallback( +bool emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); -/** - * @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster ChangeToMode Command callback (from client) - */ -bool emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::DecodableType & + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief Refrigerator And Temperature Controlled Cabinet Mode Select Cluster ChangeToModeWithStatus Command callback (from client) - */ -bool emberAfRefrigeratorAndTemperatureControlledCabinetModeSelectClusterChangeToModeWithStatusCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus:: - DecodableType & commandData); -/** - * @brief RVC Run Mode Select Cluster ChangeToMode Command callback (from client) - */ -bool emberAfRvcRunModeSelectClusterChangeToModeCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToMode::DecodableType & commandData); -/** - * @brief RVC Run Mode Select Cluster ChangeToModeWithStatus Command callback (from client) - */ -bool emberAfRvcRunModeSelectClusterChangeToModeWithStatusCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); -/** - * @brief RVC Clean Mode Select Cluster ChangeToMode Command callback (from client) + * @brief RVC Run Mode Cluster ChangeToMode Command callback (from client) */ -bool emberAfRvcCleanModeSelectClusterChangeToModeCallback( +bool emberAfRvcRunModeClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToMode::DecodableType & commandData); + const chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::DecodableType & commandData); /** - * @brief RVC Clean Mode Select Cluster ChangeToModeWithStatus Command callback (from client) + * @brief RVC Clean Mode Cluster ChangeToMode Command callback (from client) */ -bool emberAfRvcCleanModeSelectClusterChangeToModeWithStatusCallback( +bool emberAfRvcCleanModeClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); + const chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::DecodableType & commandData); /** * @brief Temperature Control Cluster SetTemperature Command callback (from client) */ @@ -11773,17 +11748,11 @@ bool emberAfTemperatureControlClusterSetTemperatureCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, const chip::app::Clusters::TemperatureControl::Commands::SetTemperature::DecodableType & commandData); /** - * @brief Dishwasher Mode Select Cluster ChangeToMode Command callback (from client) - */ -bool emberAfDishwasherModeSelectClusterChangeToModeCallback( - chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToMode::DecodableType & commandData); -/** - * @brief Dishwasher Mode Select Cluster ChangeToModeWithStatus Command callback (from client) + * @brief Dishwasher Mode Cluster ChangeToMode Command callback (from client) */ -bool emberAfDishwasherModeSelectClusterChangeToModeWithStatusCallback( +bool emberAfDishwasherModeClusterChangeToModeCallback( chip::app::CommandHandler * commandObj, const chip::app::ConcreteCommandPath & commandPath, - const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeWithStatus::DecodableType & commandData); + const chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::DecodableType & commandData); /** * @brief Smoke CO Alarm Cluster SelfTestRequest 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 c46fcf136fc3ac..4db5f488faf6aa 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 @@ -1237,43 +1237,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(GroupKeyManagement::Gro } } -static auto __attribute__((unused)) EnsureKnownEnumValue(ModeSelect::ModeTag val) +static auto __attribute__((unused)) EnsureKnownEnumValue(LaundryWasherMode::ModeTag val) { - using EnumType = ModeSelect::ModeTag; - switch (val) - { - case EnumType::kAuto: - case EnumType::kQuick: - case EnumType::kQuiet: - case EnumType::kLowNoise: - case EnumType::kLowEnergy: - case EnumType::kVacation: - case EnumType::kMin: - case EnumType::kMax: - case EnumType::kNight: - case EnumType::kDay: - return val; - default: - return static_cast(10); - } -} -static auto __attribute__((unused)) EnsureKnownEnumValue(ModeSelect::StatusCode val) -{ - using EnumType = ModeSelect::StatusCode; - switch (val) - { - case EnumType::kSuccess: - case EnumType::kUnsupportedMode: - case EnumType::kGenericFailure: - return val; - default: - return static_cast(3); - } -} - -static auto __attribute__((unused)) EnsureKnownEnumValue(LaundryWasherModeSelect::ModeTag val) -{ - using EnumType = LaundryWasherModeSelect::ModeTag; + using EnumType = LaundryWasherMode::ModeTag; switch (val) { case EnumType::kNormal: @@ -1286,9 +1252,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(LaundryWasherModeSelect } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RefrigeratorAndTemperatureControlledCabinetModeSelect::ModeTag val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RefrigeratorAndTemperatureControlledCabinetMode::ModeTag val) { - using EnumType = RefrigeratorAndTemperatureControlledCabinetModeSelect::ModeTag; + using EnumType = RefrigeratorAndTemperatureControlledCabinetMode::ModeTag; switch (val) { case EnumType::kRapidCool: @@ -1299,9 +1265,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RefrigeratorAndTemperat } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunModeSelect::ModeTag val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunMode::ModeTag val) { - using EnumType = RvcRunModeSelect::ModeTag; + using EnumType = RvcRunMode::ModeTag; switch (val) { case EnumType::kIdle: @@ -1311,9 +1277,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunModeSelect::ModeT return static_cast(0); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunModeSelect::StatusCode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunMode::StatusCode val) { - using EnumType = RvcRunModeSelect::StatusCode; + using EnumType = RvcRunMode::StatusCode; switch (val) { case EnumType::kStuck: @@ -1330,9 +1296,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcRunModeSelect::Statu } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanModeSelect::ModeTag val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanMode::ModeTag val) { - using EnumType = RvcCleanModeSelect::ModeTag; + using EnumType = RvcCleanMode::ModeTag; switch (val) { case EnumType::kDeepClean: @@ -1343,9 +1309,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanModeSelect::Mod return static_cast(0); } } -static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanModeSelect::StatusCode val) +static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanMode::StatusCode val) { - using EnumType = RvcCleanModeSelect::StatusCode; + using EnumType = RvcCleanMode::StatusCode; switch (val) { case EnumType::kCleaningInProgress: @@ -1355,9 +1321,9 @@ static auto __attribute__((unused)) EnsureKnownEnumValue(RvcCleanModeSelect::Sta } } -static auto __attribute__((unused)) EnsureKnownEnumValue(DishwasherModeSelect::ModeTag val) +static auto __attribute__((unused)) EnsureKnownEnumValue(DishwasherMode::ModeTag val) { - using EnumType = DishwasherModeSelect::ModeTag; + using EnumType = DishwasherMode::ModeTag; switch (val) { case EnumType::kNormal: 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 b2f8e557c3ac27..121eaeae62f0ed 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 @@ -1468,48 +1468,14 @@ enum class Feature : uint32_t namespace ModeSelect { -// Enum for ModeTag -enum class ModeTag : uint16_t -{ - kAuto = 0x00, - kQuick = 0x01, - kQuiet = 0x02, - kLowNoise = 0x03, - kLowEnergy = 0x04, - kVacation = 0x05, - kMin = 0x06, - kMax = 0x07, - kNight = 0x08, - kDay = 0x09, - // All received enum values that are not listed above will be mapped - // to kUnknownEnumValue. This is a helper enum value that should only - // be used by code to process how it handles receiving and unknown - // enum value. This specific should never be transmitted. - kUnknownEnumValue = 10, -}; - -// Enum for StatusCode -enum class StatusCode : uint8_t -{ - kSuccess = 0x00, - kUnsupportedMode = 0x01, - kGenericFailure = 0x02, - // All received enum values that are not listed above will be mapped - // to kUnknownEnumValue. This is a helper enum value that should only - // be used by code to process how it handles receiving and unknown - // enum value. This specific should never be transmitted. - kUnknownEnumValue = 3, -}; - // Bitmap for Feature enum class Feature : uint32_t { - kOnOff = 0x1, - kExtendedStatus = 0x2, + kOnOff = 0x1, }; } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { // Enum for ModeTag enum class ModeTag : uint16_t @@ -1528,12 +1494,11 @@ enum class ModeTag : uint16_t // Bitmap for Feature enum class Feature : uint32_t { - kOnOff = 0x1, - kExtendedStatus = 0x2, + kOnOff = 0x1, }; -} // namespace LaundryWasherModeSelect +} // namespace LaundryWasherMode -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +namespace RefrigeratorAndTemperatureControlledCabinetMode { // Enum for ModeTag enum class ModeTag : uint16_t @@ -1550,10 +1515,9 @@ enum class ModeTag : uint16_t // Bitmap for Feature enum class Feature : uint32_t { - kOnOff = 0x1, - kExtendedStatus = 0x2, + kOnOff = 0x1, }; -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { @@ -1565,7 +1529,7 @@ enum class Feature : uint32_t }; } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { // Enum for ModeTag enum class ModeTag : uint16_t @@ -1600,12 +1564,11 @@ enum class StatusCode : uint8_t // Bitmap for Feature enum class Feature : uint32_t { - kOnOff = 0x1, - kExtendedStatus = 0x2, + kOnOff = 0x1, }; -} // namespace RvcRunModeSelect +} // namespace RvcRunMode -namespace RvcCleanModeSelect { +namespace RvcCleanMode { // Enum for ModeTag enum class ModeTag : uint16_t @@ -1634,10 +1597,9 @@ enum class StatusCode : uint8_t // Bitmap for Feature enum class Feature : uint32_t { - kOnOff = 0x1, - kExtendedStatus = 0x2, + kOnOff = 0x1, }; -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { @@ -1659,7 +1621,7 @@ enum class AlarmMap : uint32_t }; } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { // Enum for ModeTag enum class ModeTag : uint16_t @@ -1677,10 +1639,9 @@ enum class ModeTag : uint16_t // Bitmap for Feature enum class Feature : uint32_t { - kOnOff = 0x1, - kExtendedStatus = 0x2, + kOnOff = 0x1, }; -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { 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 90dec009d9c8e7..d000e28af8987a 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 @@ -33,7 +33,6 @@ CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kMfgCode), mfgCode)); ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kValue), value)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kTagName), tagName)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -59,9 +58,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) case to_underlying(Fields::kValue): ReturnErrorOnFailure(DataModel::Decode(reader, value)); break; - case to_underlying(Fields::kTagName): - ReturnErrorOnFailure(DataModel::Decode(reader, tagName)); - break; default: break; } @@ -11427,15 +11423,14 @@ namespace Events {} // namespace Events } // namespace IcdManagement namespace ModeSelect { -namespace Structs {} // namespace Structs - -namespace Commands { -namespace ChangeToMode { +namespace Structs { +namespace SemanticTagStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kMfgCode), mfgCode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kValue), value)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -11445,7 +11440,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { if (!TLV::IsContextTag(reader.GetTag())) @@ -11454,8 +11450,11 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); + case to_underlying(Fields::kMfgCode): + ReturnErrorOnFailure(DataModel::Decode(reader, mfgCode)); + break; + case to_underlying(Fields::kValue): + ReturnErrorOnFailure(DataModel::Decode(reader, value)); break; default: break; @@ -11464,15 +11463,19 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; } -} // namespace ChangeToMode. -namespace ChangeToModeWithStatus { + +} // namespace SemanticTagStruct +namespace ModeOptionStruct { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kLabel), label)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kMode), mode)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kSemanticTags), semanticTags)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -11482,7 +11485,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) CHIP_ERROR err = CHIP_NO_ERROR; TLV::TLVType outer; VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); + err = reader.EnterContainer(outer); + ReturnErrorOnFailure(err); while ((err = reader.Next()) == CHIP_NO_ERROR) { if (!TLV::IsContextTag(reader.GetTag())) @@ -11491,8 +11495,14 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); + case to_underlying(Fields::kLabel): + ReturnErrorOnFailure(DataModel::Decode(reader, label)); + break; + case to_underlying(Fields::kMode): + ReturnErrorOnFailure(DataModel::Decode(reader, mode)); + break; + case to_underlying(Fields::kSemanticTags): + ReturnErrorOnFailure(DataModel::Decode(reader, semanticTags)); break; default: break; @@ -11501,16 +11511,20 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) VerifyOrReturnError(err == CHIP_END_OF_TLV, err); ReturnErrorOnFailure(reader.ExitContainer(outer)); + return CHIP_NO_ERROR; } -} // namespace ChangeToModeWithStatus. -namespace ChangeToModeResponse { + +} // namespace ModeOptionStruct +} // namespace Structs + +namespace Commands { +namespace ChangeToMode { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { TLV::TLVType outer; ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kStatus), status)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kStatusText), statusText)); + ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); ReturnErrorOnFailure(writer.EndContainer(outer)); return CHIP_NO_ERROR; } @@ -11529,11 +11543,8 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } switch (TLV::TagNumFromTag(reader.GetTag())) { - case to_underlying(Fields::kStatus): - ReturnErrorOnFailure(DataModel::Decode(reader, status)); - break; - case to_underlying(Fields::kStatusText): - ReturnErrorOnFailure(DataModel::Decode(reader, statusText)); + case to_underlying(Fields::kNewMode): + ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); break; default: break; @@ -11544,7 +11555,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) ReturnErrorOnFailure(reader.ExitContainer(outer)); return CHIP_NO_ERROR; } -} // namespace ChangeToModeResponse. +} // namespace ChangeToMode. } // namespace Commands namespace Attributes { @@ -11599,7 +11610,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { namespace Structs {} // namespace Structs namespace Commands { @@ -11640,43 +11651,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace ChangeToMode. -namespace ChangeToModeWithStatus { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace ChangeToModeWithStatus. namespace ChangeToModeResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -11725,9 +11699,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::Description::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, description)); - break; case Attributes::SupportedModes::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, supportedModes)); break; @@ -11768,8 +11739,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +} // namespace LaundryWasherMode +namespace RefrigeratorAndTemperatureControlledCabinetMode { namespace Structs {} // namespace Structs namespace Commands { @@ -11810,43 +11781,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace ChangeToMode. -namespace ChangeToModeWithStatus { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace ChangeToModeWithStatus. namespace ChangeToModeResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -11895,9 +11829,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::Description::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, description)); - break; case Attributes::SupportedModes::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, supportedModes)); break; @@ -11938,7 +11869,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { namespace Commands {} // namespace Commands @@ -11989,7 +11920,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { namespace Structs {} // namespace Structs namespace Commands { @@ -12030,43 +11961,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace ChangeToMode. -namespace ChangeToModeWithStatus { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace ChangeToModeWithStatus. namespace ChangeToModeResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -12115,9 +12009,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::Description::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, description)); - break; case Attributes::SupportedModes::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, supportedModes)); break; @@ -12158,8 +12049,8 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace RvcRunModeSelect -namespace RvcCleanModeSelect { +} // namespace RvcRunMode +namespace RvcCleanMode { namespace Structs {} // namespace Structs namespace Commands { @@ -12200,43 +12091,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace ChangeToMode. -namespace ChangeToModeWithStatus { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace ChangeToModeWithStatus. namespace ChangeToModeResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -12285,9 +12139,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::Description::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, description)); - break; case Attributes::SupportedModes::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, supportedModes)); break; @@ -12328,7 +12179,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { namespace Commands { @@ -12521,7 +12372,7 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) } // namespace Events } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { namespace Structs {} // namespace Structs namespace Commands { @@ -12562,43 +12413,6 @@ CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) return CHIP_NO_ERROR; } } // namespace ChangeToMode. -namespace ChangeToModeWithStatus { -CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const -{ - TLV::TLVType outer; - ReturnErrorOnFailure(writer.StartContainer(tag, TLV::kTLVType_Structure, outer)); - ReturnErrorOnFailure(DataModel::Encode(writer, TLV::ContextTag(Fields::kNewMode), newMode)); - ReturnErrorOnFailure(writer.EndContainer(outer)); - return CHIP_NO_ERROR; -} - -CHIP_ERROR DecodableType::Decode(TLV::TLVReader & reader) -{ - CHIP_ERROR err = CHIP_NO_ERROR; - TLV::TLVType outer; - VerifyOrReturnError(TLV::kTLVType_Structure == reader.GetType(), CHIP_ERROR_WRONG_TLV_TYPE); - ReturnErrorOnFailure(reader.EnterContainer(outer)); - while ((err = reader.Next()) == CHIP_NO_ERROR) - { - if (!TLV::IsContextTag(reader.GetTag())) - { - continue; - } - switch (TLV::TagNumFromTag(reader.GetTag())) - { - case to_underlying(Fields::kNewMode): - ReturnErrorOnFailure(DataModel::Decode(reader, newMode)); - break; - default: - break; - } - } - - VerifyOrReturnError(err == CHIP_END_OF_TLV, err); - ReturnErrorOnFailure(reader.ExitContainer(outer)); - return CHIP_NO_ERROR; -} -} // namespace ChangeToModeWithStatus. namespace ChangeToModeResponse { CHIP_ERROR Type::Encode(TLV::TLVWriter & writer, TLV::Tag tag) const { @@ -12647,9 +12461,6 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre { switch (path.mAttributeId) { - case Attributes::Description::TypeInfo::GetAttributeId(): - ReturnErrorOnFailure(DataModel::Decode(reader, description)); - break; case Attributes::SupportedModes::TypeInfo::GetAttributeId(): ReturnErrorOnFailure(DataModel::Decode(reader, supportedModes)); break; @@ -12690,7 +12501,7 @@ CHIP_ERROR TypeInfo::DecodableType::Decode(TLV::TLVReader & reader, const Concre namespace Events {} // namespace Events -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { namespace Commands {} // namespace Commands @@ -28333,28 +28144,28 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand) return false; } } - case Clusters::LaundryWasherModeSelect::Id: { + case Clusters::LaundryWasherMode::Id: { switch (aCommand) { default: return false; } } - case Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + case Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id: { switch (aCommand) { default: return false; } } - case Clusters::RvcRunModeSelect::Id: { + case Clusters::RvcRunMode::Id: { switch (aCommand) { default: return false; } } - case Clusters::RvcCleanModeSelect::Id: { + case Clusters::RvcCleanMode::Id: { switch (aCommand) { default: @@ -28368,7 +28179,7 @@ bool CommandIsFabricScoped(ClusterId aCluster, CommandId aCommand) return false; } } - case Clusters::DishwasherModeSelect::Id: { + case Clusters::DishwasherMode::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 f024462a19e51e..7d386143d47cf9 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 @@ -48,7 +48,6 @@ enum class Fields : uint8_t { kMfgCode = 0, kValue = 1, - kTagName = 2, }; struct Type @@ -56,7 +55,6 @@ struct Type public: Optional mfgCode; uint16_t value = static_cast(0); - Optional tagName; CHIP_ERROR Decode(TLV::TLVReader & reader); @@ -14075,111 +14073,89 @@ struct TypeInfo } // namespace IcdManagement namespace ModeSelect { namespace Structs { -namespace ModeTagStruct = Clusters::detail::Structs::ModeTagStruct; -namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct; -} // namespace Structs - -namespace Commands { -// Forward-declarations so we can reference these later. - -namespace ChangeToMode { -struct Type; -struct DecodableType; -} // namespace ChangeToMode - -namespace ChangeToModeWithStatus { -struct Type; -struct DecodableType; -} // namespace ChangeToModeWithStatus - -namespace ChangeToModeResponse { -struct Type; -struct DecodableType; -} // namespace ChangeToModeResponse - -} // namespace Commands - -namespace Commands { -namespace ChangeToMode { +namespace SemanticTagStruct { enum class Fields : uint8_t { - kNewMode = 0, + kMfgCode = 0, + kValue = 1, }; 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::ModeSelect::Id; } + chip::VendorId mfgCode = static_cast(0); + uint16_t value = static_cast(0); - uint8_t newMode = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; + CHIP_ERROR Decode(TLV::TLVReader & reader); - using ResponseType = DataModel::NullObjectType; + static constexpr bool kIsFabricScoped = false; - static constexpr bool MustUseTimedInvoke() { return false; } + CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; }; -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; } +using DecodableType = Type; - uint8_t newMode = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeToMode -namespace ChangeToModeWithStatus { +} // namespace SemanticTagStruct +namespace ModeOptionStruct { enum class Fields : uint8_t { - kNewMode = 0, + kLabel = 0, + kMode = 1, + kSemanticTags = 2, }; 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::ModeSelect::Id; } + chip::CharSpan label; + uint8_t mode = static_cast(0); + DataModel::List semanticTags; - uint8_t newMode = static_cast(0); + static constexpr bool kIsFabricScoped = false; CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::ModeSelect::Commands::ChangeToModeResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } }; struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; } + chip::CharSpan label; + uint8_t mode = static_cast(0); + DataModel::DecodableList semanticTags; - uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); + + static constexpr bool kIsFabricScoped = false; }; -}; // namespace ChangeToModeWithStatus -namespace ChangeToModeResponse { + +} // namespace ModeOptionStruct +} // namespace Structs + +namespace Commands { +// Forward-declarations so we can reference these later. + +namespace ChangeToMode { +struct Type; +struct DecodableType; +} // namespace ChangeToMode + +} // namespace Commands + +namespace Commands { +namespace ChangeToMode { enum class Fields : uint8_t { - kStatus = 0, - kStatusText = 1, + kNewMode = 0, }; 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 CommandId GetCommandId() { return Commands::ChangeToMode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; } - uint8_t status = static_cast(0); - Optional statusText; + uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; @@ -14191,14 +14167,13 @@ struct Type struct DecodableType { public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } + static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } static constexpr ClusterId GetClusterId() { return Clusters::ModeSelect::Id; } - uint8_t status = static_cast(0); - Optional statusText; + uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; -}; // namespace ChangeToModeResponse +}; // namespace ChangeToMode } // namespace Commands namespace Attributes { @@ -14339,7 +14314,7 @@ struct TypeInfo }; } // namespace Attributes } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { namespace Structs { namespace ModeTagStruct = Clusters::detail::Structs::ModeTagStruct; namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct; @@ -14353,11 +14328,6 @@ struct Type; struct DecodableType; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -struct Type; -struct DecodableType; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { struct Type; struct DecodableType; @@ -14377,13 +14347,13 @@ 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::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14392,44 +14362,12 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ChangeToMode -namespace ChangeToModeWithStatus { -enum class Fields : uint8_t -{ - kNewMode = 0, -}; - -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::LaundryWasherModeSelect::Id; } - - uint8_t newMode = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } - - uint8_t newMode = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeToModeWithStatus namespace ChangeToModeResponse { enum class Fields : uint8_t { @@ -14442,7 +14380,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::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -14458,7 +14396,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -14469,29 +14407,16 @@ struct DecodableType namespace Attributes { -namespace Description { -struct TypeInfo -{ - using Type = chip::CharSpan; - using DecodableType = chip::CharSpan; - using DecodableArgType = chip::CharSpan; - - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; } - static constexpr bool MustUseTimedWrite() { return false; } - static constexpr size_t MaxLength() { return 64; } -}; -} // namespace Description namespace SupportedModes { struct TypeInfo { - using Type = chip::app::DataModel::List; + using Type = chip::app::DataModel::List; using DecodableType = - chip::app::DataModel::DecodableList; + chip::app::DataModel::DecodableList; using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::LaundryWasherModeSelect::Structs::ModeOptionStruct::DecodableType> &; + chip::app::Clusters::LaundryWasherMode::Structs::ModeOptionStruct::DecodableType> &; - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14503,7 +14428,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14515,7 +14440,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14527,7 +14452,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14535,37 +14460,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } }; } // namespace ClusterRevision @@ -14573,11 +14498,10 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::LaundryWasherMode::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::Description::TypeInfo::DecodableType description; Attributes::SupportedModes::TypeInfo::DecodableType supportedModes; Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast(0); Attributes::StartUpMode::TypeInfo::DecodableType startUpMode; @@ -14591,8 +14515,8 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +} // namespace LaundryWasherMode +namespace RefrigeratorAndTemperatureControlledCabinetMode { namespace Structs { namespace ModeTagStruct = Clusters::detail::Structs::ModeTagStruct; namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct; @@ -14606,11 +14530,6 @@ struct Type; struct DecodableType; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -struct Type; -struct DecodableType; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { struct Type; struct DecodableType; @@ -14630,13 +14549,13 @@ 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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -14645,45 +14564,12 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ChangeToMode -namespace ChangeToModeWithStatus { -enum class Fields : uint8_t -{ - kNewMode = 0, -}; - -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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } - - uint8_t newMode = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = - Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } - - uint8_t newMode = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeToModeWithStatus namespace ChangeToModeResponse { enum class Fields : uint8_t { @@ -14696,7 +14582,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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -14712,7 +14598,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -14723,30 +14609,17 @@ struct DecodableType namespace Attributes { -namespace Description { -struct TypeInfo -{ - using Type = chip::CharSpan; - using DecodableType = chip::CharSpan; - using DecodableArgType = chip::CharSpan; - - 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; } -}; -} // namespace Description namespace SupportedModes { struct TypeInfo { using Type = chip::app::DataModel::List< - const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::Type>; + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::Type>; using DecodableType = chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType>; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType>; using DecodableArgType = const chip::app::DataModel::DecodableList< - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Structs::ModeOptionStruct::DecodableType> &; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> &; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14758,7 +14631,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14770,7 +14643,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14782,7 +14655,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -14790,37 +14663,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } }; } // namespace ClusterRevision @@ -14828,11 +14701,10 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::Description::TypeInfo::DecodableType description; Attributes::SupportedModes::TypeInfo::DecodableType supportedModes; Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast(0); Attributes::StartUpMode::TypeInfo::DecodableType startUpMode; @@ -14846,7 +14718,7 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { namespace Attributes { @@ -14958,7 +14830,7 @@ struct TypeInfo }; } // namespace Attributes } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { namespace Structs { namespace ModeTagStruct = Clusters::detail::Structs::ModeTagStruct; namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct; @@ -14972,11 +14844,6 @@ struct Type; struct DecodableType; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -struct Type; -struct DecodableType; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { struct Type; struct DecodableType; @@ -14996,13 +14863,13 @@ 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::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15011,44 +14878,12 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ChangeToMode -namespace ChangeToModeWithStatus { -enum class Fields : uint8_t -{ - kNewMode = 0, -}; - -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::RvcRunModeSelect::Id; } - - uint8_t newMode = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } - - uint8_t newMode = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeToModeWithStatus namespace ChangeToModeResponse { enum class Fields : uint8_t { @@ -15061,7 +14896,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::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15077,7 +14912,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15088,29 +14923,16 @@ struct DecodableType namespace Attributes { -namespace Description { -struct TypeInfo -{ - using Type = chip::CharSpan; - using DecodableType = chip::CharSpan; - using DecodableArgType = chip::CharSpan; - - 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; } -}; -} // namespace Description 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::Clusters::RvcRunModeSelect::Structs::ModeOptionStruct::DecodableType> &; + chip::app::DataModel::DecodableList; + using DecodableArgType = + const chip::app::DataModel::DecodableList &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15122,7 +14944,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15134,7 +14956,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15146,7 +14968,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15154,37 +14976,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } }; } // namespace ClusterRevision @@ -15192,11 +15014,10 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::RvcRunModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcRunMode::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::Description::TypeInfo::DecodableType description; Attributes::SupportedModes::TypeInfo::DecodableType supportedModes; Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast(0); Attributes::StartUpMode::TypeInfo::DecodableType startUpMode; @@ -15210,8 +15031,8 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace RvcRunModeSelect -namespace RvcCleanModeSelect { +} // namespace RvcRunMode +namespace RvcCleanMode { namespace Structs { namespace ModeTagStruct = Clusters::detail::Structs::ModeTagStruct; namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct; @@ -15225,11 +15046,6 @@ struct Type; struct DecodableType; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -struct Type; -struct DecodableType; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { struct Type; struct DecodableType; @@ -15249,13 +15065,13 @@ 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::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15264,44 +15080,12 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ChangeToMode -namespace ChangeToModeWithStatus { -enum class Fields : uint8_t -{ - kNewMode = 0, -}; - -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::RvcCleanModeSelect::Id; } - - uint8_t newMode = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } - - uint8_t newMode = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeToModeWithStatus namespace ChangeToModeResponse { enum class Fields : uint8_t { @@ -15314,7 +15098,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::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15330,7 +15114,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15341,29 +15125,16 @@ struct DecodableType namespace Attributes { -namespace Description { -struct TypeInfo -{ - using Type = chip::CharSpan; - using DecodableType = chip::CharSpan; - using DecodableArgType = chip::CharSpan; - - 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; } -}; -} // namespace Description 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::Clusters::RvcCleanModeSelect::Structs::ModeOptionStruct::DecodableType> &; + chip::app::DataModel::DecodableList; + using DecodableArgType = + const chip::app::DataModel::DecodableList &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15375,7 +15146,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15387,7 +15158,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15399,7 +15170,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15407,37 +15178,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } }; } // namespace ClusterRevision @@ -15445,11 +15216,10 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::RvcCleanMode::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::Description::TypeInfo::DecodableType description; Attributes::SupportedModes::TypeInfo::DecodableType supportedModes; Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast(0); Attributes::StartUpMode::TypeInfo::DecodableType startUpMode; @@ -15463,7 +15233,7 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { namespace Commands { @@ -15780,7 +15550,7 @@ struct DecodableType } // namespace Notify } // namespace Events } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { namespace Structs { namespace ModeTagStruct = Clusters::detail::Structs::ModeTagStruct; namespace ModeOptionStruct = Clusters::detail::Structs::ModeOptionStruct; @@ -15794,11 +15564,6 @@ struct Type; struct DecodableType; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -struct Type; -struct DecodableType; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { struct Type; struct DecodableType; @@ -15818,13 +15583,13 @@ 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::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - using ResponseType = DataModel::NullObjectType; + using ResponseType = Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType; static constexpr bool MustUseTimedInvoke() { return false; } }; @@ -15833,44 +15598,12 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToMode::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } uint8_t newMode = static_cast(0); CHIP_ERROR Decode(TLV::TLVReader & reader); }; }; // namespace ChangeToMode -namespace ChangeToModeWithStatus { -enum class Fields : uint8_t -{ - kNewMode = 0, -}; - -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::DishwasherModeSelect::Id; } - - uint8_t newMode = static_cast(0); - - CHIP_ERROR Encode(TLV::TLVWriter & writer, TLV::Tag tag) const; - - using ResponseType = Clusters::DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType; - - static constexpr bool MustUseTimedInvoke() { return false; } -}; - -struct DecodableType -{ -public: - static constexpr CommandId GetCommandId() { return Commands::ChangeToModeWithStatus::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } - - uint8_t newMode = static_cast(0); - CHIP_ERROR Decode(TLV::TLVReader & reader); -}; -}; // namespace ChangeToModeWithStatus namespace ChangeToModeResponse { enum class Fields : uint8_t { @@ -15883,7 +15616,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::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15899,7 +15632,7 @@ struct DecodableType { public: static constexpr CommandId GetCommandId() { return Commands::ChangeToModeResponse::Id; } - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } uint8_t status = static_cast(0); Optional statusText; @@ -15910,29 +15643,16 @@ struct DecodableType namespace Attributes { -namespace Description { -struct TypeInfo -{ - using Type = chip::CharSpan; - using DecodableType = chip::CharSpan; - using DecodableArgType = chip::CharSpan; - - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } - static constexpr AttributeId GetAttributeId() { return Attributes::Description::Id; } - static constexpr bool MustUseTimedWrite() { return false; } - static constexpr size_t MaxLength() { return 64; } -}; -} // namespace Description 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::Clusters::DishwasherModeSelect::Structs::ModeOptionStruct::DecodableType> &; + chip::app::DataModel::DecodableList; + using DecodableArgType = + const chip::app::DataModel::DecodableList &; - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::SupportedModes::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15944,7 +15664,7 @@ struct TypeInfo using DecodableType = uint8_t; using DecodableArgType = uint8_t; - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15956,7 +15676,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::StartUpMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15968,7 +15688,7 @@ struct TypeInfo using DecodableType = chip::app::DataModel::Nullable; using DecodableArgType = const chip::app::DataModel::Nullable &; - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::OnMode::Id; } static constexpr bool MustUseTimedWrite() { return false; } }; @@ -15976,37 +15696,37 @@ struct TypeInfo namespace GeneratedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::GeneratedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } }; } // namespace GeneratedCommandList namespace AcceptedCommandList { struct TypeInfo : public Clusters::Globals::Attributes::AcceptedCommandList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } }; } // namespace AcceptedCommandList namespace EventList { struct TypeInfo : public Clusters::Globals::Attributes::EventList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } }; } // namespace EventList namespace AttributeList { struct TypeInfo : public Clusters::Globals::Attributes::AttributeList::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } }; } // namespace AttributeList namespace FeatureMap { struct TypeInfo : public Clusters::Globals::Attributes::FeatureMap::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } }; } // namespace FeatureMap namespace ClusterRevision { struct TypeInfo : public Clusters::Globals::Attributes::ClusterRevision::TypeInfo { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } }; } // namespace ClusterRevision @@ -16014,11 +15734,10 @@ struct TypeInfo { struct DecodableType { - static constexpr ClusterId GetClusterId() { return Clusters::DishwasherModeSelect::Id; } + static constexpr ClusterId GetClusterId() { return Clusters::DishwasherMode::Id; } CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); - Attributes::Description::TypeInfo::DecodableType description; Attributes::SupportedModes::TypeInfo::DecodableType supportedModes; Attributes::CurrentMode::TypeInfo::DecodableType currentMode = static_cast(0); Attributes::StartUpMode::TypeInfo::DecodableType startUpMode; @@ -16032,7 +15751,7 @@ struct TypeInfo }; }; } // namespace Attributes -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { namespace Attributes { 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 0e53f32c7b92c1..a20b6cd0022bff 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 @@ -2467,27 +2467,23 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { namespace Attributes { -namespace Description { -static constexpr AttributeId Id = 0x00000000; -} // namespace Description - namespace SupportedModes { -static constexpr AttributeId Id = 0x00000002; +static constexpr AttributeId Id = 0x00000000; } // namespace SupportedModes namespace CurrentMode { -static constexpr AttributeId Id = 0x00000003; +static constexpr AttributeId Id = 0x00000001; } // namespace CurrentMode namespace StartUpMode { -static constexpr AttributeId Id = 0x00000004; +static constexpr AttributeId Id = 0x00000002; } // namespace StartUpMode namespace OnMode { -static constexpr AttributeId Id = 0x00000005; +static constexpr AttributeId Id = 0x00000003; } // namespace OnMode namespace GeneratedCommandList { @@ -2515,29 +2511,25 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace LaundryWasherModeSelect +} // namespace LaundryWasherMode -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +namespace RefrigeratorAndTemperatureControlledCabinetMode { namespace Attributes { -namespace Description { -static constexpr AttributeId Id = 0x00000000; -} // namespace Description - namespace SupportedModes { -static constexpr AttributeId Id = 0x00000002; +static constexpr AttributeId Id = 0x00000000; } // namespace SupportedModes namespace CurrentMode { -static constexpr AttributeId Id = 0x00000003; +static constexpr AttributeId Id = 0x00000001; } // namespace CurrentMode namespace StartUpMode { -static constexpr AttributeId Id = 0x00000004; +static constexpr AttributeId Id = 0x00000002; } // namespace StartUpMode namespace OnMode { -static constexpr AttributeId Id = 0x00000005; +static constexpr AttributeId Id = 0x00000003; } // namespace OnMode namespace GeneratedCommandList { @@ -2565,7 +2557,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { namespace Attributes { @@ -2613,27 +2605,23 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { namespace Attributes { -namespace Description { -static constexpr AttributeId Id = 0x00000000; -} // namespace Description - namespace SupportedModes { -static constexpr AttributeId Id = 0x00000002; +static constexpr AttributeId Id = 0x00000000; } // namespace SupportedModes namespace CurrentMode { -static constexpr AttributeId Id = 0x00000003; +static constexpr AttributeId Id = 0x00000001; } // namespace CurrentMode namespace StartUpMode { -static constexpr AttributeId Id = 0x00000004; +static constexpr AttributeId Id = 0x00000002; } // namespace StartUpMode namespace OnMode { -static constexpr AttributeId Id = 0x00000005; +static constexpr AttributeId Id = 0x00000003; } // namespace OnMode namespace GeneratedCommandList { @@ -2661,29 +2649,25 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcRunModeSelect +} // namespace RvcRunMode -namespace RvcCleanModeSelect { +namespace RvcCleanMode { namespace Attributes { -namespace Description { -static constexpr AttributeId Id = 0x00000000; -} // namespace Description - namespace SupportedModes { -static constexpr AttributeId Id = 0x00000002; +static constexpr AttributeId Id = 0x00000000; } // namespace SupportedModes namespace CurrentMode { -static constexpr AttributeId Id = 0x00000003; +static constexpr AttributeId Id = 0x00000001; } // namespace CurrentMode namespace StartUpMode { -static constexpr AttributeId Id = 0x00000004; +static constexpr AttributeId Id = 0x00000002; } // namespace StartUpMode namespace OnMode { -static constexpr AttributeId Id = 0x00000005; +static constexpr AttributeId Id = 0x00000003; } // namespace OnMode namespace GeneratedCommandList { @@ -2711,7 +2695,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { namespace Attributes { @@ -2805,27 +2789,23 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace Attributes } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { namespace Attributes { -namespace Description { -static constexpr AttributeId Id = 0x00000000; -} // namespace Description - namespace SupportedModes { -static constexpr AttributeId Id = 0x00000002; +static constexpr AttributeId Id = 0x00000000; } // namespace SupportedModes namespace CurrentMode { -static constexpr AttributeId Id = 0x00000003; +static constexpr AttributeId Id = 0x00000001; } // namespace CurrentMode namespace StartUpMode { -static constexpr AttributeId Id = 0x00000004; +static constexpr AttributeId Id = 0x00000002; } // namespace StartUpMode namespace OnMode { -static constexpr AttributeId Id = 0x00000005; +static constexpr AttributeId Id = 0x00000003; } // namespace OnMode namespace GeneratedCommandList { @@ -2853,7 +2833,7 @@ static constexpr AttributeId Id = Globals::Attributes::ClusterRevision::Id; } // namespace ClusterRevision } // namespace Attributes -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { 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 f40a66c5d8e94a..9be3dacbbae75d 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 @@ -151,30 +151,30 @@ static constexpr ClusterId Id = 0x00000046; namespace ModeSelect { static constexpr ClusterId Id = 0x00000050; } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { static constexpr ClusterId Id = 0x00000051; -} // namespace LaundryWasherModeSelect -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +} // namespace LaundryWasherMode +namespace RefrigeratorAndTemperatureControlledCabinetMode { static constexpr ClusterId Id = 0x00000052; -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode namespace WasherControls { static constexpr ClusterId Id = 0x00000053; } // namespace WasherControls -namespace RvcRunModeSelect { +namespace RvcRunMode { static constexpr ClusterId Id = 0x00000054; -} // namespace RvcRunModeSelect -namespace RvcCleanModeSelect { +} // namespace RvcRunMode +namespace RvcCleanMode { static constexpr ClusterId Id = 0x00000055; -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { static constexpr ClusterId Id = 0x00000056; } // namespace TemperatureControl namespace RefrigeratorAlarm { static constexpr ClusterId Id = 0x00000057; } // namespace RefrigeratorAlarm -namespace DishwasherModeSelect { +namespace DishwasherMode { static constexpr ClusterId Id = 0x00000059; -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace AirQuality { static constexpr ClusterId Id = 0x0000005B; } // namespace AirQuality 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 6e1e48f4ed2307..f81eea1404fb8a 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 @@ -638,88 +638,64 @@ namespace ChangeToMode { static constexpr CommandId Id = 0x00000000; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -static constexpr CommandId Id = 0x00000001; -} // namespace ChangeToModeWithStatus - -namespace ChangeToModeResponse { -static constexpr CommandId Id = 0x00000002; -} // namespace ChangeToModeResponse - } // namespace Commands } // namespace ModeSelect -namespace LaundryWasherModeSelect { +namespace LaundryWasherMode { namespace Commands { namespace ChangeToMode { static constexpr CommandId Id = 0x00000000; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -static constexpr CommandId Id = 0x00000001; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { -static constexpr CommandId Id = 0x00000002; +static constexpr CommandId Id = 0x00000001; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace LaundryWasherModeSelect +} // namespace LaundryWasherMode -namespace RefrigeratorAndTemperatureControlledCabinetModeSelect { +namespace RefrigeratorAndTemperatureControlledCabinetMode { namespace Commands { namespace ChangeToMode { static constexpr CommandId Id = 0x00000000; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -static constexpr CommandId Id = 0x00000001; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { -static constexpr CommandId Id = 0x00000002; +static constexpr CommandId Id = 0x00000001; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace RefrigeratorAndTemperatureControlledCabinetModeSelect +} // namespace RefrigeratorAndTemperatureControlledCabinetMode -namespace RvcRunModeSelect { +namespace RvcRunMode { namespace Commands { namespace ChangeToMode { static constexpr CommandId Id = 0x00000000; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -static constexpr CommandId Id = 0x00000001; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { -static constexpr CommandId Id = 0x00000002; +static constexpr CommandId Id = 0x00000001; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace RvcRunModeSelect +} // namespace RvcRunMode -namespace RvcCleanModeSelect { +namespace RvcCleanMode { namespace Commands { namespace ChangeToMode { static constexpr CommandId Id = 0x00000000; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -static constexpr CommandId Id = 0x00000001; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { -static constexpr CommandId Id = 0x00000002; +static constexpr CommandId Id = 0x00000001; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace RvcCleanModeSelect +} // namespace RvcCleanMode namespace TemperatureControl { namespace Commands { @@ -731,23 +707,19 @@ static constexpr CommandId Id = 0x00000000; } // namespace Commands } // namespace TemperatureControl -namespace DishwasherModeSelect { +namespace DishwasherMode { namespace Commands { namespace ChangeToMode { static constexpr CommandId Id = 0x00000000; } // namespace ChangeToMode -namespace ChangeToModeWithStatus { -static constexpr CommandId Id = 0x00000001; -} // namespace ChangeToModeWithStatus - namespace ChangeToModeResponse { -static constexpr CommandId Id = 0x00000002; +static constexpr CommandId Id = 0x00000001; } // namespace ChangeToModeResponse } // namespace Commands -} // namespace DishwasherModeSelect +} // namespace DishwasherMode namespace SmokeCoAlarm { 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 0cc18ac44b09e3..3052095d47d1a9 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 @@ -292,20 +292,19 @@ #define CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER #endif -#if defined(ZCL_USING_LAUNDRY_WASHER_MODE_SELECT_CLUSTER_SERVER) || defined(ZCL_USING_LAUNDRY_WASHER_MODE_SELECT_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_SELECT_CLUSTER \ - { chip::app::Clusters::LaundryWasherModeSelect::Id, "Laundry Washer Mode Select" }, +#if defined(ZCL_USING_LAUNDRY_WASHER_MODE_CLUSTER_SERVER) || defined(ZCL_USING_LAUNDRY_WASHER_MODE_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_CLUSTER { chip::app::Clusters::LaundryWasherMode::Id, "Laundry Washer Mode" }, #else -#define CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_SELECT_CLUSTER +#define CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_CLUSTER #endif -#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" }, +#if defined(ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_SERVER) || \ + defined(ZCL_USING_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER \ + { chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Id, \ + "Refrigerator And Temperature Controlled Cabinet Mode" }, #else -#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER +#define CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER #endif #if defined(ZCL_USING_WASHER_CONTROLS_CLUSTER_SERVER) || defined(ZCL_USING_WASHER_CONTROLS_CLUSTER_CLIENT) @@ -314,16 +313,16 @@ #define CHIP_PRINTCLUSTER_WASHER_CONTROLS_CLUSTER #endif -#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" }, +#if defined(ZCL_USING_RVC_RUN_MODE_CLUSTER_SERVER) || defined(ZCL_USING_RVC_RUN_MODE_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_RVC_RUN_MODE_CLUSTER { chip::app::Clusters::RvcRunMode::Id, "RVC Run Mode" }, #else -#define CHIP_PRINTCLUSTER_RVC_RUN_MODE_SELECT_CLUSTER +#define CHIP_PRINTCLUSTER_RVC_RUN_MODE_CLUSTER #endif -#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" }, +#if defined(ZCL_USING_RVC_CLEAN_MODE_CLUSTER_SERVER) || defined(ZCL_USING_RVC_CLEAN_MODE_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_CLUSTER { chip::app::Clusters::RvcCleanMode::Id, "RVC Clean Mode" }, #else -#define CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_SELECT_CLUSTER +#define CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_CLUSTER #endif #if defined(ZCL_USING_TEMPERATURE_CONTROL_CLUSTER_SERVER) || defined(ZCL_USING_TEMPERATURE_CONTROL_CLUSTER_CLIENT) @@ -338,11 +337,10 @@ #define CHIP_PRINTCLUSTER_REFRIGERATOR_ALARM #endif -#if defined(ZCL_USING_DISHWASHER_MODE_SELECT_CLUSTER_SERVER) || defined(ZCL_USING_DISHWASHER_MODE_SELECT_CLUSTER_CLIENT) -#define CHIP_PRINTCLUSTER_DISHWASHER_MODE_SELECT_CLUSTER \ - { chip::app::Clusters::DishwasherModeSelect::Id, "Dishwasher Mode Select" }, +#if defined(ZCL_USING_DISHWASHER_MODE_CLUSTER_SERVER) || defined(ZCL_USING_DISHWASHER_MODE_CLUSTER_CLIENT) +#define CHIP_PRINTCLUSTER_DISHWASHER_MODE_CLUSTER { chip::app::Clusters::DishwasherMode::Id, "Dishwasher Mode" }, #else -#define CHIP_PRINTCLUSTER_DISHWASHER_MODE_SELECT_CLUSTER +#define CHIP_PRINTCLUSTER_DISHWASHER_MODE_CLUSTER #endif #if defined(ZCL_USING_AIR_QUALITY_CLUSTER_SERVER) || defined(ZCL_USING_AIR_QUALITY_CLUSTER_CLIENT) @@ -973,14 +971,14 @@ CHIP_PRINTCLUSTER_BOOLEAN_STATE_CLUSTER \ CHIP_PRINTCLUSTER_ICD_MANAGEMENT_CLUSTER \ CHIP_PRINTCLUSTER_MODE_SELECT_CLUSTER \ - CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_SELECT_CLUSTER \ - CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_SELECT_CLUSTER \ + CHIP_PRINTCLUSTER_LAUNDRY_WASHER_MODE_CLUSTER \ + CHIP_PRINTCLUSTER_REFRIGERATOR_AND_TEMPERATURE_CONTROLLED_CABINET_MODE_CLUSTER \ CHIP_PRINTCLUSTER_WASHER_CONTROLS_CLUSTER \ - CHIP_PRINTCLUSTER_RVC_RUN_MODE_SELECT_CLUSTER \ - CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_SELECT_CLUSTER \ + CHIP_PRINTCLUSTER_RVC_RUN_MODE_CLUSTER \ + CHIP_PRINTCLUSTER_RVC_CLEAN_MODE_CLUSTER \ CHIP_PRINTCLUSTER_TEMPERATURE_CONTROL_CLUSTER \ CHIP_PRINTCLUSTER_REFRIGERATOR_ALARM \ - CHIP_PRINTCLUSTER_DISHWASHER_MODE_SELECT_CLUSTER \ + CHIP_PRINTCLUSTER_DISHWASHER_MODE_CLUSTER \ CHIP_PRINTCLUSTER_AIR_QUALITY_CLUSTER \ CHIP_PRINTCLUSTER_SMOKE_CO_ALARM_CLUSTER \ CHIP_PRINTCLUSTER_OPERATIONAL_STATE_CLUSTER \ @@ -1064,4 +1062,4 @@ CHIP_PRINTCLUSTER_UNIT_TESTING_CLUSTER \ CHIP_PRINTCLUSTER_FAULT_INJECTION_CLUSTER -#define MAX_CLUSTER_NAME_LENGTH 59 +#define MAX_CLUSTER_NAME_LENGTH 58 diff --git a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h index d0c1be59f9f87f..bc33ea2a4d5c96 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/Commands.h @@ -74,14 +74,14 @@ | BooleanState | 0x0045 | | IcdManagement | 0x0046 | | ModeSelect | 0x0050 | -| LaundryWasherModeSelect | 0x0051 | -| RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | +| LaundryWasherMode | 0x0051 | +| RefrigeratorAndTemperatureControlledCabinetMode | 0x0052 | | WasherControls | 0x0053 | -| RvcRunModeSelect | 0x0054 | -| RvcCleanModeSelect | 0x0055 | +| RvcRunMode | 0x0054 | +| RvcCleanMode | 0x0055 | | TemperatureControl | 0x0056 | | RefrigeratorAlarm | 0x0057 | -| DishwasherModeSelect | 0x0059 | +| DishwasherMode | 0x0059 | | AirQuality | 0x005B | | SmokeCoAlarm | 0x005C | | OperationalState | 0x0060 | @@ -4035,7 +4035,6 @@ class IcdManagementStayActiveRequest : public ClusterCommand |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * Description | 0x0000 | @@ -4084,50 +4083,17 @@ class ModeSelectChangeToMode : public ClusterCommand chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type mRequest; }; -/* - * Command ChangeToModeWithStatus - */ -class ModeSelectChangeToModeWithStatus : public ClusterCommand -{ -public: - ModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode-with-status", credsIssuerConfig) - { - AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000050) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000050, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000050) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000050, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::ModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; -}; - /*----------------------------------------------------------------------------*\ -| Cluster LaundryWasherModeSelect | 0x0051 | +| Cluster LaundryWasherMode | 0x0051 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | -| * Description | 0x0000 | -| * SupportedModes | 0x0002 | -| * CurrentMode | 0x0003 | -| * StartUpMode | 0x0004 | -| * OnMode | 0x0005 | +| * SupportedModes | 0x0000 | +| * CurrentMode | 0x0001 | +| * StartUpMode | 0x0002 | +| * OnMode | 0x0003 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -4141,10 +4107,10 @@ class ModeSelectChangeToModeWithStatus : public ClusterCommand /* * Command ChangeToMode */ -class LaundryWasherModeSelectChangeToMode : public ClusterCommand +class LaundryWasherModeChangeToMode : public ClusterCommand { public: - LaundryWasherModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : + LaundryWasherModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -4166,53 +4132,20 @@ class LaundryWasherModeSelectChangeToMode : public ClusterCommand } private: - chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToMode::Type mRequest; -}; - -/* - * Command ChangeToModeWithStatus - */ -class LaundryWasherModeSelectChangeToModeWithStatus : public ClusterCommand -{ -public: - LaundryWasherModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode-with-status", credsIssuerConfig) - { - AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000051) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000051, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000051) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000051, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::LaundryWasherModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::LaundryWasherMode::Commands::ChangeToMode::Type mRequest; }; /*----------------------------------------------------------------------------*\ -| Cluster RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | +| Cluster RefrigeratorAndTemperatureControlledCabinetMode | 0x0052 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | -| * Description | 0x0000 | -| * SupportedModes | 0x0002 | -| * CurrentMode | 0x0003 | -| * StartUpMode | 0x0004 | -| * OnMode | 0x0005 | +| * SupportedModes | 0x0000 | +| * CurrentMode | 0x0001 | +| * StartUpMode | 0x0002 | +| * OnMode | 0x0003 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -4226,10 +4159,10 @@ class LaundryWasherModeSelectChangeToModeWithStatus : public ClusterCommand /* * Command ChangeToMode */ -class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode : public ClusterCommand +class RefrigeratorAndTemperatureControlledCabinetModeChangeToMode : public ClusterCommand { public: - RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : + RefrigeratorAndTemperatureControlledCabinetModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); @@ -4251,38 +4184,7 @@ class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToMode : public } private: - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToMode::Type mRequest; -}; - -/* - * Command ChangeToModeWithStatus - */ -class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatus : public ClusterCommand -{ -public: - RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode-with-status", credsIssuerConfig) - { - AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000052) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000052, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000052) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000052, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToMode::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -4306,18 +4208,16 @@ class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatu \*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*\ -| Cluster RvcRunModeSelect | 0x0054 | +| Cluster RvcRunMode | 0x0054 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | -| * Description | 0x0000 | -| * SupportedModes | 0x0002 | -| * CurrentMode | 0x0003 | -| * StartUpMode | 0x0004 | -| * OnMode | 0x0005 | +| * SupportedModes | 0x0000 | +| * CurrentMode | 0x0001 | +| * StartUpMode | 0x0002 | +| * OnMode | 0x0003 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -4331,10 +4231,10 @@ class RefrigeratorAndTemperatureControlledCabinetModeSelectChangeToModeWithStatu /* * Command ChangeToMode */ -class RvcRunModeSelectChangeToMode : public ClusterCommand +class RvcRunModeChangeToMode : public ClusterCommand { public: - RvcRunModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) + RvcRunModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); ClusterCommand::AddArguments(); @@ -4355,53 +4255,20 @@ class RvcRunModeSelectChangeToMode : public ClusterCommand } private: - chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToMode::Type mRequest; -}; - -/* - * Command ChangeToModeWithStatus - */ -class RvcRunModeSelectChangeToModeWithStatus : public ClusterCommand -{ -public: - RvcRunModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode-with-status", credsIssuerConfig) - { - AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000054) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000054, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000054) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000054, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RvcRunMode::Commands::ChangeToMode::Type mRequest; }; /*----------------------------------------------------------------------------*\ -| Cluster RvcCleanModeSelect | 0x0055 | +| Cluster RvcCleanMode | 0x0055 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | -| * Description | 0x0000 | -| * SupportedModes | 0x0002 | -| * CurrentMode | 0x0003 | -| * StartUpMode | 0x0004 | -| * OnMode | 0x0005 | +| * SupportedModes | 0x0000 | +| * CurrentMode | 0x0001 | +| * StartUpMode | 0x0002 | +| * OnMode | 0x0003 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -4415,11 +4282,10 @@ class RvcRunModeSelectChangeToModeWithStatus : public ClusterCommand /* * Command ChangeToMode */ -class RvcCleanModeSelectChangeToMode : public ClusterCommand +class RvcCleanModeChangeToMode : public ClusterCommand { public: - RvcCleanModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode", credsIssuerConfig) + RvcCleanModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); ClusterCommand::AddArguments(); @@ -4440,38 +4306,7 @@ class RvcCleanModeSelectChangeToMode : public ClusterCommand } private: - chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToMode::Type mRequest; -}; - -/* - * Command ChangeToModeWithStatus - */ -class RvcCleanModeSelectChangeToModeWithStatus : public ClusterCommand -{ -public: - RvcCleanModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode-with-status", credsIssuerConfig) - { - AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000055) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000055, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000055) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000055, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::RvcCleanMode::Commands::ChangeToMode::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -4549,18 +4384,16 @@ class TemperatureControlSetTemperature : public ClusterCommand \*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*\ -| Cluster DishwasherModeSelect | 0x0059 | +| Cluster DishwasherMode | 0x0059 | |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | -| * Description | 0x0000 | -| * SupportedModes | 0x0002 | -| * CurrentMode | 0x0003 | -| * StartUpMode | 0x0004 | -| * OnMode | 0x0005 | +| * SupportedModes | 0x0000 | +| * CurrentMode | 0x0001 | +| * StartUpMode | 0x0002 | +| * OnMode | 0x0003 | | * GeneratedCommandList | 0xFFF8 | | * AcceptedCommandList | 0xFFF9 | | * EventList | 0xFFFA | @@ -4574,11 +4407,10 @@ class TemperatureControlSetTemperature : public ClusterCommand /* * Command ChangeToMode */ -class DishwasherModeSelectChangeToMode : public ClusterCommand +class DishwasherModeChangeToMode : public ClusterCommand { public: - DishwasherModeSelectChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode", credsIssuerConfig) + DishwasherModeChangeToMode(CredentialIssuerCommands * credsIssuerConfig) : ClusterCommand("change-to-mode", credsIssuerConfig) { AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); ClusterCommand::AddArguments(); @@ -4599,38 +4431,7 @@ class DishwasherModeSelectChangeToMode : public ClusterCommand } private: - chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToMode::Type mRequest; -}; - -/* - * Command ChangeToModeWithStatus - */ -class DishwasherModeSelectChangeToModeWithStatus : public ClusterCommand -{ -public: - DishwasherModeSelectChangeToModeWithStatus(CredentialIssuerCommands * credsIssuerConfig) : - ClusterCommand("change-to-mode-with-status", credsIssuerConfig) - { - AddArgument("NewMode", 0, UINT8_MAX, &mRequest.newMode); - ClusterCommand::AddArguments(); - } - - CHIP_ERROR SendCommand(chip::DeviceProxy * device, std::vector endpointIds) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000059) command (0x00000001) on endpoint %u", endpointIds.at(0)); - - return ClusterCommand::SendCommand(device, endpointIds.at(0), 0x00000059, 0x00000001, mRequest); - } - - CHIP_ERROR SendGroupCommand(chip::GroupId groupId, chip::FabricIndex fabricIndex) override - { - ChipLogProgress(chipTool, "Sending cluster (0x00000059) command (0x00000001) on Group %u", groupId); - - return ClusterCommand::SendGroupCommand(groupId, fabricIndex, 0x00000059, 0x00000001, mRequest); - } - -private: - chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeWithStatus::Type mRequest; + chip::app::Clusters::DishwasherMode::Commands::ChangeToMode::Type mRequest; }; /*----------------------------------------------------------------------------*\ @@ -14752,9 +14553,8 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // @@ -14821,24 +14621,22 @@ void registerClusterModeSelect(Commands & commands, CredentialIssuerCommands * c commands.Register(clusterName, clusterCommands); } -void registerClusterLaundryWasherModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterLaundryWasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::LaundryWasherModeSelect; + using namespace chip::app::Clusters::LaundryWasherMode; - const char * clusterName = "LaundryWasherModeSelect"; + const char * clusterName = "LaundryWasherMode"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -14850,10 +14648,8 @@ void registerClusterLaundryWasherModeSelect(Commands & commands, CredentialIssue make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "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), // @@ -14875,7 +14671,6 @@ void registerClusterLaundryWasherModeSelect(Commands & commands, CredentialIssue make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -14895,25 +14690,23 @@ void registerClusterLaundryWasherModeSelect(Commands & commands, CredentialIssue commands.Register(clusterName, clusterCommands); } -void registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(Commands & commands, - CredentialIssuerCommands * credsIssuerConfig) +void registerClusterRefrigeratorAndTemperatureControlledCabinetMode(Commands & commands, + CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetModeSelect; + using namespace chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode; - const char * clusterName = "RefrigeratorAndTemperatureControlledCabinetModeSelect"; + const char * clusterName = "RefrigeratorAndTemperatureControlledCabinetMode"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -14925,10 +14718,8 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(Comman make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "description", Attributes::Description::Id, WriteCommandType::kForceWrite, - credsIssuerConfig), // make_unique>>( + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::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), // @@ -14950,7 +14741,6 @@ void registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(Comman make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -15038,24 +14828,22 @@ void registerClusterWasherControls(Commands & commands, CredentialIssuerCommands commands.Register(clusterName, clusterCommands); } -void registerClusterRvcRunModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterRvcRunMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::RvcRunModeSelect; + using namespace chip::app::Clusters::RvcRunMode; - const char * clusterName = "RvcRunModeSelect"; + const char * clusterName = "RvcRunMode"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -15067,10 +14855,8 @@ void registerClusterRvcRunModeSelect(Commands & commands, CredentialIssuerComman make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "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), // @@ -15092,7 +14878,6 @@ void registerClusterRvcRunModeSelect(Commands & commands, CredentialIssuerComman make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -15112,24 +14897,22 @@ void registerClusterRvcRunModeSelect(Commands & commands, CredentialIssuerComman commands.Register(clusterName, clusterCommands); } -void registerClusterRvcCleanModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterRvcCleanMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::RvcCleanModeSelect; + using namespace chip::app::Clusters::RvcCleanMode; - const char * clusterName = "RvcCleanModeSelect"; + const char * clusterName = "RvcCleanMode"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -15141,10 +14924,8 @@ void registerClusterRvcCleanModeSelect(Commands & commands, CredentialIssuerComm make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "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), // @@ -15166,7 +14947,6 @@ void registerClusterRvcCleanModeSelect(Commands & commands, CredentialIssuerComm make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -15329,24 +15109,22 @@ void registerClusterRefrigeratorAlarm(Commands & commands, CredentialIssuerComma commands.Register(clusterName, clusterCommands); } -void registerClusterDishwasherModeSelect(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) +void registerClusterDishwasherMode(Commands & commands, CredentialIssuerCommands * credsIssuerConfig) { - using namespace chip::app::Clusters::DishwasherModeSelect; + using namespace chip::app::Clusters::DishwasherMode; - const char * clusterName = "DishwasherModeSelect"; + const char * clusterName = "DishwasherMode"; commands_list clusterCommands = { // // Commands // - make_unique(Id, credsIssuerConfig), // - make_unique(credsIssuerConfig), // - make_unique(credsIssuerConfig), // + make_unique(Id, credsIssuerConfig), // + make_unique(credsIssuerConfig), // // // Attributes // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -15358,10 +15136,8 @@ void registerClusterDishwasherModeSelect(Commands & commands, CredentialIssuerCo make_unique(Id, "feature-map", Attributes::FeatureMap::Id, credsIssuerConfig), // make_unique(Id, "cluster-revision", Attributes::ClusterRevision::Id, credsIssuerConfig), // make_unique>(Id, credsIssuerConfig), // - make_unique>(Id, "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), // @@ -15383,7 +15159,6 @@ void registerClusterDishwasherModeSelect(Commands & commands, CredentialIssuerCo make_unique>(Id, "cluster-revision", 0, UINT16_MAX, Attributes::ClusterRevision::Id, WriteCommandType::kForceWrite, credsIssuerConfig), // make_unique(Id, credsIssuerConfig), // - make_unique(Id, "description", Attributes::Description::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), // @@ -24667,14 +24442,14 @@ void registerClusters(Commands & commands, CredentialIssuerCommands * credsIssue registerClusterBooleanState(commands, credsIssuerConfig); registerClusterIcdManagement(commands, credsIssuerConfig); registerClusterModeSelect(commands, credsIssuerConfig); - registerClusterLaundryWasherModeSelect(commands, credsIssuerConfig); - registerClusterRefrigeratorAndTemperatureControlledCabinetModeSelect(commands, credsIssuerConfig); + registerClusterLaundryWasherMode(commands, credsIssuerConfig); + registerClusterRefrigeratorAndTemperatureControlledCabinetMode(commands, credsIssuerConfig); registerClusterWasherControls(commands, credsIssuerConfig); - registerClusterRvcRunModeSelect(commands, credsIssuerConfig); - registerClusterRvcCleanModeSelect(commands, credsIssuerConfig); + registerClusterRvcRunMode(commands, credsIssuerConfig); + registerClusterRvcCleanMode(commands, credsIssuerConfig); registerClusterTemperatureControl(commands, credsIssuerConfig); registerClusterRefrigeratorAlarm(commands, credsIssuerConfig); - registerClusterDishwasherModeSelect(commands, credsIssuerConfig); + registerClusterDishwasherMode(commands, credsIssuerConfig); registerClusterAirQuality(commands, credsIssuerConfig); registerClusterSmokeCoAlarm(commands, credsIssuerConfig); registerClusterOperationalState(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 15f4b09c3119c8..b7ba3d66776751 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.cpp @@ -41,13 +41,6 @@ CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters: ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.value, value["value"])); valueCopy.removeMember("value"); - if (value.isMember("tagName")) - { - snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "tagName"); - ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.tagName, value["tagName"])); - } - valueCopy.removeMember("tagName"); - return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); } @@ -55,7 +48,6 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::detail::Structs::ModeT { ComplexArgumentParser::Finalize(request.mfgCode); ComplexArgumentParser::Finalize(request.value); - ComplexArgumentParser::Finalize(request.tagName); } CHIP_ERROR ComplexArgumentParser::Setup(const char * label, chip::app::Clusters::detail::Structs::ModeOptionStruct::Type & request, @@ -1977,6 +1969,74 @@ void ComplexArgumentParser::Finalize(chip::app::Clusters::IcdManagement::Structs ComplexArgumentParser::Finalize(request.fabricIndex); } +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + // Copy to track which members we already processed. + Json::Value valueCopy(value); + + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("SemanticTagStruct.mfgCode", "mfgCode", value.isMember("mfgCode"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("SemanticTagStruct.value", "value", value.isMember("value"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "mfgCode"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.mfgCode, value["mfgCode"])); + valueCopy.removeMember("mfgCode"); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "value"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.value, value["value"])); + valueCopy.removeMember("value"); + + return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); +} + +void ComplexArgumentParser::Finalize(chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request) +{ + ComplexArgumentParser::Finalize(request.mfgCode); + ComplexArgumentParser::Finalize(request.value); +} + +CHIP_ERROR ComplexArgumentParser::Setup(const char * label, + chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type & request, + Json::Value & value) +{ + VerifyOrReturnError(value.isObject(), CHIP_ERROR_INVALID_ARGUMENT); + + // Copy to track which members we already processed. + Json::Value valueCopy(value); + + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ModeOptionStruct.label", "label", value.isMember("label"))); + ReturnErrorOnFailure(ComplexArgumentParser::EnsureMemberExist("ModeOptionStruct.mode", "mode", value.isMember("mode"))); + ReturnErrorOnFailure( + ComplexArgumentParser::EnsureMemberExist("ModeOptionStruct.semanticTags", "semanticTags", value.isMember("semanticTags"))); + + char labelWithMember[kMaxLabelLength]; + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "label"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.label, value["label"])); + valueCopy.removeMember("label"); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "mode"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.mode, value["mode"])); + valueCopy.removeMember("mode"); + + snprintf(labelWithMember, sizeof(labelWithMember), "%s.%s", label, "semanticTags"); + ReturnErrorOnFailure(ComplexArgumentParser::Setup(labelWithMember, request.semanticTags, value["semanticTags"])); + valueCopy.removeMember("semanticTags"); + + return ComplexArgumentParser::EnsureNoMembersRemaining(label, valueCopy); +} + +void ComplexArgumentParser::Finalize(chip::app::Clusters::ModeSelect::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::DoorLock::Structs::CredentialStruct::Type & request, Json::Value & value) diff --git a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h index 752647ee7e54bf..fd35d2d31115d8 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/ComplexArgumentParser.h @@ -244,6 +244,16 @@ static CHIP_ERROR Setup(const char * label, static void Finalize(chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::Type & request); +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::Type & request); + +static CHIP_ERROR Setup(const char * label, chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type & request, + Json::Value & value); + +static void Finalize(chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::Type & request); + static CHIP_ERROR Setup(const char * label, chip::app::Clusters::DoorLock::Structs::CredentialStruct::Type & request, Json::Value & value); diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 9f0e8d02e5e6d3..071648f097ff34 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -41,14 +41,6 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, return err; } } - { - CHIP_ERROR err = LogValue("TagName", indent + 1, value.tagName); - if (err != CHIP_NO_ERROR) - { - DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'TagName'"); - return err; - } - } DataModelLogger::LogString(indent, "}"); return CHIP_NO_ERROR; @@ -1777,6 +1769,64 @@ 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::ModeSelect::Structs::SemanticTagStruct::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("MfgCode", indent + 1, value.mfgCode); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'MfgCode'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Value", indent + 1, value.value); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Value'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} + +CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, + const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType & value) +{ + DataModelLogger::LogString(label, indent, "{"); + { + CHIP_ERROR err = LogValue("Label", indent + 1, value.label); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Label'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("Mode", indent + 1, value.mode); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'Mode'"); + return err; + } + } + { + CHIP_ERROR err = LogValue("SemanticTags", indent + 1, value.semanticTags); + if (err != CHIP_NO_ERROR) + { + DataModelLogger::LogString(indent + 1, "Struct truncated due to invalid value for 'SemanticTags'"); + return err; + } + } + DataModelLogger::LogString(indent, "}"); + + return CHIP_NO_ERROR; +} + CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value) { @@ -4479,16 +4529,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 ModeSelect::Commands::ChangeToModeResponse::DecodableType & value) -{ - DataModelLogger::LogString(label, indent, "{"); - ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); - ReturnErrorOnFailure(DataModelLogger::LogValue("statusText", indent + 1, value.statusText)); - DataModelLogger::LogString(indent, "}"); - return CHIP_NO_ERROR; -} -CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType & value) + const LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -4498,7 +4539,7 @@ CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, } CHIP_ERROR DataModelLogger::LogValue( const char * label, size_t indent, - const RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType & value) + const RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -4507,7 +4548,7 @@ CHIP_ERROR DataModelLogger::LogValue( return CHIP_NO_ERROR; } CHIP_ERROR DataModelLogger::LogValue(const char * label, size_t indent, - const RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & value) + const RvcRunMode::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -4516,7 +4557,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 RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & value) + const RvcCleanMode::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -4525,7 +4566,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 DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType & value) + const DishwasherMode::Commands::ChangeToModeResponse::DecodableType & value) { DataModelLogger::LogString(label, indent, "{"); ReturnErrorOnFailure(DataModelLogger::LogValue("status", indent + 1, value.status)); @@ -7853,62 +7894,56 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case LaundryWasherModeSelect::Id: { + case LaundryWasherMode::Id: { switch (path.mAttributeId) { - case LaundryWasherModeSelect::Attributes::Description::Id: { - chip::CharSpan value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("Description", 1, value); - } - case LaundryWasherModeSelect::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList< - chip::app::Clusters::LaundryWasherModeSelect::Structs::ModeOptionStruct::DecodableType> + case LaundryWasherMode::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case LaundryWasherModeSelect::Attributes::CurrentMode::Id: { + case LaundryWasherMode::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case LaundryWasherModeSelect::Attributes::StartUpMode::Id: { + case LaundryWasherMode::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case LaundryWasherModeSelect::Attributes::OnMode::Id: { + case LaundryWasherMode::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case LaundryWasherModeSelect::Attributes::GeneratedCommandList::Id: { + case LaundryWasherMode::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case LaundryWasherModeSelect::Attributes::AcceptedCommandList::Id: { + case LaundryWasherMode::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case LaundryWasherModeSelect::Attributes::EventList::Id: { + case LaundryWasherMode::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case LaundryWasherModeSelect::Attributes::AttributeList::Id: { + case LaundryWasherMode::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case LaundryWasherModeSelect::Attributes::FeatureMap::Id: { + case LaundryWasherMode::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case LaundryWasherModeSelect::Attributes::ClusterRevision::Id: { + case LaundryWasherMode::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -7916,62 +7951,57 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Id: { switch (path.mAttributeId) { - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::Description::Id: { - chip::CharSpan value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("Description", 1, value); - } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList< + chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Structs::ModeOptionStruct::DecodableType> value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::CurrentMode::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::StartUpMode::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::OnMode::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::GeneratedCommandList::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AcceptedCommandList::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::EventList::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::AttributeList::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::FeatureMap::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Attributes::ClusterRevision::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -8035,61 +8065,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case RvcRunModeSelect::Id: { + case RvcRunMode::Id: { switch (path.mAttributeId) { - case RvcRunModeSelect::Attributes::Description::Id: { - chip::CharSpan value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("Description", 1, value); - } - case RvcRunModeSelect::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList - value; + case RvcRunMode::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case RvcRunModeSelect::Attributes::CurrentMode::Id: { + case RvcRunMode::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case RvcRunModeSelect::Attributes::StartUpMode::Id: { + case RvcRunMode::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case RvcRunModeSelect::Attributes::OnMode::Id: { + case RvcRunMode::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case RvcRunModeSelect::Attributes::GeneratedCommandList::Id: { + case RvcRunMode::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case RvcRunModeSelect::Attributes::AcceptedCommandList::Id: { + case RvcRunMode::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case RvcRunModeSelect::Attributes::EventList::Id: { + case RvcRunMode::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case RvcRunModeSelect::Attributes::AttributeList::Id: { + case RvcRunMode::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case RvcRunModeSelect::Attributes::FeatureMap::Id: { + case RvcRunMode::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case RvcRunModeSelect::Attributes::ClusterRevision::Id: { + case RvcRunMode::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -8097,61 +8121,55 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case RvcCleanModeSelect::Id: { + case RvcCleanMode::Id: { switch (path.mAttributeId) { - case RvcCleanModeSelect::Attributes::Description::Id: { - chip::CharSpan value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("Description", 1, value); - } - case RvcCleanModeSelect::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList - value; + case RvcCleanMode::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case RvcCleanModeSelect::Attributes::CurrentMode::Id: { + case RvcCleanMode::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case RvcCleanModeSelect::Attributes::StartUpMode::Id: { + case RvcCleanMode::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case RvcCleanModeSelect::Attributes::OnMode::Id: { + case RvcCleanMode::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case RvcCleanModeSelect::Attributes::GeneratedCommandList::Id: { + case RvcCleanMode::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case RvcCleanModeSelect::Attributes::AcceptedCommandList::Id: { + case RvcCleanMode::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case RvcCleanModeSelect::Attributes::EventList::Id: { + case RvcCleanMode::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case RvcCleanModeSelect::Attributes::AttributeList::Id: { + case RvcCleanMode::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case RvcCleanModeSelect::Attributes::FeatureMap::Id: { + case RvcCleanMode::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case RvcCleanModeSelect::Attributes::ClusterRevision::Id: { + case RvcCleanMode::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -8271,61 +8289,56 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP } break; } - case DishwasherModeSelect::Id: { + case DishwasherMode::Id: { switch (path.mAttributeId) { - case DishwasherModeSelect::Attributes::Description::Id: { - chip::CharSpan value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("Description", 1, value); - } - case DishwasherModeSelect::Attributes::SupportedModes::Id: { - chip::app::DataModel::DecodableList + case DishwasherMode::Attributes::SupportedModes::Id: { + chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("SupportedModes", 1, value); } - case DishwasherModeSelect::Attributes::CurrentMode::Id: { + case DishwasherMode::Attributes::CurrentMode::Id: { uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentMode", 1, value); } - case DishwasherModeSelect::Attributes::StartUpMode::Id: { + case DishwasherMode::Attributes::StartUpMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("StartUpMode", 1, value); } - case DishwasherModeSelect::Attributes::OnMode::Id: { + case DishwasherMode::Attributes::OnMode::Id: { chip::app::DataModel::Nullable value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("OnMode", 1, value); } - case DishwasherModeSelect::Attributes::GeneratedCommandList::Id: { + case DishwasherMode::Attributes::GeneratedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("GeneratedCommandList", 1, value); } - case DishwasherModeSelect::Attributes::AcceptedCommandList::Id: { + case DishwasherMode::Attributes::AcceptedCommandList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AcceptedCommandList", 1, value); } - case DishwasherModeSelect::Attributes::EventList::Id: { + case DishwasherMode::Attributes::EventList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("EventList", 1, value); } - case DishwasherModeSelect::Attributes::AttributeList::Id: { + case DishwasherMode::Attributes::AttributeList::Id: { chip::app::DataModel::DecodableList value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("AttributeList", 1, value); } - case DishwasherModeSelect::Attributes::FeatureMap::Id: { + case DishwasherMode::Attributes::FeatureMap::Id: { uint32_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("FeatureMap", 1, value); } - case DishwasherModeSelect::Attributes::ClusterRevision::Id: { + case DishwasherMode::Attributes::ClusterRevision::Id: { uint16_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ClusterRevision", 1, value); @@ -16354,66 +16367,55 @@ CHIP_ERROR DataModelLogger::LogCommand(const chip::app::ConcreteCommandPath & pa } break; } - case ModeSelect::Id: { - switch (path.mCommandId) - { - case ModeSelect::Commands::ChangeToModeResponse::Id: { - ModeSelect::Commands::ChangeToModeResponse::DecodableType value; - ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); - return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); - } - } - break; - } - case LaundryWasherModeSelect::Id: { + case LaundryWasherMode::Id: { switch (path.mCommandId) { - case LaundryWasherModeSelect::Commands::ChangeToModeResponse::Id: { - LaundryWasherModeSelect::Commands::ChangeToModeResponse::DecodableType value; + case LaundryWasherMode::Commands::ChangeToModeResponse::Id: { + LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } } break; } - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Id: { + case RefrigeratorAndTemperatureControlledCabinetMode::Id: { switch (path.mCommandId) { - case RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::Id: { - RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands::ChangeToModeResponse::DecodableType value; + case RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::Id: { + RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } } break; } - case RvcRunModeSelect::Id: { + case RvcRunMode::Id: { switch (path.mCommandId) { - case RvcRunModeSelect::Commands::ChangeToModeResponse::Id: { - RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType value; + case RvcRunMode::Commands::ChangeToModeResponse::Id: { + RvcRunMode::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } } break; } - case RvcCleanModeSelect::Id: { + case RvcCleanMode::Id: { switch (path.mCommandId) { - case RvcCleanModeSelect::Commands::ChangeToModeResponse::Id: { - RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType value; + case RvcCleanMode::Commands::ChangeToModeResponse::Id: { + RvcCleanMode::Commands::ChangeToModeResponse::DecodableType value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("ChangeToModeResponse", 1, value); } } break; } - case DishwasherModeSelect::Id: { + case DishwasherMode::Id: { switch (path.mCommandId) { - case DishwasherModeSelect::Commands::ChangeToModeResponse::Id: { - DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType value; + case DishwasherMode::Commands::ChangeToModeResponse::Id: { + DishwasherMode::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 7a5927a2769179..c259176393d7f8 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.h @@ -153,6 +153,12 @@ static CHIP_ERROR LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::IcdManagement::Structs::MonitoringRegistrationStruct::DecodableType & value); +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::ModeSelect::Structs::SemanticTagStruct::DecodableType & value); + +static CHIP_ERROR LogValue(const char * label, size_t indent, + const chip::app::Clusters::ModeSelect::Structs::ModeOptionStruct::DecodableType & value); + static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::DoorLock::Structs::CredentialStruct::DecodableType & value); @@ -460,19 +466,17 @@ LogValue(const char * label, size_t indent, static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::IcdManagement::Commands::RegisterClientResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::ModeSelect::Commands::ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::LaundryWasherMode::Commands::ChangeToModeResponse::DecodableType & value); 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::RefrigeratorAndTemperatureControlledCabinetModeSelect::Commands:: - ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::RefrigeratorAndTemperatureControlledCabinetMode::Commands::ChangeToModeResponse::DecodableType & + value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcRunModeSelect::Commands::ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::RvcRunMode::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::RvcCleanModeSelect::Commands::ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::RvcCleanMode::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, - const chip::app::Clusters::DishwasherModeSelect::Commands::ChangeToModeResponse::DecodableType & value); + const chip::app::Clusters::DishwasherMode::Commands::ChangeToModeResponse::DecodableType & value); static CHIP_ERROR LogValue(const char * label, size_t indent, const chip::app::Clusters::OperationalState::Commands::OperationalCommandResponse::DecodableType & value); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 32ce455574153a..cb11f6427d4461 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -84869,7 +84869,7 @@ class TestModeSelectClusterSuite : public TestCommand { public: TestModeSelectClusterSuite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("TestModeSelectCluster", 31, credsIssuerConfig) + TestCommand("TestModeSelectCluster", 32, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -84918,6 +84918,15 @@ class TestModeSelectClusterSuite : public TestCommand } break; case 2: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("standardNamespace", value)); + VerifyOrReturn(CheckValue("standardNamespace.Value()", value.Value(), 0U)); + } + break; + case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::DecodableList @@ -84930,36 +84939,36 @@ class TestModeSelectClusterSuite : public TestCommand CheckValueAsString("supportedModes[0].label", iter_0.GetValue().label, chip::CharSpan("Black", 5))); VerifyOrReturn(CheckValue("supportedModes[0].mode", iter_0.GetValue().mode, 0U)); { - auto iter_2 = iter_0.GetValue().modeTags.begin(); - VerifyOrReturn(CheckNextListItemDecodes("supportedModes[0].modeTags", - iter_2, 0)); - VerifyOrReturn(CheckValue("supportedModes[0].modeTags[0].value", iter_2.GetValue().value, 0U)); - VerifyOrReturn( - CheckNoMoreListItems("supportedModes[0].modeTags", iter_2, 1)); + auto iter_2 = iter_0.GetValue().semanticTags.begin(); + VerifyOrReturn(CheckNextListItemDecodes( + "supportedModes[0].semanticTags", iter_2, 0)); + VerifyOrReturn(CheckValue("supportedModes[0].semanticTags[0].value", iter_2.GetValue().value, 0U)); + VerifyOrReturn(CheckNoMoreListItems( + "supportedModes[0].semanticTags", iter_2, 1)); } VerifyOrReturn(CheckNextListItemDecodes("supportedModes", iter_0, 1)); VerifyOrReturn( CheckValueAsString("supportedModes[1].label", iter_0.GetValue().label, chip::CharSpan("Cappuccino", 10))); VerifyOrReturn(CheckValue("supportedModes[1].mode", iter_0.GetValue().mode, 4U)); { - auto iter_2 = iter_0.GetValue().modeTags.begin(); - VerifyOrReturn(CheckNextListItemDecodes("supportedModes[1].modeTags", - iter_2, 0)); - VerifyOrReturn(CheckValue("supportedModes[1].modeTags[0].value", iter_2.GetValue().value, 0U)); - VerifyOrReturn( - CheckNoMoreListItems("supportedModes[1].modeTags", iter_2, 1)); + auto iter_2 = iter_0.GetValue().semanticTags.begin(); + VerifyOrReturn(CheckNextListItemDecodes( + "supportedModes[1].semanticTags", iter_2, 0)); + VerifyOrReturn(CheckValue("supportedModes[1].semanticTags[0].value", iter_2.GetValue().value, 0U)); + VerifyOrReturn(CheckNoMoreListItems( + "supportedModes[1].semanticTags", iter_2, 1)); } VerifyOrReturn(CheckNextListItemDecodes("supportedModes", iter_0, 2)); VerifyOrReturn( CheckValueAsString("supportedModes[2].label", iter_0.GetValue().label, chip::CharSpan("Espresso", 8))); VerifyOrReturn(CheckValue("supportedModes[2].mode", iter_0.GetValue().mode, 7U)); { - auto iter_2 = iter_0.GetValue().modeTags.begin(); - VerifyOrReturn(CheckNextListItemDecodes("supportedModes[2].modeTags", - iter_2, 0)); - VerifyOrReturn(CheckValue("supportedModes[2].modeTags[0].value", iter_2.GetValue().value, 0U)); - VerifyOrReturn( - CheckNoMoreListItems("supportedModes[2].modeTags", iter_2, 1)); + auto iter_2 = iter_0.GetValue().semanticTags.begin(); + VerifyOrReturn(CheckNextListItemDecodes( + "supportedModes[2].semanticTags", iter_2, 0)); + VerifyOrReturn(CheckValue("supportedModes[2].semanticTags[0].value", iter_2.GetValue().value, 0U)); + VerifyOrReturn(CheckNoMoreListItems( + "supportedModes[2].semanticTags", iter_2, 1)); } VerifyOrReturn(CheckNoMoreListItems("supportedModes", iter_0, 3)); } @@ -84968,7 +84977,7 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckConstraintMaxLength("value", value, 3)); } break; - case 3: + case 4: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -84976,7 +84985,7 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValue("currentMode", value, 0U)); } break; - case 4: + case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -84985,7 +84994,7 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValue("startUpMode.Value()", value.Value(), 0U)); } break; - case 5: + case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -84993,10 +85002,10 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValueNull("onMode", value)); } break; - case 6: + case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 7: + case 8: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -85005,16 +85014,16 @@ class TestModeSelectClusterSuite : public TestCommand currentModeBeforeToggle = value; } break; - case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); - break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -85022,13 +85031,13 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValue("currentMode", value, currentModeBeforeToggle)); } break; - case 12: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; - case 13: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 14: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -85038,13 +85047,13 @@ class TestModeSelectClusterSuite : public TestCommand OnModeValue = value; } break; - case 15: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 17: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -85052,13 +85061,13 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValue("currentMode", value, OnModeValue)); } break; - case 18: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; - case 19: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 20: + case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::DataModel::Nullable value; @@ -85067,9 +85076,6 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValue("startUpMode.Value()", value.Value(), 7U)); } break; - case 21: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; @@ -85078,13 +85084,16 @@ class TestModeSelectClusterSuite : public TestCommand break; case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; break; case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); shouldContinue = true; break; case 26: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + shouldContinue = true; + break; + case 27: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -85092,18 +85101,18 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckValue("currentMode", value, 4U)); } break; - case 27: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; case 28: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; break; case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); shouldContinue = true; break; case 30: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + shouldContinue = true; + break; + case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -85139,27 +85148,32 @@ class TestModeSelectClusterSuite : public TestCommand chip::NullOptional); } case 2: { - LogStep(2, "Read SupportedModes"); + LogStep(2, "Read StandardNamespace"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::StandardNamespace::Id, + true, chip::NullOptional); + } + case 3: { + LogStep(3, "Read SupportedModes"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::SupportedModes::Id, true, chip::NullOptional); } - case 3: { - LogStep(3, "Read CurrentMode"); + case 4: { + LogStep(4, "Read CurrentMode"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::CurrentMode::Id, true, chip::NullOptional); } - case 4: { - LogStep(4, "Read StartUpMode"); + case 5: { + LogStep(5, "Read StartUpMode"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::StartUpMode::Id, true, chip::NullOptional); } - case 5: { - LogStep(5, "Read OnMode"); + case 6: { + LogStep(6, "Read OnMode"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, true, chip::NullOptional); } - case 6: { - LogStep(6, "Change to Supported Mode"); + case 7: { + LogStep(7, "Change to Supported Mode"); ListFreer listFreer; chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type value; value.newMode = 4U; @@ -85168,13 +85182,13 @@ class TestModeSelectClusterSuite : public TestCommand ); } - case 7: { - LogStep(7, "Verify Current Mode Change"); + case 8: { + LogStep(8, "Verify Current Mode Change"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::CurrentMode::Id, true, chip::NullOptional); } - case 8: { - LogStep(8, "Change to Unsupported Mode"); + case 9: { + LogStep(9, "Change to Unsupported Mode"); ListFreer listFreer; chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type value; value.newMode = 2U; @@ -85183,29 +85197,29 @@ class TestModeSelectClusterSuite : public TestCommand ); } - case 9: { - LogStep(9, "Toggle OnOff"); + case 10: { + LogStep(10, "Toggle OnOff"); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::Off::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional ); } - case 10: { - LogStep(10, "Toggle OnOff"); + case 11: { + LogStep(11, "Toggle OnOff"); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::On::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional ); } - case 11: { - LogStep(11, "Verify Current Mode does not change when OnMode is null"); + case 12: { + LogStep(12, "Verify Current Mode does not change when OnMode is null"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::CurrentMode::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "Change to Unsupported OnMode"); + case 13: { + LogStep(13, "Change to Unsupported OnMode"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNonNull(); @@ -85213,8 +85227,8 @@ class TestModeSelectClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, value, chip::NullOptional, chip::NullOptional); } - case 13: { - LogStep(13, "Change OnMode"); + case 14: { + LogStep(14, "Change OnMode"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNonNull(); @@ -85222,34 +85236,34 @@ class TestModeSelectClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, value, chip::NullOptional, chip::NullOptional); } - case 14: { - LogStep(14, "Verify OnMode"); + case 15: { + LogStep(15, "Verify OnMode"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, true, chip::NullOptional); } - case 15: { - LogStep(15, "Toggle OnOff"); + case 16: { + LogStep(16, "Toggle OnOff"); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::Off::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::Off::Id, value, chip::NullOptional ); } - case 16: { - LogStep(16, "Toggle OnOff"); + case 17: { + LogStep(17, "Toggle OnOff"); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::On::Type value; return SendCommand(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Commands::On::Id, value, chip::NullOptional ); } - case 17: { - LogStep(17, "Verify Current Mode Changes if OnMode is not null"); + case 18: { + LogStep(18, "Verify Current Mode Changes if OnMode is not null"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::CurrentMode::Id, true, chip::NullOptional); } - case 18: { - LogStep(18, "Change to Unsupported StartUp Mode"); + case 19: { + LogStep(19, "Change to Unsupported StartUp Mode"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNonNull(); @@ -85257,8 +85271,8 @@ class TestModeSelectClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::StartUpMode::Id, value, chip::NullOptional, chip::NullOptional); } - case 19: { - LogStep(19, "Change to Supported StartUp Mode"); + case 20: { + LogStep(20, "Change to Supported StartUp Mode"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNonNull(); @@ -85266,13 +85280,13 @@ class TestModeSelectClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::StartUpMode::Id, value, chip::NullOptional, chip::NullOptional); } - case 20: { - LogStep(20, "Verify StartUp Mode Change"); + case 21: { + LogStep(21, "Verify StartUp Mode Change"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::StartUpMode::Id, true, chip::NullOptional); } - case 21: { - LogStep(21, "Change CurrentMode to another value"); + case 22: { + LogStep(22, "Change CurrentMode to another value"); ListFreer listFreer; chip::app::Clusters::ModeSelect::Commands::ChangeToMode::Type value; value.newMode = 0U; @@ -85281,8 +85295,8 @@ class TestModeSelectClusterSuite : public TestCommand ); } - case 22: { - LogStep(22, "Change On Mode"); + case 23: { + LogStep(23, "Change On Mode"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNonNull(); @@ -85290,8 +85304,8 @@ class TestModeSelectClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, value, chip::NullOptional, chip::NullOptional); } - case 23: { - LogStep(23, "Set StartUpOnOff"); + case 24: { + LogStep(24, "Set StartUpOnOff"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNonNull(); @@ -85299,47 +85313,47 @@ class TestModeSelectClusterSuite : public TestCommand return WriteAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::StartUpOnOff::Id, value, chip::NullOptional, chip::NullOptional); } - case 24: { - LogStep(24, "Reboot target device"); + case 25: { + LogStep(25, "Reboot target device"); ListFreer listFreer; chip::app::Clusters::SystemCommands::Commands::Reboot::Type value; return Reboot(kIdentityAlpha, value); } - case 25: { - LogStep(25, "Wait for the commissioned device to be retrieved"); + case 26: { + LogStep(26, "Wait for the commissioned device to be retrieved"); ListFreer listFreer; chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee(kIdentityAlpha, value); } - case 26: { - LogStep(26, "Verify Current Mode Change based on OnMode, as it overwrites StartUpMode"); + case 27: { + LogStep(27, "Verify Current Mode Change based on OnMode, as it overwrites StartUpMode"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::CurrentMode::Id, true, chip::NullOptional); } - case 27: { - LogStep(27, "Change On Mode to Null"); + case 28: { + LogStep(28, "Change On Mode to Null"); ListFreer listFreer; chip::app::DataModel::Nullable value; value.SetNull(); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::OnMode::Id, value, chip::NullOptional, chip::NullOptional); } - case 28: { - LogStep(28, "Reboot target device"); + case 29: { + LogStep(29, "Reboot target device"); ListFreer listFreer; chip::app::Clusters::SystemCommands::Commands::Reboot::Type value; return Reboot(kIdentityAlpha, value); } - case 29: { - LogStep(29, "Wait for the commissioned device to be retrieved"); + case 30: { + LogStep(30, "Wait for the commissioned device to be retrieved"); ListFreer listFreer; chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee(kIdentityAlpha, value); } - case 30: { - LogStep(30, "Verify Current Mode Change based on new StartUp Mode"); + case 31: { + LogStep(31, "Verify Current Mode Change based on new StartUp Mode"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ModeSelect::Id, ModeSelect::Attributes::CurrentMode::Id, true, chip::NullOptional); } 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 7e1cd5da8ddfe3..a0ad2c6fd475b1 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h @@ -77,14 +77,14 @@ | BooleanState | 0x0045 | | IcdManagement | 0x0046 | | ModeSelect | 0x0050 | -| LaundryWasherModeSelect | 0x0051 | -| RefrigeratorAndTemperatureControlledCabinetModeSelect | 0x0052 | +| LaundryWasherMode | 0x0051 | +| RefrigeratorAndTemperatureControlledCabinetMode | 0x0052 | | WasherControls | 0x0053 | -| RvcRunModeSelect | 0x0054 | -| RvcCleanModeSelect | 0x0055 | +| RvcRunMode | 0x0054 | +| RvcCleanMode | 0x0055 | | TemperatureControl | 0x0056 | | RefrigeratorAlarm | 0x0057 | -| DishwasherModeSelect | 0x0059 | +| DishwasherMode | 0x0059 | | AirQuality | 0x005B | | SmokeCoAlarm | 0x005C | | OperationalState | 0x0060 | @@ -39610,7 +39610,6 @@ class SubscribeAttributeBooleanStateClusterRevision : public SubscribeAttribute |------------------------------------------------------------------------------| | Commands: | | | * ChangeToMode | 0x00 | -| * ChangeToModeWithStatus | 0x01 | |------------------------------------------------------------------------------| | Attributes: | | | * Description | 0x0000 | diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 8a3451e3fb84cf..908c734985d6c9 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -127252,121 +127252,125 @@ class TestModeSelectCluster : public TestCommandBridge { err = TestReadDescription_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Read SupportedModes\n"); - err = TestReadSupportedModes_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : Read StandardNamespace\n"); + err = TestReadStandardNamespace_2(); break; case 3: - ChipLogProgress(chipTool, " ***** Test Step 3 : Read CurrentMode\n"); - err = TestReadCurrentMode_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : Read SupportedModes\n"); + err = TestReadSupportedModes_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Read StartUpMode\n"); - err = TestReadStartUpMode_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : Read CurrentMode\n"); + err = TestReadCurrentMode_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Read OnMode\n"); - err = TestReadOnMode_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : Read StartUpMode\n"); + err = TestReadStartUpMode_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Change to Supported Mode\n"); - err = TestChangeToSupportedMode_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : Read OnMode\n"); + err = TestReadOnMode_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Verify Current Mode Change\n"); - err = TestVerifyCurrentModeChange_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : Change to Supported Mode\n"); + err = TestChangeToSupportedMode_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Change to Unsupported Mode\n"); - err = TestChangeToUnsupportedMode_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : Verify Current Mode Change\n"); + err = TestVerifyCurrentModeChange_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : Toggle OnOff\n"); - err = TestToggleOnOff_9(); + ChipLogProgress(chipTool, " ***** Test Step 9 : Change to Unsupported Mode\n"); + err = TestChangeToUnsupportedMode_9(); break; case 10: ChipLogProgress(chipTool, " ***** Test Step 10 : Toggle OnOff\n"); err = TestToggleOnOff_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : Verify Current Mode does not change when OnMode is null\n"); - err = TestVerifyCurrentModeDoesNotChangeWhenOnModeIsNull_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : Toggle OnOff\n"); + err = TestToggleOnOff_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : Change to Unsupported OnMode\n"); - err = TestChangeToUnsupportedOnMode_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : Verify Current Mode does not change when OnMode is null\n"); + err = TestVerifyCurrentModeDoesNotChangeWhenOnModeIsNull_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Change OnMode\n"); - err = TestChangeOnMode_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : Change to Unsupported OnMode\n"); + err = TestChangeToUnsupportedOnMode_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : Verify OnMode\n"); - err = TestVerifyOnMode_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Change OnMode\n"); + err = TestChangeOnMode_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Toggle OnOff\n"); - err = TestToggleOnOff_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : Verify OnMode\n"); + err = TestVerifyOnMode_15(); break; case 16: ChipLogProgress(chipTool, " ***** Test Step 16 : Toggle OnOff\n"); err = TestToggleOnOff_16(); break; case 17: - ChipLogProgress(chipTool, " ***** Test Step 17 : Verify Current Mode Changes if OnMode is not null\n"); - err = TestVerifyCurrentModeChangesIfOnModeIsNotNull_17(); + ChipLogProgress(chipTool, " ***** Test Step 17 : Toggle OnOff\n"); + err = TestToggleOnOff_17(); break; case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Change to Unsupported StartUp Mode\n"); - err = TestChangeToUnsupportedStartUpMode_18(); + ChipLogProgress(chipTool, " ***** Test Step 18 : Verify Current Mode Changes if OnMode is not null\n"); + err = TestVerifyCurrentModeChangesIfOnModeIsNotNull_18(); break; case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : Change to Supported StartUp Mode\n"); - err = TestChangeToSupportedStartUpMode_19(); + ChipLogProgress(chipTool, " ***** Test Step 19 : Change to Unsupported StartUp Mode\n"); + err = TestChangeToUnsupportedStartUpMode_19(); break; case 20: - ChipLogProgress(chipTool, " ***** Test Step 20 : Verify StartUp Mode Change\n"); - err = TestVerifyStartUpModeChange_20(); + ChipLogProgress(chipTool, " ***** Test Step 20 : Change to Supported StartUp Mode\n"); + err = TestChangeToSupportedStartUpMode_20(); break; case 21: - ChipLogProgress(chipTool, " ***** Test Step 21 : Change CurrentMode to another value\n"); - err = TestChangeCurrentModeToAnotherValue_21(); + ChipLogProgress(chipTool, " ***** Test Step 21 : Verify StartUp Mode Change\n"); + err = TestVerifyStartUpModeChange_21(); break; case 22: - ChipLogProgress(chipTool, " ***** Test Step 22 : Change On Mode\n"); - err = TestChangeOnMode_22(); + ChipLogProgress(chipTool, " ***** Test Step 22 : Change CurrentMode to another value\n"); + err = TestChangeCurrentModeToAnotherValue_22(); break; case 23: - ChipLogProgress(chipTool, " ***** Test Step 23 : Set StartUpOnOff\n"); - err = TestSetStartUpOnOff_23(); + ChipLogProgress(chipTool, " ***** Test Step 23 : Change On Mode\n"); + err = TestChangeOnMode_23(); break; case 24: - ChipLogProgress(chipTool, " ***** Test Step 24 : Reboot target device\n"); - err = TestRebootTargetDevice_24(); + ChipLogProgress(chipTool, " ***** Test Step 24 : Set StartUpOnOff\n"); + err = TestSetStartUpOnOff_24(); break; case 25: - ChipLogProgress(chipTool, " ***** Test Step 25 : Wait for the commissioned device to be retrieved\n"); - err = TestWaitForTheCommissionedDeviceToBeRetrieved_25(); + ChipLogProgress(chipTool, " ***** Test Step 25 : Reboot target device\n"); + err = TestRebootTargetDevice_25(); break; case 26: - ChipLogProgress( - chipTool, " ***** Test Step 26 : Verify Current Mode Change based on OnMode, as it overwrites StartUpMode\n"); - err = TestVerifyCurrentModeChangeBasedOnOnModeAsItOverwritesStartUpMode_26(); + ChipLogProgress(chipTool, " ***** Test Step 26 : Wait for the commissioned device to be retrieved\n"); + err = TestWaitForTheCommissionedDeviceToBeRetrieved_26(); break; case 27: - ChipLogProgress(chipTool, " ***** Test Step 27 : Change On Mode to Null\n"); - err = TestChangeOnModeToNull_27(); + ChipLogProgress( + chipTool, " ***** Test Step 27 : Verify Current Mode Change based on OnMode, as it overwrites StartUpMode\n"); + err = TestVerifyCurrentModeChangeBasedOnOnModeAsItOverwritesStartUpMode_27(); break; case 28: - ChipLogProgress(chipTool, " ***** Test Step 28 : Reboot target device\n"); - err = TestRebootTargetDevice_28(); + ChipLogProgress(chipTool, " ***** Test Step 28 : Change On Mode to Null\n"); + err = TestChangeOnModeToNull_28(); break; case 29: - ChipLogProgress(chipTool, " ***** Test Step 29 : Wait for the commissioned device to be retrieved\n"); - err = TestWaitForTheCommissionedDeviceToBeRetrieved_29(); + ChipLogProgress(chipTool, " ***** Test Step 29 : Reboot target device\n"); + err = TestRebootTargetDevice_29(); break; case 30: - ChipLogProgress(chipTool, " ***** Test Step 30 : Verify Current Mode Change based on new StartUp Mode\n"); - err = TestVerifyCurrentModeChangeBasedOnNewStartUpMode_30(); + ChipLogProgress(chipTool, " ***** Test Step 30 : Wait for the commissioned device to be retrieved\n"); + err = TestWaitForTheCommissionedDeviceToBeRetrieved_30(); + break; + case 31: + ChipLogProgress(chipTool, " ***** Test Step 31 : Verify Current Mode Change based on new StartUp Mode\n"); + err = TestVerifyCurrentModeChangeBasedOnNewStartUpMode_31(); break; } @@ -127404,10 +127408,10 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 9: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -127416,10 +127420,10 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 12: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 13: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -127434,10 +127438,10 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 18: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 19: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -127472,6 +127476,9 @@ class TestModeSelectCluster : public TestCommandBridge { case 30: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 31: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -127485,7 +127492,7 @@ class TestModeSelectCluster : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 31; + const uint16_t mTestCount = 32; chip::Optional mNodeId; chip::Optional mCluster; @@ -127523,7 +127530,31 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadSupportedModes_2() + CHIP_ERROR TestReadStandardNamespace_2() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterModeSelect alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeStandardNamespaceWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read StandardNamespace Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("StandardNamespace", actualValue)); + VerifyOrReturn(CheckValue("StandardNamespace", actualValue, 0U)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadSupportedModes_3() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127541,28 +127572,31 @@ class TestModeSelectCluster : public TestCommandBridge { VerifyOrReturn( CheckValueAsString("Label", ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).label, @"Black")); VerifyOrReturn(CheckValue("Mode", ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).mode, 0U)); - VerifyOrReturn(CheckValue("ModeTags", [((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).modeTags count], - static_cast(1))); + VerifyOrReturn(CheckValue("SemanticTags", + [((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).semanticTags count], static_cast(1))); VerifyOrReturn(CheckValue("Value", - ((MTRModeSelectClusterModeTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]).modeTags[0]) + ((MTRModeSelectClusterSemanticTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[0]) + .semanticTags[0]) .value, 0U)); VerifyOrReturn( CheckValueAsString("Label", ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).label, @"Cappuccino")); VerifyOrReturn(CheckValue("Mode", ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).mode, 4U)); - VerifyOrReturn(CheckValue("ModeTags", [((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).modeTags count], - static_cast(1))); + VerifyOrReturn(CheckValue("SemanticTags", + [((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).semanticTags count], static_cast(1))); VerifyOrReturn(CheckValue("Value", - ((MTRModeSelectClusterModeTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]).modeTags[0]) + ((MTRModeSelectClusterSemanticTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[1]) + .semanticTags[0]) .value, 0U)); VerifyOrReturn( CheckValueAsString("Label", ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).label, @"Espresso")); VerifyOrReturn(CheckValue("Mode", ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).mode, 7U)); - VerifyOrReturn(CheckValue("ModeTags", [((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).modeTags count], - static_cast(1))); + VerifyOrReturn(CheckValue("SemanticTags", + [((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).semanticTags count], static_cast(1))); VerifyOrReturn(CheckValue("Value", - ((MTRModeSelectClusterModeTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).modeTags[0]) + ((MTRModeSelectClusterSemanticTagStruct *) ((MTRModeSelectClusterModeOptionStruct *) actualValue[2]) + .semanticTags[0]) .value, 0U)); } @@ -127576,7 +127610,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadCurrentMode_3() + CHIP_ERROR TestReadCurrentMode_4() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127599,7 +127633,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadStartUpMode_4() + CHIP_ERROR TestReadStartUpMode_5() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127623,7 +127657,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadOnMode_5() + CHIP_ERROR TestReadOnMode_6() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127646,7 +127680,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeToSupportedMode_6() + CHIP_ERROR TestChangeToSupportedMode_7() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127668,7 +127702,7 @@ class TestModeSelectCluster : public TestCommandBridge { } NSNumber * _Nonnull currentModeBeforeToggle; - CHIP_ERROR TestVerifyCurrentModeChange_7() + CHIP_ERROR TestVerifyCurrentModeChange_8() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127694,7 +127728,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeToUnsupportedMode_8() + CHIP_ERROR TestChangeToUnsupportedMode_9() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127718,7 +127752,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestToggleOnOff_9() + CHIP_ERROR TestToggleOnOff_10() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127736,7 +127770,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestToggleOnOff_10() + CHIP_ERROR TestToggleOnOff_11() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127754,7 +127788,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyCurrentModeDoesNotChangeWhenOnModeIsNull_11() + CHIP_ERROR TestVerifyCurrentModeDoesNotChangeWhenOnModeIsNull_12() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127777,7 +127811,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeToUnsupportedOnMode_12() + CHIP_ERROR TestChangeToUnsupportedOnMode_13() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127802,7 +127836,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeOnMode_13() + CHIP_ERROR TestChangeOnMode_14() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127824,7 +127858,7 @@ class TestModeSelectCluster : public TestCommandBridge { } NSNumber * _Nullable OnModeValue; - CHIP_ERROR TestVerifyOnMode_14() + CHIP_ERROR TestVerifyOnMode_15() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127851,7 +127885,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestToggleOnOff_15() + CHIP_ERROR TestToggleOnOff_16() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127869,7 +127903,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestToggleOnOff_16() + CHIP_ERROR TestToggleOnOff_17() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127887,7 +127921,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyCurrentModeChangesIfOnModeIsNotNull_17() + CHIP_ERROR TestVerifyCurrentModeChangesIfOnModeIsNotNull_18() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127910,7 +127944,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeToUnsupportedStartUpMode_18() + CHIP_ERROR TestChangeToUnsupportedStartUpMode_19() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127935,7 +127969,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeToSupportedStartUpMode_19() + CHIP_ERROR TestChangeToSupportedStartUpMode_20() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127956,7 +127990,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyStartUpModeChange_20() + CHIP_ERROR TestVerifyStartUpModeChange_21() { MTRBaseDevice * device = GetDevice("alpha"); @@ -127980,7 +128014,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeCurrentModeToAnotherValue_21() + CHIP_ERROR TestChangeCurrentModeToAnotherValue_22() { MTRBaseDevice * device = GetDevice("alpha"); @@ -128001,7 +128035,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeOnMode_22() + CHIP_ERROR TestChangeOnMode_23() { MTRBaseDevice * device = GetDevice("alpha"); @@ -128022,7 +128056,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestSetStartUpOnOff_23() + CHIP_ERROR TestSetStartUpOnOff_24() { MTRBaseDevice * device = GetDevice("alpha"); @@ -128043,14 +128077,14 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRebootTargetDevice_24() + CHIP_ERROR TestRebootTargetDevice_25() { chip::app::Clusters::SystemCommands::Commands::Reboot::Type value; return Reboot("alpha", value); } - CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_25() + CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_26() { chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; @@ -128058,7 +128092,7 @@ class TestModeSelectCluster : public TestCommandBridge { return WaitForCommissionee("alpha", value); } - CHIP_ERROR TestVerifyCurrentModeChangeBasedOnOnModeAsItOverwritesStartUpMode_26() + CHIP_ERROR TestVerifyCurrentModeChangeBasedOnOnModeAsItOverwritesStartUpMode_27() { MTRBaseDevice * device = GetDevice("alpha"); @@ -128081,7 +128115,7 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestChangeOnModeToNull_27() + CHIP_ERROR TestChangeOnModeToNull_28() { MTRBaseDevice * device = GetDevice("alpha"); @@ -128102,14 +128136,14 @@ class TestModeSelectCluster : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestRebootTargetDevice_28() + CHIP_ERROR TestRebootTargetDevice_29() { chip::app::Clusters::SystemCommands::Commands::Reboot::Type value; return Reboot("alpha", value); } - CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_29() + CHIP_ERROR TestWaitForTheCommissionedDeviceToBeRetrieved_30() { chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; @@ -128117,7 +128151,7 @@ class TestModeSelectCluster : public TestCommandBridge { return WaitForCommissionee("alpha", value); } - CHIP_ERROR TestVerifyCurrentModeChangeBasedOnNewStartUpMode_30() + CHIP_ERROR TestVerifyCurrentModeChangeBasedOnNewStartUpMode_31() { MTRBaseDevice * device = GetDevice("alpha");